Merge remote-tracking branch 'origin/master' into backup-previewed-workspaces

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.1358",
+    "version": "3.1.1371",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -72,7 +72,7 @@
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#f0149b05ff",
         "c9.ide.find.replace": "#8cbce45290",
-        "c9.ide.run.debug": "#7406555669",
+        "c9.ide.run.debug": "#f51895faec",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",
@@ -83,7 +83,7 @@
         "c9.ide.ace.stripws": "#cf0f42ac59",
         "c9.ide.behaviors": "#db32109ebc",
         "c9.ide.closeconfirmation": "#cee4674141",
-        "c9.ide.configuration": "#e3c90dcd96",
+        "c9.ide.configuration": "#528234d97d",
         "c9.ide.dialog.wizard": "#7667ec79a8",
         "c9.ide.fontawesome": "#781602c5d8",
         "c9.ide.format": "#5ec97fb083",
@@ -97,20 +97,20 @@
         "c9.ide.navigate": "#1fbb7cd53b",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",
-        "c9.ide.preview": "#2acbe41e62",
+        "c9.ide.preview": "#70bd68740c",
-        "c9.ide.preview.browser": "#04760484d1",
+        "c9.ide.preview.browser": "#a732ce9853",
         "c9.ide.preview.markdown": "#bc846e1562",
         "c9.ide.pubsub": "#a85fb27eca",
         "c9.ide.readonly": "#f5121c3a57",
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#2b12cd1bdd",
-        "c9.ide.run": "#aa78804818",
+        "c9.ide.run": "#8130d6ed10",
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#9956689819",
-        "c9.ide.save": "#262a41aedc",
+        "c9.ide.save": "#496328f2eb",
         "c9.ide.scm": "#ca3c94b84f",
-        "c9.ide.terminal.monitor": "#1ccac33b0d",
+        "c9.ide.terminal.monitor": "#1a4092ede2",
         "c9.ide.test": "#a282ec1619",
         "c9.ide.test.mocha": "#fc053b23d2",
         "c9.ide.theme.flat": "#81dadeee55",

plugins/c9.ide.dialog.common/confirm.js

@@ -23,12 +23,15 @@ define(function(require, module, exports) {
         
         function show(title, header, msg, onconfirm, oncancel, options) {
             return plugin.queue(function(){
-                plugin.title = title;
+                if (!options) 
-                plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
+                    options = {};
-                plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
                 
-                plugin.getElement("ok").setCaption(options.yes || options.ok || "OK");
+                plugin.title = title;
-                plugin.getElement("cancel").setCaption(options.no || options.cancel || "Cancel");
+                plugin.heading = options.isHTML ? header : util.escapeXml(header);
+                plugin.body = options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
+                
+                plugin.getElement("ok").setCaption(options.yes || "OK");
+                plugin.getElement("cancel").setCaption(options.no || "Cancel");
                 
                 plugin.update([
                     { id: "ok", onclick: function(){ plugin.hide(); onconfirm(); } },

plugins/c9.ide.dialog.common/question.js

@@ -40,8 +40,8 @@ define(function(require, module, exports) {
                 plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
                 plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
                 
-                plugin.getElement("yes").setCaption(options.yes || options.ok || "Yes");
+                plugin.getElement("yes").setCaption(options.yes || "Yes");
-                plugin.getElement("no").setCaption(options.no || options.cancel || "No");
+                plugin.getElement("no").setCaption(options.no || "No");
                 plugin.getElement("yestoall").setCaption(options.yestoall || "Yes to All");
                 plugin.getElement("notoall").setCaption(options.notoall || "No to All");
                 

plugins/c9.ide.editors/metadata.js

@@ -39,9 +39,9 @@ define(function(require, exports, module) {
             
             // Schedule for inspection when tab becomes active
             tabs.on("tabAfterActivate", function(e) {
-                // If disabled don't do anything
+                // // If disabled don't do anything
-                if (!e.tab.loaded || !settings.getBool("user/metadata/@enabled"))
+                // if (!e.tab.loaded || !settings.getBool("user/metadata/@enabled"))
-                    return;
+                //     return;
                 
                 if (e.lastTab)
                     changed[e.lastTab.name] = e.lastTab;
@@ -51,9 +51,9 @@ define(function(require, exports, module) {
             
             // Closing a tab
             tabs.on("tabAfterClose", function (e) {
-                // If disabled don't do anything
+                // // If disabled don't do anything
-                if (!settings.getBool("user/metadata/@enabled"))
+                // if (!settings.getBool("user/metadata/@enabled"))
-                    return;
+                //     return;
                 
                 var doc = e.tab.document;
                 if (!e.tab.path) {
@@ -70,9 +70,9 @@ define(function(require, exports, module) {
             
             // Opening a file
             tabs.on("beforeOpen", function(e) {
-                // If disabled don't do anything
+                // // If disabled don't do anything
-                if (!settings.getBool("user/metadata/@enabled"))
+                // if (!settings.getBool("user/metadata/@enabled"))
-                    return;
+                //     return;
                 
                 // Don't load metadata if document state is defined or value is set
                 if (e.tab.path && e.options.document.filter === false
@@ -110,7 +110,7 @@ define(function(require, exports, module) {
             
             settings.on("read", function(e) {
                 settings.setDefaults("user/metadata", [
-                    ["enabled", "true"],
+                    // ["enabled", "true"],
                     ["undolimit", "100"],
                 ]);
             }, plugin);
@@ -123,9 +123,9 @@ define(function(require, exports, module) {
             
             
             function checkChangedTabs(unload) {
-                // If disabled don't do anything
+                // // If disabled don't do anything
-                if (!settings.getBool("user/metadata/@enabled"))
+                // if (!settings.getBool("user/metadata/@enabled"))
-                    return;
+                //     return;
                 
                 tabs.getPanes().forEach(function(pane) {
                     var tab = pane.getTab();
@@ -149,11 +149,6 @@ define(function(require, exports, module) {
                     position: 150,
                     "Meta Data" : {
                         position: 200,
-                        "Store Meta Data of Opened Files" : {
-                            type: "checkbox",
-                            path: "user/metadata/@enabled",
-                            position: 100
-                        },
                         "Maximum of Undo Stack Items in Meta Data" : {
                             type: "spinner",
                             path: "user/metadata/@undolimit",

plugins/c9.ide.editors/tabmanager.js

@@ -220,14 +220,13 @@ define(function(require, module, exports) {
                 }
                 
                 setTimeout(function() {
-                    var wasReady = isReady;
+                    // Only set the state if we're not testing something else
-                    isReady = true;
+                    if (options.testing != 2 && !isReady) {
-                    if (options.testing != 2 && !wasReady) {
-                        // Only fire if we're not testing something else
                         setState(state, !isReady, function(){
                             emit.sticky("ready");
                         });
                     }
+                    isReady = true;
                     
                     showTabs = settings.getBool("user/tabs/@show");
                     toggleButtons(showTabs);

plugins/c9.ide.ui/lib_apf.js

@@ -3743,7 +3743,7 @@ function findCssRule(name, stylesheet, win) {
         var sheets = (win || self).document.styleSheets;
         for (var j = sheets.length - 1; j >= 0; j--) {
             try {
-                var rules = sheets[j][apf.styleSheetRules];
+                var rules = sheets[j][apf.styleSheetRules] || [];
                 for (var i = 0; i < rules.length; i++) {
                     if (nameRe.test(rules.item(i).selectorText)) {
                         return rules.item(i);

plugins/c9.ide.watcher/gui.js

@@ -331,9 +331,11 @@ define(function(require, exports, module) {
         }
         
         function updateChangedPath(err, path, data) {
+            if (!changedPaths[path])
+                return;
             var tab = changedPaths[path].tab || tabManager.findTab(path);
             if (!tab)
-                return changedPaths[path] && changedPaths[path].resolve();
+                return changedPaths[path].resolve();
             var doc = tab.document;
             doc.setBookmarkedValue(data, true);
             doc.meta.timestamp = Date.now() - settings.timeOffset;