StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Released version 2.3.6 (Fixed #82)

This commit is contained in:
josdejong 2014-01-03 17:15:53 +01:00
parent 975a93442a
commit b47fdf153a
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.md
View File

@ -3,6 +3,11 @@
http://jsoneditoronline.org http://jsoneditoronline.org
## 2014-01-03, version 2.3.6
- Fixed positioning issue of the action menu.
## 2013-12-09, version 2.3.5 ## 2013-12-09, version 2.3.5
- Fixed a positioning issue of the action menu again. - Fixed a positioning issue of the action menu again.

2
bower.json
View File

@ -1,6 +1,6 @@
{ {
"name": "jsoneditor", "name": "jsoneditor",
"version": "2.3.6-SNAPSHOT", "version": "2.3.6",
"description": "A web-based tool to view, edit and format JSON", "description": "A web-based tool to view, edit and format JSON",
"tags": [ "tags": [
"json", "json",

6
jsoneditor-min.js vendored
View File

File diff suppressed because one or more lines are too long

6
jsoneditor.js
View File

@ -27,8 +27,8 @@
* Copyright (c) 2011-2013 Jos de Jong, http://jsoneditoronline.org * Copyright (c) 2011-2013 Jos de Jong, http://jsoneditoronline.org
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 2.3.5 * @version 2.3.6
* @date 2013-12-09 * @date 2014-01-03
*/ */
(function () { (function () {
@ -4561,7 +4561,7 @@ ContextMenu.prototype.show = function (anchor) {
// calculate whether the menu fits below the anchor // calculate whether the menu fits below the anchor
var windowHeight = window.innerHeight, var windowHeight = window.innerHeight,
windowScroll = (window.pageYOffset || document.scrollTop), windowScroll = (window.pageYOffset || document.scrollTop || 0),
windowBottom = windowHeight + windowScroll, windowBottom = windowHeight + windowScroll,
anchorHeight = anchor.offsetHeight, anchorHeight = anchor.offsetHeight,
menuHeight = this.maxHeight; menuHeight = this.maxHeight;

2
jsoneditor/js/contextmenu.js
View File

@ -181,7 +181,7 @@ ContextMenu.prototype.show = function (anchor) {
// calculate whether the menu fits below the anchor // calculate whether the menu fits below the anchor
var windowHeight = window.innerHeight, var windowHeight = window.innerHeight,
windowScroll = (window.pageYOffset || document.scrollTop), windowScroll = (window.pageYOffset || document.scrollTop || 0),
windowBottom = windowHeight + windowScroll, windowBottom = windowHeight + windowScroll,
anchorHeight = anchor.offsetHeight, anchorHeight = anchor.offsetHeight,
menuHeight = this.maxHeight; menuHeight = this.maxHeight;

6
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "jsoneditor", "name": "jsoneditor",
"version": "2.3.6-SNAPSHOT", "version": "2.3.6",
"main": "jsoneditor.js", "main": "jsoneditor.js",
"description": "A web-based tool to view, edit and format JSON", "description": "A web-based tool to view, edit and format JSON",
"tags": [ "tags": [
@ -16,9 +16,7 @@
"url": "https://github.com/josdejong/jsoneditor.git" "url": "https://github.com/josdejong/jsoneditor.git"
}, },
"bugs": "https://github.com/josdejong/jsoneditor/issues", "bugs": "https://github.com/josdejong/jsoneditor/issues",
"scripts": { "scripts": {},
"prepublish": "jake"
},
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"jake": "latest", "jake": "latest",