Released version 2.3.4

looveu · Nov 19, 2013 · 7f960cd · 7f960cd
1 parent 8e07ebb
commit 7f960cd
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 18 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -3,7 +3,7 @@
 http://jsoneditoronline.org
 
 
-## not yet released, version 2.4.0
+## 2013-11-19, version 2.3.4
 
 - Dropped support for IE8, cleaned up legacy code for old browsers.
 - Disabled saving files using HTML5 on Firefox to prevent a Firefox bug

diff --git a/app/web/app.js b/app/web/app.js
@@ -195,7 +195,15 @@ app.load = function() {
     // enforce FireFox to not do spell checking on any input field
     document.body.spellcheck = false;
   } catch (err) {
-    app.notify.showError(err);
+    try {
+      app.notify.showError(err);
+    }
+    catch (e) {
+      if (console && console.log) {
+        console.log(err);
+      }
+      alert(err);
+    }
   }
 };
 

diff --git a/app/web/notify.js b/app/web/notify.js
@@ -35,7 +35,7 @@ Notify.prototype.showNotification = function (message) {
 Notify.prototype.showError = function (error) {
   return this.showMessage({
     type: 'error',
-    message: (error.message || error.toString()),
+    message: (error.message ? 'Error: ' + error.message : error.toString()),
     closeButton: true
   });
 };

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jsoneditor",
-  "version": "2.4.0-SNAPSHOT",
+  "version": "2.3.4",
   "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.4.0-SNAPSHOT
- * @date    2013-11-15
+ * @version 2.3.4
+ * @date    2013-11-19
  */
 (function () {
 
@@ -5957,8 +5957,13 @@ util.addEventListener = function addEventListener(element, action, listener, use
 
     element.addEventListener(action, listener, useCapture);
     return listener;
-  } else {
-    throw new Error('missing function addEventListener');
+  } else if (element.attachEvent) {
+    // Old IE browsers
+    var f = function () {
+      return listener.call(element, window.event);
+    };
+    element.attachEvent("on" + action, f);
+    return f;
   }
 };
 
@@ -5979,8 +5984,9 @@ util.removeEventListener = function removeEventListener(element, action, listene
     }
 
     element.removeEventListener(action, listener, useCapture);
-  } else {
-    throw new Error('missing function removeEventListener');
+  } else if (element.detachEvent) {
+    // Old IE browsers
+    element.detachEvent("on" + action, listener);
   }
 };
 

diff --git a/jsoneditor/js/util.js b/jsoneditor/js/util.js
@@ -454,8 +454,13 @@ util.addEventListener = function addEventListener(element, action, listener, use
 
     element.addEventListener(action, listener, useCapture);
     return listener;
-  } else {
-    throw new Error('missing function addEventListener');
+  } else if (element.attachEvent) {
+    // Old IE browsers
+    var f = function () {
+      return listener.call(element, window.event);
+    };
+    element.attachEvent("on" + action, f);
+    return f;
   }
 };
 
@@ -476,7 +481,8 @@ util.removeEventListener = function removeEventListener(element, action, listene
     }
 
     element.removeEventListener(action, listener, useCapture);
-  } else {
-    throw new Error('missing function removeEventListener');
+  } else if (element.detachEvent) {
+    // Old IE browsers
+    element.detachEvent("on" + action, listener);
   }
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsoneditor",
-  "version": "2.4.0-SNAPSHOT",
+  "version": "2.3.4",
   "main": "jsoneditor.js",
   "description": "A web-based tool to view, edit and format JSON",
   "tags": [