fix null in JSON hash

jcubic · May 20, 2018 · aa6b85e · aa6b85e
1 parent 4a98b54
commit aa6b85e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * fix resizer in Firefox [#395](https://github.com/jcubic/jquery.terminal/issues/395)
 * fix $.terminal.columns [#394](https://github.com/jcubic/jquery.terminal/issues/394)
 * fix rows() when using --size [#398](https://github.com/jcubic/jquery.terminal/issues/398)
+* fix null in JSON hash
 
 ## 1.15.0
 

diff --git a/js/jquery.terminal-1.15.0.js b/js/jquery.terminal-1.15.0.js
@@ -32,7 +32,7 @@
  * Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
  * licensed under 3 clause BSD license
  *
- * Date: Sun, 20 May 2018 12:43:02 +0000
+ * Date: Sun, 20 May 2018 13:05:02 +0000
  */
 
 /* TODO:
@@ -2872,7 +2872,7 @@
     }
     $.terminal = {
         version: 'DEV',
-        date: 'Sun, 20 May 2018 12:43:02 +0000',
+        date: 'Sun, 20 May 2018 13:05:02 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -7546,10 +7546,13 @@
                 var terminal = terminals.get()[spec[0]];
                 // execute if belong to this terminal
                 if (terminal && terminal_id === terminal.id()) {
-                    if (spec[2]) {
+                    var defer = $.Deferred();
+                    if (!spec[2]) {
+                        defer.resolve();
+                        return defer.promise();
+                    } else {
                         try {
                             if (paused) {
-                                var defer = $.Deferred();
                                 resume_callbacks.push(function() {
                                     return terminal.exec(spec[2]).done(function() {
                                         terminal.save_state(spec[2], true, spec[1]);
@@ -7594,6 +7597,7 @@
                                 }
                             })();// */
                         } catch (e) {
+                            console.log(e);
                             // invalid json - ignore
                         }
                     });

diff --git a/js/jquery.terminal-1.15.0.min.js b/js/jquery.terminal-1.15.0.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -7546,10 +7546,13 @@
                 var terminal = terminals.get()[spec[0]];
                 // execute if belong to this terminal
                 if (terminal && terminal_id === terminal.id()) {
-                    if (spec[2]) {
+                    var defer = $.Deferred();
+                    if (!spec[2]) {
+                        defer.resolve();
+                        return defer.promise();
+                    } else {
                         try {
                             if (paused) {
-                                var defer = $.Deferred();
                                 resume_callbacks.push(function() {
                                     return terminal.exec(spec[2]).done(function() {
                                         terminal.save_state(spec[2], true, spec[1]);
@@ -7594,6 +7597,7 @@
                                 }
                             })();// */
                         } catch (e) {
+                            console.log(e);
                             // invalid json - ignore
                         }
                     });

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -32,7 +32,7 @@
  * Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
  * licensed under 3 clause BSD license
  *
- * Date: Sun, 20 May 2018 12:43:02 +0000
+ * Date: Sun, 20 May 2018 13:05:02 +0000
  */
 
 /* TODO:
@@ -2872,7 +2872,7 @@
     }
     $.terminal = {
         version: 'DEV',
-        date: 'Sun, 20 May 2018 12:43:02 +0000',
+        date: 'Sun, 20 May 2018 13:05:02 +0000',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -7546,10 +7546,13 @@
                 var terminal = terminals.get()[spec[0]];
                 // execute if belong to this terminal
                 if (terminal && terminal_id === terminal.id()) {
-                    if (spec[2]) {
+                    var defer = $.Deferred();
+                    if (!spec[2]) {
+                        defer.resolve();
+                        return defer.promise();
+                    } else {
                         try {
                             if (paused) {
-                                var defer = $.Deferred();
                                 resume_callbacks.push(function() {
                                     return terminal.exec(spec[2]).done(function() {
                                         terminal.save_state(spec[2], true, spec[1]);
@@ -7594,6 +7597,7 @@
                                 }
                             })();// */
                         } catch (e) {
+                            console.log(e);
                             // invalid json - ignore
                         }
                     });

diff --git a/js/jquery.terminal.min.js b/js/jquery.terminal.min.js