diff --git a/package.json b/package.json index ef99113d..b745aef1 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.html.diff": "#7d6cecfb90", "c9.ide.language.javascript": "#69684ee026", "c9.ide.language.javascript.immediate": "#82c426dbca", - "c9.ide.language.javascript.eslint": "#18b1cee0c5", + "c9.ide.language.javascript.eslint": "#004c86f8ef", "c9.ide.language.javascript.tern": "#4d53f32c29", "c9.ide.language.javascript.infer": "#b9c2e4bdb8", "c9.ide.language.jsonalyzer": "#d6736b55cb", @@ -76,7 +76,7 @@ "c9.ide.find": "#e632ecf4be", "c9.ide.find.infiles": "#ad9ff74638", "c9.ide.find.replace": "#8468067976", - "c9.ide.run.debug": "#dab860c046", + "c9.ide.run.debug": "#224f43948e", "c9.automate": "#47e2c429c9", "c9.ide.ace.emmet": "#6dc4585e02", "c9.ide.ace.gotoline": "#d33220b1e0", @@ -90,7 +90,7 @@ "c9.ide.configuration": "#a936df26bb", "c9.ide.dialog.wizard": "#7667ec79a8", "c9.ide.fontawesome": "#781602c5d8", - "c9.ide.format": "#d8deaffa3c", + "c9.ide.format": "#dd80da7a01", "c9.ide.help.support": "#fbe8eb5c36", "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#0b0ee744f9", diff --git a/plugins/c9.ide.tree/favorites.js b/plugins/c9.ide.tree/favorites.js index 71a47501..01cbe09b 100644 --- a/plugins/c9.ide.tree/favorites.js +++ b/plugins/c9.ide.tree/favorites.js @@ -452,7 +452,7 @@ define(function(require, exports, module) { var mnuSettings = tree.getElement("mnuFilesSettings"); ui.insertByIndex(mnuSettings, new ui.item({ type: "check", - caption: realRoot ? "Show Root File System" : "Show Workspace Directory", + caption: "Show Workspace Root", checked: "state/projecttree/@showfs", onclick: function(e) { toggleRootFS(); diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js index cec4bd21..a160c783 100644 --- a/plugins/c9.ide.watcher/gui.js +++ b/plugins/c9.ide.watcher/gui.js @@ -444,6 +444,8 @@ define(function(require, exports, module) { path + " has been changed on disk.", "Would you like to reload this file?", yes, no, { + yes: "Reload", + no: "Keep current version", all: Object.keys(changedPaths).length > 1 } ); @@ -542,10 +544,15 @@ define(function(require, exports, module) { checkIfQueueIsEmpty(); }, - { all: Object.keys(removedPaths).length > 1 } + { + all: Object.keys(removedPaths).length > 1, + yes: "Keep open", + yestoall: "Keep all open", + no: "Close tab", + } ); - deleteDialog.on("show", function(){ + deleteDialog.on("show", function() { if (!tabManager.findTab(path)) return false; });