From b6325419f373b6966f3f15e84d64002e0c72ebb2 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 19 Mar 2018 19:02:53 +0400
Subject: [PATCH 1/2] fix regression in save ui

---
 plugins/c9.ide.save/save.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/c9.ide.save/save.js b/plugins/c9.ide.save/save.js
index 7c8ef25e..b5444ab3 100644
--- a/plugins/c9.ide.save/save.js
+++ b/plugins/c9.ide.save/save.js
@@ -542,9 +542,6 @@ define(function(require, exports, module) {
         
         var stateTimer = null, pageTimers = {};
         function setSavingState(tab, state, timeout, silent) {
-            clearTimeout(stateTimer);
-            clearTimeout(pageTimers[tab.name]);
-            
             tab.classList.remove("saving", "saved", "error");
             
             var doc = tab.document;
@@ -555,11 +552,14 @@ define(function(require, exports, module) {
                 delete doc.meta.$saving;
             
             if (!silent)
-                updateSavingUi();
+                updateSavingUi(tab, state, timeout);
             emit("tabSavingState", { tab: tab });
         }
         
         function updateSavingUi(tab, state, timeout) {
+            clearTimeout(stateTimer);
+            clearTimeout(pageTimers[tab.name]);
+            var doc = tab.document;
             if (state == "saving") {
                 btnSave.show();
         

From 48150318d4f8b658942e80963ecf54528db9c18c Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 19 Mar 2018 00:43:20 +0400
Subject: [PATCH 2/2] fix display of null type in the debugger

---
 .../debuggers/chrome/chromedebugger.js        | 30 ++-----------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/plugins/c9.ide.run.debug/debuggers/chrome/chromedebugger.js b/plugins/c9.ide.run.debug/debuggers/chrome/chromedebugger.js
index db16d330..ee80e76e 100644
--- a/plugins/c9.ide.run.debug/debuggers/chrome/chromedebugger.js
+++ b/plugins/c9.ide.run.debug/debuggers/chrome/chromedebugger.js
@@ -315,11 +315,9 @@ define(function(require, exports, module) {
         function createVariable(options, name, scope, variable) {
             var value = options.value || options;
             
-            if (variable) {
-                // variable.value = formatType(options);
-                // variable.type = options.type;
-            }
-            else {
+            if (!variable) {
+                if (value.subtype == "null")
+                    value.type = value.subtype;
                 variable = new Variable({
                     name: name || options.name,
                     scope: scope,
@@ -331,28 +329,6 @@ define(function(require, exports, module) {
                     options: options,
                 });
             }
-            
-            // if (value.prototypeObject)
-            //     variable.prototype = new Variable({
-            //         tagName: "prototype",
-            //         name: "prototype", 
-            //         type: "object",
-            //         ref: value.prototypeObject.ref
-            //     });
-            // if (value.protoObject)
-            //     variable.proto = new Variable({ 
-            //         tagName: "proto",
-            //         name: "proto", 
-            //         type: "object",
-            //         ref: value.protoObject.ref
-            //     });
-            // if (value.constructorFunction)
-            //     variable.constructorFunction = new Variable({ 
-            //         tagName: "constructor", 
-            //         name: "constructor", 
-            //         type: "function",
-            //         ref: value.constructorFunction.ref
-            //     });
             return variable;
         }