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

View File

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

View File

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

6
jsoneditor-min.js vendored

File diff suppressed because one or more lines are too long

View File

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

View File

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

View File

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