Released version 2.3.6 (Fixed josdejong#82)

BellyABC123 · Jan 3, 2014 · b47fdf1 · b47fdf1
1 parent 975a934
commit b47fdf1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -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.

diff --git a/bower.json b/bower.json
@@ -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",

diff --git a/jsoneditor-min.js b/jsoneditor-min.js
diff --git a/jsoneditor.js b/jsoneditor.js
@@ -27,8 +27,8 @@
  * Copyright (c) 2011-2013 Jos de Jong, http://jsoneditoronline.org
  *
  * @author  Jos de Jong, <[email protected]>
- * @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;

diff --git a/jsoneditor/js/contextmenu.js b/jsoneditor/js/contextmenu.js
@@ -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;

diff --git a/package.json b/package.json
@@ -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",