From 7e5e4c40e43ea42ab7ed1c7afdb153b770ba3ff5 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Tue, 5 Aug 2014 11:22:46 -0700 Subject: [PATCH 001/182] eat tab and context menu keys --- src/utils/DropdownEventHandler.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/DropdownEventHandler.js b/src/utils/DropdownEventHandler.js index 14c94bf3fe4..d4119b4280d 100644 --- a/src/utils/DropdownEventHandler.js +++ b/src/utils/DropdownEventHandler.js @@ -88,7 +88,9 @@ define(function (require, exports, module) { if (event.type === "keydown") { keyCode = event.keyCode; - if (keyCode === KeyEvent.DOM_VK_UP) { + if (keyCode === KeyEvent.DOM_VK_TAB || keyCode === KeyEvent.DOM_VK_CONTEXT_MENU) { + self.close(); + } else if (keyCode === KeyEvent.DOM_VK_UP) { self._rotateSelection(-1); } else if (keyCode === KeyEvent.DOM_VK_DOWN) { self._rotateSelection(1); From 49ccbc4d84eeb5ffbb45e16286aa1de871f1050e Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Tue, 5 Aug 2014 15:48:41 -0700 Subject: [PATCH 002/182] let context menu keys trickle up --- src/utils/DropdownEventHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/DropdownEventHandler.js b/src/utils/DropdownEventHandler.js index d4119b4280d..69307cbbb4f 100644 --- a/src/utils/DropdownEventHandler.js +++ b/src/utils/DropdownEventHandler.js @@ -88,7 +88,7 @@ define(function (require, exports, module) { if (event.type === "keydown") { keyCode = event.keyCode; - if (keyCode === KeyEvent.DOM_VK_TAB || keyCode === KeyEvent.DOM_VK_CONTEXT_MENU) { + if (keyCode === KeyEvent.DOM_VK_TAB) { self.close(); } else if (keyCode === KeyEvent.DOM_VK_UP) { self._rotateSelection(-1); From a28ffd22e78c05752f3d53cbfbb33c65f8b99746 Mon Sep 17 00:00:00 2001 From: Jason San Jose Date: Tue, 12 Aug 2014 13:47:33 -0700 Subject: [PATCH 003/182] show LESS errors in console --- src/utils/ExtensionUtils.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/utils/ExtensionUtils.js b/src/utils/ExtensionUtils.js index 7e08c40e950..e0f7505966e 100644 --- a/src/utils/ExtensionUtils.js +++ b/src/utils/ExtensionUtils.js @@ -122,7 +122,12 @@ define(function (require, exports, module) { if (err) { result.reject(err); } else { - result.resolve(tree.toCSS()); + try { + result.resolve(tree.toCSS()); + } catch (err) { + console.error(err.filename + ":" + err.line + " " + err.message) + result.reject(err); + } } }); From ac326e648363d4ac5cf9912da526c70162901cac Mon Sep 17 00:00:00 2001 From: Jason San Jose Date: Tue, 12 Aug 2014 13:55:29 -0700 Subject: [PATCH 004/182] jslint errors --- src/utils/ExtensionUtils.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/ExtensionUtils.js b/src/utils/ExtensionUtils.js index e0f7505966e..67298d60719 100644 --- a/src/utils/ExtensionUtils.js +++ b/src/utils/ExtensionUtils.js @@ -124,9 +124,9 @@ define(function (require, exports, module) { } else { try { result.resolve(tree.toCSS()); - } catch (err) { - console.error(err.filename + ":" + err.line + " " + err.message) - result.reject(err); + } catch (toCSSError) { + console.error(toCSSError.filename + ":" + toCSSError.line + " " + toCSSError.message); + result.reject(toCSSError); } } }); From 335562d11c8c93698dbd6ef65f6e1fe3fa1c4a63 Mon Sep 17 00:00:00 2001 From: Larz Date: Mon, 25 Aug 2014 21:14:33 -0700 Subject: [PATCH 005/182] Using box-shadow to stop links for shifting a few pixels when tabbed. --- src/styles/brackets_patterns_override.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 48c821106b8..c7ed5d9e92f 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -54,8 +54,7 @@ a:focus { .dark & { color: @dark-bc-text-link; - border: 1px solid @dark-bc-btn-border-focused; - box-shadow: none; + box-shadow: 0 0 0 1px @dark-bc-btn-border-focused; } } From 713525ad4295363fac938d5b377fd6552bf05d2a Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Fri, 5 Sep 2014 02:27:03 +0200 Subject: [PATCH 006/182] Sort Working Files locale-aware --- src/file/FileUtils.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js index c9c08dabf9e..e36d7a1c491 100644 --- a/src/file/FileUtils.js +++ b/src/file/FileUtils.js @@ -459,14 +459,15 @@ define(function (require, exports, module) { function compareFilenames(filename1, filename2, extFirst) { var ext1 = getFileExtension(filename1), ext2 = getFileExtension(filename2), - cmpExt = ext1.toLocaleLowerCase().localeCompare(ext2.toLocaleLowerCase(), undefined, {numeric: true}), + lang = brackets.getLocale() === "root" ? "en-us" : brackets.getLocale(), + cmpExt = ext1.toLocaleLowerCase().localeCompare(ext2.toLocaleLowerCase(), lang, {numeric: true}), cmpNames; if (brackets.platform === "win") { filename1 = getFilenameWithoutExtension(filename1); filename2 = getFilenameWithoutExtension(filename2); } - cmpNames = filename1.toLocaleLowerCase().localeCompare(filename2.toLocaleLowerCase(), undefined, {numeric: true}); + cmpNames = filename1.toLocaleLowerCase().localeCompare(filename2.toLocaleLowerCase(), lang, {numeric: true}); return extFirst ? (cmpExt || cmpNames) : (cmpNames || cmpExt); } From e79f51eb835924770e1cf37f09a752f00ba91ff5 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Fri, 5 Sep 2014 21:13:48 +0200 Subject: [PATCH 007/182] Remove unnecessary locale check --- src/extensibility/ExtensionManagerView.js | 3 +++ src/file/FileUtils.js | 2 +- src/utils/LocalizationUtils.js | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/extensibility/ExtensionManagerView.js b/src/extensibility/ExtensionManagerView.js index 40ab53b8f29..d1def90d93b 100644 --- a/src/extensibility/ExtensionManagerView.js +++ b/src/extensibility/ExtensionManagerView.js @@ -230,6 +230,9 @@ define(function (require, exports, module) { context.translated = true; context.translatedLangs = info.metadata.i18n.map(function (value) { + if (value === "root") { + value = "en"; + } return { name: LocalizationUtils.getLocalizedLabel(value), locale: value }; }) .sort(function (lang1, lang2) { diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js index e36d7a1c491..834d9422ce2 100644 --- a/src/file/FileUtils.js +++ b/src/file/FileUtils.js @@ -459,7 +459,7 @@ define(function (require, exports, module) { function compareFilenames(filename1, filename2, extFirst) { var ext1 = getFileExtension(filename1), ext2 = getFileExtension(filename2), - lang = brackets.getLocale() === "root" ? "en-us" : brackets.getLocale(), + lang = brackets.getLocale(), cmpExt = ext1.toLocaleLowerCase().localeCompare(ext2.toLocaleLowerCase(), lang, {numeric: true}), cmpNames; diff --git a/src/utils/LocalizationUtils.js b/src/utils/LocalizationUtils.js index 24e41d596bf..1526b3e29c0 100644 --- a/src/utils/LocalizationUtils.js +++ b/src/utils/LocalizationUtils.js @@ -26,7 +26,6 @@ /** * Utilities functions related to localization/i18n - * */ define(function (require, exports, module) { "use strict"; @@ -37,7 +36,7 @@ define(function (require, exports, module) { * Converts a language code to its written name, if possible. * If not possible, the language code is simply returned. * - * @param {string} locale The two-char language code + * @param {string} locale The two-char language code * @return {string} The language's name or the given language code */ function getLocalizedLabel(locale) { From 258535b58c69e5cedd4ea484123f3b0d678b6ca4 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 6 Sep 2014 00:00:04 +0200 Subject: [PATCH 008/182] Fix unit tests for non-english locales --- src/main.js | 27 ++++++++++++------------ src/utils/Global.js | 2 +- test/spec/CodeInspection-test.js | 3 +-- test/spec/FindReplace-test.js | 3 +-- test/spec/InstallExtensionDialog-test.js | 3 +-- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/main.js b/src/main.js index 3250294d869..b1a56bef8d6 100644 --- a/src/main.js +++ b/src/main.js @@ -43,22 +43,23 @@ if (window.location.search.indexOf("testEnvironment") > -1) { require.config({ paths: { "preferences/PreferencesImpl": "../test/TestPreferencesImpl" - } + }, + locale: "en" // force English (US) + }); +} else { + /** + * hack for r.js optimization, move locale to another config call + * + * Use custom brackets property until CEF sets the correct navigator.language + * NOTE: When we change to navigator.language here, we also should change to + * navigator.language in ExtensionLoader (when making require contexts for each + * extension). + */ + require.config({ + locale: window.localStorage.getItem("locale") || (typeof (brackets) !== "undefined" ? brackets.app.language : navigator.language) }); } -/** - * hack for r.js optimization, move locale to another config call - * - * Use custom brackets property until CEF sets the correct navigator.language - * NOTE: When we change to navigator.language here, we also should change to - * navigator.language in ExtensionLoader (when making require contexts for each - * extension). - */ -require.config({ - locale: window.localStorage.getItem("locale") || (typeof (brackets) !== "undefined" ? brackets.app.language : navigator.language) -}); - define(function (require) { "use strict"; diff --git a/src/utils/Global.js b/src/utils/Global.js index 550c9d4b412..5901ac5c246 100644 --- a/src/utils/Global.js +++ b/src/utils/Global.js @@ -95,7 +95,7 @@ define(function (require, exports, module) { global.brackets.getLocale = function () { // By default use the locale that was determined in brackets.js - return global.localStorage.getItem("locale") || global.require.s.contexts._.config.locale; + return params.get("testEnvironment") ? "en" : (global.localStorage.getItem("locale") || global.require.s.contexts._.config.locale); }; global.brackets.setLocale = function (locale) { diff --git a/test/spec/CodeInspection-test.js b/test/spec/CodeInspection-test.js index 82e015523bd..92af1cdb520 100644 --- a/test/spec/CodeInspection-test.js +++ b/test/spec/CodeInspection-test.js @@ -30,7 +30,7 @@ define(function (require, exports, module) { var SpecRunnerUtils = require("spec/SpecRunnerUtils"), FileSystem = require("filesystem/FileSystem"), StringUtils = require("utils/StringUtils"), - Strings; + Strings = require("strings"); describe("Code Inspection", function () { this.category = "integration"; @@ -110,7 +110,6 @@ define(function (require, exports, module) { // Load module instances from brackets.test $ = testWindow.$; brackets = testWindow.brackets; - Strings = testWindow.require("strings"); CommandManager = brackets.test.CommandManager; DocumentManager = brackets.test.DocumentManager; EditorManager = brackets.test.EditorManager; diff --git a/test/spec/FindReplace-test.js b/test/spec/FindReplace-test.js index 1af03be4ae2..37fda2ae2be 100644 --- a/test/spec/FindReplace-test.js +++ b/test/spec/FindReplace-test.js @@ -33,7 +33,7 @@ define(function (require, exports, module) { KeyEvent = require("utils/KeyEvent"), SpecRunnerUtils = require("spec/SpecRunnerUtils"), StringUtils = require("utils/StringUtils"), - Strings, + Strings = require("strings"), _ = require("thirdparty/lodash"); var defaultContent = "/* Test comment */\n" + @@ -440,7 +440,6 @@ define(function (require, exports, module) { testWindow = w; // Load module instances from brackets.test - Strings = testWindow.require("strings"); twCommandManager = testWindow.brackets.test.CommandManager; twEditorManager = testWindow.brackets.test.EditorManager; twFindInFiles = testWindow.brackets.test.FindInFiles; diff --git a/test/spec/InstallExtensionDialog-test.js b/test/spec/InstallExtensionDialog-test.js index d353af34d25..35fe524e6b7 100644 --- a/test/spec/InstallExtensionDialog-test.js +++ b/test/spec/InstallExtensionDialog-test.js @@ -32,7 +32,7 @@ define(function (require, exports, module) { KeyEvent = require("utils/KeyEvent"), NativeApp = require("utils/NativeApp"), FileSystem, - Strings; + Strings = require("strings"); describe("Install Extension Dialog", function () { var testWindow, dialog, fields, goodInstaller, badInstaller, closed, @@ -43,7 +43,6 @@ define(function (require, exports, module) { beforeFirst(function () { SpecRunnerUtils.createTestWindowAndRun(this, function (w) { testWindow = w; - Strings = testWindow.require("strings"); FileSystem = testWindow.brackets.test.FileSystem; }); }); From 2b687110f669a57c5c5c448060fdfc150b780927 Mon Sep 17 00:00:00 2001 From: cheesypoof Date: Fri, 5 Sep 2014 15:52:14 -0700 Subject: [PATCH 009/182] Add status bar error indicator clear shortcut --- .../default/DebugCommands/ErrorNotification.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/extensions/default/DebugCommands/ErrorNotification.js b/src/extensions/default/DebugCommands/ErrorNotification.js index 5af4fafff41..2f940f6444d 100644 --- a/src/extensions/default/DebugCommands/ErrorNotification.js +++ b/src/extensions/default/DebugCommands/ErrorNotification.js @@ -49,6 +49,14 @@ define(function (require, exports, module) { } } + function handleClick(event) { + if (event.shiftKey) { + window.console.clear(); + } else { + showDeveloperTools(); + } + } + function refreshIndicator() { // never show 0 errors if (!_attached || errorCount === 0) { @@ -73,7 +81,7 @@ define(function (require, exports, module) { .attr("title", Strings.CMD_SHOW_DEV_TOOLS + "\u2026") .text(Strings.ERRORS + ": ") .append($span) - .on("click", showDeveloperTools) + .on("click", handleClick) .insertBefore("#status-bar .spinner"); } From 103906df6093e394b8926ad9363bc71ea2e41a3d Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Sun, 7 Sep 2014 10:14:24 -0700 Subject: [PATCH 010/182] Get out of the infinite loop by allowing to scan backwards when the current token is a comment. --- src/language/CSSUtils.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js index 87d39c667a9..18954b3d5b7 100644 --- a/src/language/CSSUtils.js +++ b/src/language/CSSUtils.js @@ -1576,7 +1576,9 @@ define(function (require, exports, module) { } } - if (ctx.token.string !== "{" && ctx.token.string !== "}" && !TokenUtils.movePrevToken(ctx)) { + if ((ctx.token.type === "comment" || + (ctx.token.string !== "{" && ctx.token.string !== "}")) && + !TokenUtils.movePrevToken(ctx)) { break; } } From 37aeb2589ab51c82e221dd3370fca8cc7fcebe7d Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 10 Sep 2014 00:20:11 +0200 Subject: [PATCH 011/182] Make "Show Errors in Status Bar" pref more solid --- src/extensions/default/DebugCommands/main.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index 6d84c4d3431..e3be5bdad66 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -237,7 +237,7 @@ define(function (require, exports, module) { }); } - function toggleErrorNotification(bool) { + function toggleErrorNotification(bool, doNotSave) { var val; if (typeof bool === "undefined") { @@ -250,7 +250,9 @@ define(function (require, exports, module) { // update menu CommandManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR).setChecked(val); - PreferencesManager.set(DEBUG_SHOW_ERRORS_IN_STATUS_BAR, val); + if (!doNotSave) { + PreferencesManager.set(DEBUG_SHOW_ERRORS_IN_STATUS_BAR, val); + } } function handleOpenBracketsSource() { @@ -287,7 +289,11 @@ define(function (require, exports, module) { CommandManager.register(Strings.CMD_RESTART_NODE, DEBUG_RESTART_NODE, NodeDebugUtils.restartNode); enableRunTestsMenuItem(); - toggleErrorNotification(PreferencesManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR)); + toggleErrorNotification(PreferencesManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR), true); + + PreferencesManager.on("change", DEBUG_SHOW_ERRORS_IN_STATUS_BAR, function () { + toggleErrorNotification(PreferencesManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR), true); + }); /* * Debug menu From 8a29009e12321dd49d0cdfd7ba4c9408a17cc60c Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 10 Sep 2014 13:57:04 +0200 Subject: [PATCH 012/182] Save pref only if it's different from the old pref --- src/extensions/default/DebugCommands/main.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index e3be5bdad66..137d55582d5 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -237,11 +237,12 @@ define(function (require, exports, module) { }); } - function toggleErrorNotification(bool, doNotSave) { - var val; + function toggleErrorNotification(bool) { + var val, + oldPref = !!PreferencesManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR); - if (typeof bool === "undefined") { - val = !PreferencesManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR); + if (bool === undefined) { + val = !oldPref; } else { val = !!bool; } @@ -250,7 +251,7 @@ define(function (require, exports, module) { // update menu CommandManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR).setChecked(val); - if (!doNotSave) { + if (val !== oldPref) { PreferencesManager.set(DEBUG_SHOW_ERRORS_IN_STATUS_BAR, val); } } @@ -289,10 +290,10 @@ define(function (require, exports, module) { CommandManager.register(Strings.CMD_RESTART_NODE, DEBUG_RESTART_NODE, NodeDebugUtils.restartNode); enableRunTestsMenuItem(); - toggleErrorNotification(PreferencesManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR), true); + toggleErrorNotification(PreferencesManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR)); PreferencesManager.on("change", DEBUG_SHOW_ERRORS_IN_STATUS_BAR, function () { - toggleErrorNotification(PreferencesManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR), true); + toggleErrorNotification(PreferencesManager.get(DEBUG_SHOW_ERRORS_IN_STATUS_BAR)); }); /* From 97adc6f9161ada39958957c32bd855cbc8f62bc1 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Wed, 10 Sep 2014 11:49:14 -0700 Subject: [PATCH 013/182] cleanup one test and workingset view extensibility --- src/project/WorkingSetView.js | 68 ++++++++++++++++- test/spec/DocumentCommandHandlers-test.js | 90 +---------------------- test/spec/WorkingSetView-test.js | 49 +++++++++++- 3 files changed, 114 insertions(+), 93 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 27df0826a10..ab8b10245a8 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -55,6 +55,20 @@ define(function (require, exports, module) { */ var _views = []; + /** + * Icon Providers + * @see {@link WorkingSetView#addIconProvider()} + * @private + */ + var _iconProviders = []; + + /** + * Icon Providers + * @see {@link WorkingSetView#addClassProvider()} + * @private + */ + var _classProviders = []; + /** * Context Menu * @private @@ -609,12 +623,26 @@ define(function (require, exports, module) { // Create new list item with a link var $link = $("").html(ViewUtils.getFileEntryDisplay(file)); + + _iconProviders.forEach(function (provider) { + var icon = provider({fullPath: file.fullPath, + name: file.name, + isFile: file.isFile}); + if (icon) { + $link.prepend($(icon)); + } + }); + var $newItem = $("
  • ") .append($link) .data(_FILE_KEY, file); this.$openFilesContainer.find("ul").append($newItem); + _classProviders.forEach(function (provider) { + $newItem.addClass(provider(file)); + }); + // Update the listItem's apperance this._updateFileStatusIcon($newItem, _isOpenAndDirty(file), false); _updateListItemSelection($newItem, selectedFile); @@ -903,14 +931,48 @@ define(function (require, exports, module) { /** * Refreshes all Pane View List Views + * @param {boolean=} reconstruct - completely rebuilds the view list */ - function refresh() { - _.forEach(_views, function (workingSetListView) { - workingSetListView._redraw(); + function refresh(reconstruct) { + _.forEach(_views, function (view) { + if (reconstruct) { + view._rebuildViewList(); + } else { + view._redraw(); + } }); } + /** + * adds an icon provider to the view. + * Icon providers are called when a working set item is created + * @param {!function(!File):?string} callback - the function to call for each item + * The callback can return a string that contains and image tag to place before the filename + * if a falsy value is returned then nothing is prepended to the list item + */ + function addIconProvider(callback) { + _iconProviders.push(callback); + // build all views so the provider has a chance to add icons + // to all items that have already been created + refresh(true); + } + + /** + * adds a list item class provider to the view. + * Class providers are called when a working set item is created + * @param {!function(!File):?string} callback - the function to call for each item + * The callback can return a string that contains the class (or classes) to add to the list item + */ + function addClassProvider(callback) { + _classProviders.push(callback); + // build all views so the provider has a chance to style + // all items that have already been created + refresh(true); + } + // Public API exports.createWorkingSetViewForPane = createWorkingSetViewForPane; exports.refresh = refresh; + exports.addIconProvider = addIconProvider; + exports.addClassProvider = addClassProvider; }); diff --git a/test/spec/DocumentCommandHandlers-test.js b/test/spec/DocumentCommandHandlers-test.js index 1710e223da6..ceca0a93437 100644 --- a/test/spec/DocumentCommandHandlers-test.js +++ b/test/spec/DocumentCommandHandlers-test.js @@ -1105,96 +1105,8 @@ define(function (require, exports, module) { }); }); - -/* - TODO: Disabled until image support is added for splitview - - describe("Opens image file and validates EditorManager APIs", function () { - it("should return null after opening an image", function () { - var path = testPath + "/couz.png", - promise; - runs(function () { - promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: path }); - waitsForDone(promise, Commands.FILE_OPEN); - }); - - runs(function () { - expect(EditorManager.getActiveEditor()).toEqual(null); - expect(EditorManager.getCurrentFullEditor()).toEqual(null); - expect(EditorManager.getFocusedEditor()).toEqual(null); - expect(MainViewManager.getCurrentlyViewedPath(MainViewManager.ACTIVE_PANE)).toEqual(path); - var d = DocumentManager.getCurrentDocument(); - expect(d).toEqual(null); - }); - }); - }); - - describe("Open image file while a text file is open", function () { - it("should fire currentDocumentChange and activeEditorChange events", function () { - var promise, - docChangeListener = jasmine.createSpy(), - activeEditorChangeListener = jasmine.createSpy(); + // NOTE: Image tests moved to MainViewFactory-test.js - runs(function () { - _$(DocumentManager).on("currentDocumentChange", docChangeListener); - _$(EditorManager).on("activeEditorChange", activeEditorChangeListener); - - - promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: testPath + "/test.js" }); - waitsForDone(promise, Commands.FILE_OPEN); - }); - runs(function () { - expect(docChangeListener.callCount).toBe(1); - expect(activeEditorChangeListener.callCount).toBe(1); - }); - - runs(function () { - promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: testPath + "/couz.png" }); - waitsForDone(promise, Commands.FILE_OPEN); - }); - runs(function () { - expect(docChangeListener.callCount).toBe(2); - expect(activeEditorChangeListener.callCount).toBe(2); - _$(DocumentManager).off("currentDocumentChange", docChangeListener); - _$(EditorManager).off("activeEditorChange", activeEditorChangeListener); - }); - }); - }); - - describe("Open image file while neither text editor nor image file is open", function () { - it("should NOT fire currentDocumentChange and activeEditorChange events", function () { - - var promise, - docChangeListener = jasmine.createSpy(), - activeEditorChangeListener = jasmine.createSpy(); - - - runs(function () { - _$(DocumentManager).on("currentDocumentChange", docChangeListener); - _$(EditorManager).on("activeEditorChange", activeEditorChangeListener); - - promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: testPath + "/couz.png" }); - waitsForDone(promise, Commands.FILE_OPEN); - }); - runs(function () { - expect(docChangeListener.callCount).toBe(0); - expect(activeEditorChangeListener.callCount).toBe(0); - }); - - runs(function () { - promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: testPath + "/couz2.png" }); - waitsForDone(promise, Commands.FILE_OPEN); - }); - runs(function () { - expect(docChangeListener.callCount).toBe(0); - expect(activeEditorChangeListener.callCount).toBe(0); - _$(DocumentManager).off("currentDocumentChange", docChangeListener); - _$(EditorManager).off("activeEditorChange", activeEditorChangeListener); - }); - - }); - }); -*/ describe("Open a text file while a text file is open", function () { it("should fire currentDocumentChange and activeEditorChange events", function () { diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index 7ec64cf8263..c2fb89f3c35 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -33,6 +33,7 @@ define(function (require, exports, module) { DocumentManager, // Load from brackets.test FileViewController, // Load from brackets.test MainViewManager, // Load from brackets.test + WorkingSetView, SpecRunnerUtils = require("spec/SpecRunnerUtils"); @@ -72,7 +73,8 @@ define(function (require, exports, module) { DocumentManager = testWindow.brackets.test.DocumentManager; FileViewController = testWindow.brackets.test.FileViewController; MainViewManager = testWindow.brackets.test.MainViewManager; - + WorkingSetView = testWindow.brackets.test.WorkingSetView; + // Open a directory if (loadProject) { SpecRunnerUtils.loadProjectInTestWindow(testPath); @@ -329,6 +331,51 @@ define(function (require, exports, module) { }); }); }); + + it("should callback for icons", function () { + runs(function () { + function iconProvider(file) { + return ""; + } + + WorkingSetView.addIconProvider(iconProvider); + + runs(function () { + // Collect all icon filenames used + var $list = testWindow.$(".open-files-container > ul"); + var icons = $list.find(".icon").map(function () { + return $(this).attr("src"); + }).toArray(); + + // All directory names should be unique + expect(icons.length).toBe(2); + expect(icons[0]).toBe("file_one.js.jpg"); + expect(icons[1]).toBe("file_two.js.jpg"); + }); + }); + }); + it("should callback for class", function () { + runs(function () { + + var classes = ["one", "two"]; + + function classProvider(file) { + return classes.pop(); + } + + WorkingSetView.addClassProvider(classProvider); + + runs(function () { + // Collect all icon filenames used + var $list = testWindow.$(".open-files-container > li"), + test = ["one", "two"]; + + $list.each(function (number, el) { + expect($(el).hasClass(test.pop())).toBeTruthy(); + }); + }); + }); + }); }); }); \ No newline at end of file From e408f21a39c4399d894f1d6f49b7963bddd303b1 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Wed, 10 Sep 2014 11:55:08 -0700 Subject: [PATCH 014/182] mutable file object for wsv item class --- src/project/WorkingSetView.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index ab8b10245a8..581b4dda68a 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -619,15 +619,16 @@ define(function (require, exports, module) { */ WorkingSetView.prototype._createNewListItem = function (file) { var self = this, - selectedFile = MainViewManager.getCurrentlyViewedFile(this.paneId); + selectedFile = MainViewManager.getCurrentlyViewedFile(this.paneId), + data = {fullPath: file.fullPath, + name: file.name, + isFile: file.isFile}; // Create new list item with a link var $link = $("").html(ViewUtils.getFileEntryDisplay(file)); _iconProviders.forEach(function (provider) { - var icon = provider({fullPath: file.fullPath, - name: file.name, - isFile: file.isFile}); + var icon = provider(data); if (icon) { $link.prepend($(icon)); } @@ -640,7 +641,7 @@ define(function (require, exports, module) { this.$openFilesContainer.find("ul").append($newItem); _classProviders.forEach(function (provider) { - $newItem.addClass(provider(file)); + $newItem.addClass(provider(data)); }); // Update the listItem's apperance @@ -946,7 +947,7 @@ define(function (require, exports, module) { /** * adds an icon provider to the view. * Icon providers are called when a working set item is created - * @param {!function(!File):?string} callback - the function to call for each item + * @param {!function(!{fullPath:string, name:string, isFile:boolean}):?string} callback - the function to call for each item * The callback can return a string that contains and image tag to place before the filename * if a falsy value is returned then nothing is prepended to the list item */ @@ -960,7 +961,7 @@ define(function (require, exports, module) { /** * adds a list item class provider to the view. * Class providers are called when a working set item is created - * @param {!function(!File):?string} callback - the function to call for each item + * @param {!function(!{fullPath:string, name:string, isFile:boolean}):?string} callback - the function to call for each item * The callback can return a string that contains the class (or classes) to add to the list item */ function addClassProvider(callback) { From 502b5dff2fbd71bfca44881b323e2d956be62f7b Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Wed, 10 Sep 2014 11:58:23 -0700 Subject: [PATCH 015/182] fix comment --- test/spec/WorkingSetView-test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index c2fb89f3c35..55ba53ff950 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -367,7 +367,6 @@ define(function (require, exports, module) { WorkingSetView.addClassProvider(classProvider); runs(function () { - // Collect all icon filenames used var $list = testWindow.$(".open-files-container > li"), test = ["one", "two"]; From 79b3eae88ed882666bf8a1fcff46963b7418ec52 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Wed, 10 Sep 2014 12:00:19 -0700 Subject: [PATCH 016/182] rework classes array --- test/spec/WorkingSetView-test.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index 55ba53ff950..f79b29bcca6 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -358,7 +358,9 @@ define(function (require, exports, module) { it("should callback for class", function () { runs(function () { - var classes = ["one", "two"]; + var master = ["one", "two"], + classes = master.slice(0); + function classProvider(file) { return classes.pop(); @@ -368,7 +370,7 @@ define(function (require, exports, module) { runs(function () { var $list = testWindow.$(".open-files-container > li"), - test = ["one", "two"]; + test = master.slice(0); $list.each(function (number, el) { expect($(el).hasClass(test.pop())).toBeTruthy(); From c5079ff39d7ca0a6ed8cdf70c2abbb26a5151274 Mon Sep 17 00:00:00 2001 From: Miguel Castillo Date: Thu, 11 Sep 2014 10:11:55 -0400 Subject: [PATCH 017/182] Removing cursor !important so allow themes easily override cursor colors --- src/styles/brackets_theme_default.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/brackets_theme_default.less b/src/styles/brackets_theme_default.less index de63a3d4f84..3b233addcf6 100644 --- a/src/styles/brackets_theme_default.less +++ b/src/styles/brackets_theme_default.less @@ -145,7 +145,7 @@ // border: none !important; // to make an I-cursor, use something like this: - border-left: 1px solid black !important; + border-left: 1px solid black; } From b639321dec45648232fe58a3801008930b5cfd72 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Thu, 11 Sep 2014 09:09:00 -0700 Subject: [PATCH 018/182] allow refresh to update the class list without rebuilding the entire view --- src/project/WorkingSetView.js | 23 +++++++++++++++++++++++ test/spec/WorkingSetView-test.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 581b4dda68a..3a17004b086 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -354,6 +354,8 @@ define(function (require, exports, module) { this.$workingSetListViewHeader.show(); this._checkForDuplicatesInWorkingTree(); } + + this._updateItemClasses(); this._adjustForScrollbars(); this._fireSelectionChanged(); this.updateOptionsButton(); @@ -611,6 +613,27 @@ define(function (require, exports, module) { } }; + /** + * Updates the working set item class list + * @private + */ + WorkingSetView.prototype._updateItemClasses = function () { + if (_classProviders.length > 0) { + this.$openFilesContainer.find("ul > li").each(function () { + var $li = $(this), + file = $li.data(_FILE_KEY), + data = {fullPath: file.fullPath, + name: file.name, + isFile: file.isFile}; + + $li.removeAttr("class"); + _classProviders.forEach(function (provider) { + $li.addClass(provider(data)); + }); + }); + } + }; + /** * Builds the UI for a new list item and inserts in into the end of the list * @private diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index f79b29bcca6..84873c882c7 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -378,5 +378,33 @@ define(function (require, exports, module) { }); }); }); + + it("should allow refresh to be used to update the class list", function () { + runs(function () { + + function classProvider(file) { + return "one"; + } + + WorkingSetView.addClassProvider(classProvider); + + var master = ["three", "four"], + classes = master.slice(0); + + + WorkingSetView.refresh(); + + runs(function () { + var $list = testWindow.$(".open-files-container > li"), + test = master.slice(0); + + $list.each(function (number, el) { + expect($(el).hasClass(test.pop())).toBeTruthy(); + expect($(el).hasClass("one")).toBeFalsy(); + }); + }); + }); + }); + }); }); \ No newline at end of file From 4693413877cacb9e9034552d34963ee9852f7572 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Thu, 11 Sep 2014 09:16:48 -0700 Subject: [PATCH 019/182] update doc to support jQuery for IconProvider --- src/project/WorkingSetView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 3a17004b086..3b2c4a09cb8 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -970,8 +970,8 @@ define(function (require, exports, module) { /** * adds an icon provider to the view. * Icon providers are called when a working set item is created - * @param {!function(!{fullPath:string, name:string, isFile:boolean}):?string} callback - the function to call for each item - * The callback can return a string that contains and image tag to place before the filename + * @param {!function(!{fullPath:string, name:string, isFile:boolean}):?string|jQuery} callback - the function to call for each item + * The callback can return a string that contains and image tag , tag or a jQuery node to place before the filename * if a falsy value is returned then nothing is prepended to the list item */ function addIconProvider(callback) { From 493815567301fbe286d57d18821fdb98881781f9 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Thu, 11 Sep 2014 09:21:17 -0700 Subject: [PATCH 020/182] update comment --- src/project/WorkingSetView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 3b2c4a09cb8..6ab7840acbc 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -971,7 +971,8 @@ define(function (require, exports, module) { * adds an icon provider to the view. * Icon providers are called when a working set item is created * @param {!function(!{fullPath:string, name:string, isFile:boolean}):?string|jQuery} callback - the function to call for each item - * The callback can return a string that contains and image tag , tag or a jQuery node to place before the filename + * The callback can return a string that contains the html to place before the link of each WSV item. + * The return value can be a string or a jQuery node. * if a falsy value is returned then nothing is prepended to the list item */ function addIconProvider(callback) { From 27ef543e3aea2aaa9a95817b17dcb10214c205c1 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Thu, 11 Sep 2014 09:22:59 -0700 Subject: [PATCH 021/182] update comment again --- src/project/WorkingSetView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 6ab7840acbc..67e3295c667 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -971,8 +971,8 @@ define(function (require, exports, module) { * adds an icon provider to the view. * Icon providers are called when a working set item is created * @param {!function(!{fullPath:string, name:string, isFile:boolean}):?string|jQuery} callback - the function to call for each item - * The callback can return a string that contains the html to place before the link of each WSV item. - * The return value can be a string or a jQuery node. + * The callback must return the html to place before the link of each WSV item. + * The return value can be a string representing the HTML, a jQuery object or undefined. * if a falsy value is returned then nothing is prepended to the list item */ function addIconProvider(callback) { From 4eec543014bfe13784b334016a98a8d7cdc1d60a Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Thu, 11 Sep 2014 15:08:15 -0700 Subject: [PATCH 022/182] Rearrange the logic for clarity and add a new unit test. --- src/language/CSSUtils.js | 13 +++++++------ test/spec/CSSUtils-test.js | 9 +++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js index 18954b3d5b7..1ba07ded2c2 100644 --- a/src/language/CSSUtils.js +++ b/src/language/CSSUtils.js @@ -1573,13 +1573,14 @@ define(function (require, exports, module) { if (!isPreprocessorDoc && _hasNonWhitespace(ctx.token.string)) { foundChars = true; } + if (!TokenUtils.movePrevToken(ctx)) { + break; + } + } + } else { + if (!TokenUtils.movePrevToken(ctx)) { + break; } - } - - if ((ctx.token.type === "comment" || - (ctx.token.string !== "{" && ctx.token.string !== "}")) && - !TokenUtils.movePrevToken(ctx)) { - break; } } diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js index b3c20a58551..14c1bc560a2 100644 --- a/test/spec/CSSUtils-test.js +++ b/test/spec/CSSUtils-test.js @@ -396,6 +396,15 @@ define(function (require, exports, module) { expect(selector).toEqual(""); }); + // https://github.com/adobe/brackets/issues/9002 + it("should not hang when the cursor is after '{' or '}' inside comments", function () { + var selector = CSSUtils.findSelectorAtDocumentPos(editor, {line: 45, ch: 6}); // after { + expect(selector).toEqual(""); + + selector = CSSUtils.findSelectorAtDocumentPos(editor, {line: 45, ch: 23}); // after } + expect(selector).toEqual(""); + }); + it("should find rules adjacent to comments", function () { var selector = CSSUtils.findSelectorAtDocumentPos(editor, {line: 47, ch: 4}); expect(selector).toEqual("div"); From c9326d277103a879062a759169116b7f0d107a0f Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Fri, 12 Sep 2014 09:57:39 -0700 Subject: [PATCH 023/182] remove unused var in test --- test/spec/WorkingSetView-test.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index 84873c882c7..c6d83aab7fe 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -388,9 +388,7 @@ define(function (require, exports, module) { WorkingSetView.addClassProvider(classProvider); - var master = ["three", "four"], - classes = master.slice(0); - + var master = ["three", "four"]; WorkingSetView.refresh(); From fe3852bf75d7509188763b59d3dc6858b8a0a60f Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 13 Sep 2014 10:54:48 +0200 Subject: [PATCH 024/182] Enable UrlCodeHints for LESS/SCSS --- src/extensions/default/UrlCodeHints/main.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/extensions/default/UrlCodeHints/main.js b/src/extensions/default/UrlCodeHints/main.js index 4e4178803b3..784d9f58259 100644 --- a/src/extensions/default/UrlCodeHints/main.js +++ b/src/extensions/default/UrlCodeHints/main.js @@ -43,7 +43,8 @@ define(function (require, exports, module) { urlHints, data, - htmlAttrs; + htmlAttrs, + styleModes = ["css", "text/x-less", "text/x-scss"]; /** * @constructor @@ -264,7 +265,7 @@ define(function (require, exports, module) { var mode = editor.getModeForSelection(); if (mode === "html") { return this.hasHtmlHints(editor, implicitChar); - } else if (mode === "css") { + } else if (styleModes.indexOf(mode) > -1) { return this.hasCssHints(editor, implicitChar); } @@ -424,7 +425,7 @@ define(function (require, exports, module) { } this.info = tagInfo; - } else if (mode === "css") { + } else if (styleModes.indexOf(mode) > -1) { this.info = CSSUtils.getInfoAtPos(this.editor, cursor); var context = this.info.context; @@ -540,7 +541,7 @@ define(function (require, exports, module) { if (mode === "html") { return this.insertHtmlHint(completion); - } else if (mode === "css") { + } else if (styleModes.indexOf(mode) > -1) { return this.insertCssHint(completion); } @@ -813,7 +814,7 @@ define(function (require, exports, module) { htmlAttrs = data.htmlAttrs; urlHints = new UrlCodeHints(); - CodeHintManager.registerHintProvider(urlHints, ["css", "html"], 5); + CodeHintManager.registerHintProvider(urlHints, ["css", "html", "less", "scss"], 5); FileSystem.on("change", _clearCachedHints); FileSystem.on("rename", _clearCachedHints); From 645352e7c23f746e78404ffa6855cc6abb77afe7 Mon Sep 17 00:00:00 2001 From: Mohammad Yaghobi Date: Mon, 15 Sep 2014 00:14:23 +0430 Subject: [PATCH 025/182] Update Persian translation --- src/nls/fa-ir/strings.js | 145 ++++++++++++++++++++++++++------------- 1 file changed, 98 insertions(+), 47 deletions(-) diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index 8c43d594263..f4a6169327c 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -1,25 +1,25 @@ /* -* Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -* DEALINGS IN THE SOFTWARE. -* -*/ + * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ /*global define */ @@ -39,9 +39,12 @@ define({ "NO_MODIFICATION_ALLOWED_ERR_FILE" : "دسترسی های تعریف شده برای شما اجازه تغییرات را نمی دهند.", "CONTENTS_MODIFIED_ERR" : "این پرونده قبل خارج از محیط این نرم افزار ویرایش شده است.", "UNSUPPORTED_ENCODING_ERR" : "{APP_NAME} فعلا تنها از پرونده ها با ساختار یونیکدی UTF-8 پشتیبانی می کند.", + "UNSUPPORTED_FILE_TYPE_ERR" : "از این نوع فایل پشتیبانی نمی شود.", "FILE_EXISTS_ERR" : "پرونده یا پوشه مد نظر موجود می باشد.", "FILE" : "پرونده", + "FILE_TITLE" : "پرونده", "DIRECTORY" : "پوشه", + "DIRECTORY_TITLE" : "پوشه", "DIRECTORY_NAMES_LEDE" : "نام های پوشه", "FILENAMES_LEDE" : "نام های پرونده", "FILENAME" : "نام پرونده", @@ -69,6 +72,7 @@ define({ "INVALID_FILENAME_MESSAGE" : "نام پرونده نمی تواند شامل مقادیر زیر باشد: {0} و همچنین نمی توانید از عبارات مورد استفاده نرم افزار استفاده نمایید.", "ENTRY_WITH_SAME_NAME_EXISTS" : "پوشه یا پروندهی با نام {0} هم اکنون موجود است.", "ERROR_CREATING_FILE_TITLE" : "خطا در ایجاد {0}", + "ERROR_CREATING_FILE" : "خطا در هنگام ایجاد {0} {1}. {2}", // Application preferences corrupt error strings "ERROR_PREFS_CORRUPT_TITLE" : "خطا در خواندن تنظیمات", @@ -119,6 +123,7 @@ define({ // Generic dialog/button labels + "DONE" : "انجام", "OK" : "تائید", "CANCEL" : "لغو", "DONT_SAVE" : "ذخیره نکن", @@ -130,11 +135,12 @@ define({ "BUTTON_NO" : "خیر", // Find, Replace, Find in Files - "FIND_RESULT_COUNT" : "{0} نتیجه", - "FIND_RESULT_COUNT_SINGLE" : "1 نتیجه", + "FIND_MATCH_INDEX" : "{0} از {1}", "FIND_NO_RESULTS" : "بدون نتیجه", + "FIND_QUERY_PLACEHOLDER" : "جستجو\u2026", "REPLACE_PLACEHOLDER" : "جایگزینی با\u2026", "BUTTON_REPLACE_ALL" : "همه\u2026", + "BUTTON_REPLACE_ALL_IN_FILES" : "جایگزینی\u2026", "BUTTON_REPLACE" : "جایگزینی", "BUTTON_NEXT" : "\u25B6", "BUTTON_PREV" : "\u25C0", @@ -142,6 +148,9 @@ define({ "BUTTON_PREV_HINT" : "مورد قبلی", "BUTTON_CASESENSITIVE_HINT" : "مورد تطبیق یافته", "BUTTON_REGEXP_HINT" : "عبارت منظم", + "REPLACE_WITHOUT_UNDO_WARNING_TITLE": "جایگزینی بدون امکان بازگشت به قبل", + "REPLACE_WITHOUT_UNDO_WARNING" : "بدلیل اعمال تغییر در تعداد {0} پرونده, {APP_NAME} پرونده های باز نشده را نیز ویرایش و تغییر خواهد داد. بهمین جهت مقادیر تغییر یافته(جایگزین شده) غیر قابل بازگشت خواهند بود.", + "BUTTON_REPLACE_WITHOUT_UNDO" : "جایگزینی بدون بازگشت", "OPEN_FILE" : "باز کردن پرونده", "SAVE_FILE_AS" : "ذخیره پرونده", "CHOOSE_FOLDER" : "انتخاب پوشه", @@ -149,15 +158,14 @@ define({ "NO_UPDATE_TITLE" : "بروز هستید!", "NO_UPDATE_MESSAGE" : "شما درحال استفاده از آخرین نسخه براکتس هستید.", - // Replace All (in single file) - "FIND_REPLACE_TITLE_PART1" : "جایگزینی \"", - "FIND_REPLACE_TITLE_PART2" : "\" با \"", - "FIND_REPLACE_TITLE_PART3" : "\" — {2} {0} {1}", + // Find and Replace + "FIND_REPLACE_TITLE_LABEL" : "جایگزینی", + "FIND_REPLACE_TITLE_WITH" : "با", + "FIND_TITLE_LABEL" : "جستجو", + "FIND_TITLE_SUMMARY" : "— {0} {1} {2} در {3}", // Find in Files - "FIND_IN_FILES_TITLE_PART1" : "\"", - "FIND_IN_FILES_TITLE_PART2" : "\" پیدا شد", - "FIND_IN_FILES_TITLE_PART3" : "— {0} {1} {2} در {3} {4}", + "FIND_NUM_FILES" : "{0} {1}", "FIND_IN_FILES_SCOPED" : "در {0}", "FIND_IN_FILES_NO_SCOPE" : "در پروژ]", "FIND_IN_FILES_ZERO_FILES" : "فیلترسازی تمامی پرونده های منع شده {0}", @@ -169,16 +177,20 @@ define({ "FIND_IN_FILES_PAGING" : "{0}—{1}", "FIND_IN_FILES_FILE_PATH" : "پرونده: {0}", "FIND_IN_FILES_EXPAND_COLLAPSE" : "جهت بازکردن/بستن منوها کلید Ctrl/Cmd را گرفته و کلیک کنید.", + "REPLACE_IN_FILES_ERRORS_TITLE" : "خطاهای جایگزینی مقادیر", + "REPLACE_IN_FILES_ERRORS" : "پرونده های زیر قابل ویرایش نبودن. علت می تواند از قابل نوشتن نبودن پرونده های و یا تغییر آن های بعد از جستجو باشد.", "ERROR_FETCHING_UPDATE_INFO_TITLE" : "درحال بروزرسانی اطلاعات خطا", "ERROR_FETCHING_UPDATE_INFO_MSG" : "بروز خطا در هنگام دستیابی به آخرین اطلاعات بروزرسانی از سرویس دهنده. اطمینان حاصل کنید که به اینترنت متصل بوده و دوباره تلاش نمایید.", // File exclusion filters - "NO_FILE_FILTER" : "این پرونده ها محروم شده نیستند", - "EXCLUDE_FILE_FILTER" : "منع {0}", + "NEW_FILE_FILTER" : "اعمال یک تصویه(فیلتر) جدید\u2026", + "CLEAR_FILE_FILTER" : "رفع نادیده گیری پرونده ها", + "NO_FILE_FILTER" : "این پرونده ها از پرونده های نادیده گرفته شده نیستند", + "EXCLUDE_FILE_FILTER" : "نادیده گیری {0}", "EDIT_FILE_FILTER" : "ویرایش\u2026", - "FILE_FILTER_DIALOG" : "ویرایش محرومیت(منعیت پرونده)", - "FILE_FILTER_INSTRUCTIONS" : "محروم سازی پرونده ها و پوشه های منطبق با عبارات زیر یا برخی نویسه های عام. هر عبارت را در یک سطر جدید وارد کنید.", - "FILE_FILTER_LIST_PREFIX" : "جز", + "FILE_FILTER_DIALOG" : "ویرایش نادیده گرفته شده ها", + "FILE_FILTER_INSTRUCTIONS" : "نادیده گیری پرونده ها و پوشه های منطبق با عبارات زیر یا برخی نویسه های عام. هر عبارت را در یک سطر جدید وارد کنید.", + "FILTER_NAME_PLACEHOLDER" : "نام منع سازی(نادیده گیری مقادیر)-اختیاری", "FILE_FILTER_CLIPPED_SUFFIX" : "و {0} بیشتر", "FILTER_COUNTING_FILES" : "شمارش پرونده ها\u2026", "FILTER_FILE_COUNT" : "همیشه {0} از {1} پرونده {2}", @@ -202,7 +214,15 @@ define({ "PROJECT_LOADING" : "درحال بارگذاری\u2026", "UNTITLED" : "عنوان گذاری نشده", "WORKING_FILES" : "پرونده های کاری", - + + /** + * MainViewManager + */ + "TOP" : "بالا", + "BOTTOM" : "پایین", + "LEFT" : "چپ", + "RIGHT" : "راست", + /** * Keyboard modifier names */ @@ -230,6 +250,11 @@ define({ "STATUSBAR_USER_EXTENSIONS_DISABLED" : "غیرفعال سازی افزونه ها", "STATUSBAR_INSERT" : "واردسازی", "STATUSBAR_OVERWRITE" : "دوباره نویسی", + "STATUSBAR_INSOVR_TOOLTIP" : "جهت تغییر حالت از وارد سازی (INS) به بازنویسی (OVR) یا برعکس، کلیک کنید", + "STATUSBAR_LANG_TOOLTIP" : "جهت تغییر نوع فایل، کلیک کنید.", + "STATUSBAR_CODE_INSPECTION_TOOLTIP" : "{0}. باز و بسته کردن پنل گزارشات.", + "STATUSBAR_DEFAULT_LANG" : "(پیش فرض)", + "STATUSBAR_SET_DEFAULT_LANG" : "اعمال بعنوان پیش فرض برای .{0} پرونده", // CodeInspection: errors/warnings "ERRORS_PANEL_TITLE_MULTIPLE" : "{0} خطا", @@ -240,8 +265,8 @@ define({ "LINT_DISABLED" : "Linting غیرفعال شد", "NO_LINT_AVAILABLE" : "linter برای {0} دردسترس نیست", "NOTHING_TO_LINT" : "احتیاج به lint وجود ندارد", - "LINTER_TIMED_OUT" : "فعالیت{0} پس از انتظار بمدت{1} ثانیه خاتمه یافت", - "LINTER_FAILED" : "{0} با خطای زیر پایان یافته: {1}", + "LINTER_TIMED_OUT" : "فعالیت{0} پس از انتظار بمدت{1} ثانیه خاتمه یافت", + "LINTER_FAILED" : "{0} با خطای زیر پایان یافته: {1}", /** * Command Name Constants @@ -253,7 +278,7 @@ define({ "CMD_FILE_NEW" : "پرونده جدید", "CMD_FILE_NEW_FOLDER" : "پوشه جدید", "CMD_FILE_OPEN" : "باز کردن\u2026", - "CMD_ADD_TO_WORKING_SET" : "افزودن به محیط کاری", + "CMD_ADD_TO_WORKINGSET_AND_OPEN" : "افزودن به محیط کاری و باز کردن آن", "CMD_OPEN_DROPPED_FILES" : "بازکردن پرونده های درنظر گرفته نشده", "CMD_OPEN_FOLDER" : "باز کردن پوشه\u2026", "CMD_FILE_CLOSE" : "بستن", @@ -266,6 +291,7 @@ define({ "CMD_FILE_SAVE_ALL" : "ذخیره همه", "CMD_FILE_SAVE_AS" : "ذخیره همه\u2026", "CMD_LIVE_FILE_PREVIEW" : "پیش نمایش زنده", + "CMD_RELOAD_LIVE_PREVIEW" : "بارگزاری مجدد پیش نمایش زنده(با فشار)", "CMD_PROJECT_SETTINGS" : "تنظیمات پروژه\u2026", "CMD_FILE_RENAME" : "تغییر نام", "CMD_FILE_DELETE" : "حذف", @@ -305,7 +331,6 @@ define({ // Search menu commands "FIND_MENU" : "جستجو", "CMD_FIND" : "جستجو", - "CMD_FIND_FIELD_PLACEHOLDER" : "جستجو\u2026", "CMD_FIND_NEXT" : "بعدی", "CMD_FIND_PREVIOUS" : "قبلی", "CMD_FIND_ALL_AND_SELECT" : "جستجو برای تمامی موارد و انتخاب آن ها", @@ -315,6 +340,9 @@ define({ "CMD_FIND_IN_SELECTED" : "جستجو در پرونده/پوشه انتخاب شده", "CMD_FIND_IN_SUBTREE" : "جستجو در\u2026", "CMD_REPLACE" : "جستجو و جایگزینی", + "CMD_REPLACE_IN_FILES" : "جایگزینی در پرونده ها", + "CMD_REPLACE_IN_SELECTED" : "جایگزینی در پرونده/پوشه های انتخاب شده", + "CMD_REPLACE_IN_SUBTREE" : "جایگزینی در\u2026", // View menu commands "VIEW_MENU" : "نمایش", @@ -330,10 +358,11 @@ define({ "CMD_TOGGLE_WORD_WRAP" : "شکستن عبارات طولانی", "CMD_LIVE_HIGHLIGHT" : "نشانه گذاری پیش نمایش", "CMD_VIEW_TOGGLE_INSPECTION" : "نشانه گذاری پرونده های تغییر یافته برای ذخیره سازی", - "CMD_SORT_WORKINGSET_BY_ADDED" : "مرتب سازی بر اساس ترتیب افزودن", - "CMD_SORT_WORKINGSET_BY_NAME" : "مرتب سازی بر اساس نام", - "CMD_SORT_WORKINGSET_BY_TYPE" : "مرتب سازی بر اساس نوع", - "CMD_SORT_WORKINGSET_AUTO" : "مرتب سازی خودکار", + "CMD_WORKINGSET_SORT_BY_ADDED" : "مرتب سازی بر اساس ترتیب افزودن", + "CMD_WORKINGSET_SORT_BY_NAME" : "مرتب سازی بر اساس نام", + "CMD_WORKINGSET_SORT_BY_TYPE" : "مرتب سازی بر اساس نوع", + "CMD_WORKING_SORT_TOGGLE_AUTO" : "مرتب سازی خودکار", + "CMD_THEMES" : "پوسته ها\u2026", // Navigate menu Commands "NAVIGATE_MENU" : "انتقال", @@ -377,6 +406,7 @@ define({ "ABOUT" : "پیرامون", "CLOSE" : "بستن", "ABOUT_TEXT_LINE1" : "پیش روی {VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_BUILD_TIMESTAMP" : "build timestamp: ", "ABOUT_TEXT_LINE3" : "
    یادداشتهای ها، شرایط و ضوابط مربوط به نرم افزار و حقوق شخص ثالث در آدرسhttp://www.adobe.com/go/thirdparty/ جهت تلفیق و بعنوان مرجع قرار داده شده.", "ABOUT_TEXT_LINE4" : "اسناد، نکات و منابع نرم افزار در پیوند https://github.com/adobe/brackets/ در دسترس می باشد. می توانید جهت مشاهده سریع بروزرسانی های قبل از انتشار نرم افزار بهمین لینک مراجعه فرمایید.
    ترجمه توسط محمد یعقوبی", "ABOUT_TEXT_LINE5" : "ساخته شده با \u2764 و JavaScript و بدست:", @@ -393,7 +423,15 @@ define({ "BASEURL_ERROR_SEARCH_DISALLOWED" : "URL اصلی نمی تواند شامل پارامترهای جستجو بمانند \"{0}\" باشد.", "BASEURL_ERROR_HASH_DISALLOWED" : "URL اصلی نمی تواند hashes مشابه \"{0}\" داشته باشد.", "BASEURL_ERROR_INVALID_CHAR" : "برخی کاراکتر های خاص شبیه '{0}' می بایست %-encoded.", - "BASEURL_ERROR_UNKNOWN_ERROR" : "خطای ناشناخته در URL اصلی/پایه", + "BASEURL_ERROR_UNKNOWN_ERROR" : "خطای ناشناخته در URL اصلی/پایه", + "EMPTY_VIEW_HEADER" : "Select a file while this view has focus", + + // Strings for themes-settings.html and themes-general.html + "CURRENT_THEME" : "پوسته فعلی", + "USE_THEME_SCROLLBARS" : "Use Theme Scrollbars", + "FONT_SIZE" : "اندازه قلم", + "FONT_FAMILY" : "نوع قلم", + "THEMES_SETTINGS" : "تنظیمات پوسته ها", // CSS Quick Edit "BUTTON_NEW_RULE" : "قائده جدید", @@ -416,6 +454,8 @@ define({ "CANCELING_INSTALL" : "درحال لغو\u2026", "CANCELING_HUNG" : "عملیات لغو نصب زمان طولانیی به طول خواهد کشید. خطا یا خطا های داخلی ممکن است رخ دهد.", "INSTALL_CANCELED" : "فرایند نصب لفو گردید.", + "VIEW_COMPLETE_DESCRIPTION" : "مشاهده توضیح کامل", + "VIEW_TRUNCATED_DESCRIPTION" : "مشاهده توضیح مختصر", // These must match the error codes in ExtensionsDomain.Errors.* : "INVALID_ZIP_FILE" : "محتوای دانلود شده دارای پرونده zip معتبر نمی باشد.", @@ -443,7 +483,11 @@ define({ // For NOT_FOUND_ERR, see generic strings above "EXTENSION_MANAGER_TITLE" : "مدیریت افزونه ها", "EXTENSION_MANAGER_ERROR_LOAD" : "ناتوان در دسترسی به افزونه های ثبت شده. لطفا بعدا تلاش کنید.", - "INSTALL_FROM_URL" : "نصب از URL\u2026", + "INSTALL_EXTENSION_DRAG" : "پرونده زیپ را اینجا بکشید و یا", + "INSTALL_EXTENSION_DROP" : "پرونده زیپ را رها کنید تا نصب شود", + "INSTALL_EXTENSION_DROP_ERROR" : "نصب/بروزرسانی لغو شد، لطفا خطاهای زیر را برسی کنید:", + "INSTALL_FROM_URL" : "با آدرس اینترنتی نصب کنید\u2026", + "INSTALL_EXTENSION_VALIDATING" : "برسی صحت پرونده\u2026", "EXTENSION_AUTHOR" : "مولف", "EXTENSION_DATE" : "تاریخ", "EXTENSION_INCOMPATIBLE_NEWER" : "این افزونه احتیاج به نسخه جدیدی از براکتس دارد.", @@ -454,6 +498,9 @@ define({ "EXTENSION_MORE_INFO" : "اطلاعات بیشتر...", "EXTENSION_ERROR" : "خطای افزونه", "EXTENSION_KEYWORDS" : "کلمات کلیدی", + "EXTENSION_TRANSLATED_USER_LANG" : "ترجمه شده به زبان های {0} که زبان شما را نیز در بر دارد", + "EXTENSION_TRANSLATED_GENERAL" : "ترجمه شده به زبان های {0}", + "EXTENSION_TRANSLATED_LANGS" : "این افزونه تنها برای زبان های زیر ترجمه شده است: {0}", "EXTENSION_INSTALLED" : "نصب شده", "EXTENSION_UPDATE_INSTALLED" : "این افزونه دریافت شده و بعد از ترک براکتس نصب خواهد شد.", "EXTENSION_SEARCH_PLACEHOLDER" : "جستجو", @@ -480,6 +527,7 @@ define({ "EXTENSIONS_INSTALLED_TITLE" : "نصب شده", "EXTENSIONS_AVAILABLE_TITLE" : "در دسترس", + "EXTENSIONS_THEMES_TITLE" : "پوسته ها", "EXTENSIONS_UPDATES_TITLE" : "بروزرسانی ها", "INLINE_EDITOR_NO_MATCHES" : "هیچ مورد سازگاری دردسترس نیست.", "CSS_QUICK_EDIT_NO_MATCHES" : "هیچ قائده منطبقی برای CSSها نسبت به موردی که انتخاب کردید وجود ندارد.
    از گزینه \"قائده جدید\" برای تغریف یک قائده جدید استفاده کنید.", @@ -509,6 +557,7 @@ define({ "CMD_LOG_NODE_STATE" : "ورود گره به حالت کنسول", "CMD_RESTART_NODE" : "شروع دوباره گره", "CMD_SHOW_ERRORS_IN_STATUS_BAR" : "نمایش خطاها در نوار وظیفه", + "CMD_OPEN_BRACKETS_SOURCE" : "باز کردن منبع براکتس", "LANGUAGE_TITLE" : "انتخاب زبان", "LANGUAGE_MESSAGE" : "زبان:", "LANGUAGE_SUBMIT" : "بارگذاری مجدد براکتس", @@ -536,6 +585,8 @@ define({ "CMD_JUMPTO_DEFINITION" : "پرش جهت تعریف", "CMD_SHOW_PARAMETER_HINT" : "نمایش پارامتر", "NO_ARGUMENTS" : "<بدون پارامتر>", + "DETECTED_EXCLUSION_TITLE" : "خطای منطقی در پرونده JavaScript", + "DETECTED_EXCLUSION_INFO" : "براکتس در حال انجام یک پردازه خطادار می باشد:

    {0}

    This file will no longer be processed for code hints and jump to definition. To turn this back on, open .brackets.json in your project and remove the file from jscodehints.detectedExclusions.", // extensions/default/JSLint "JSLINT_NAME" : "JSLint", @@ -550,4 +601,4 @@ define({ "DOCS_MORE_LINK" : "بیشتر" }); -/* Last translated for fda91311bc233c9ffe7c0053101e9aec00f7a920 */ +/* Last translated for 6d4de6a8e699b63ee40a06f9252c00c44b64eb19 */ From 7c95df8bb1b171a7dfecce05c7137aa62c4d5e76 Mon Sep 17 00:00:00 2001 From: Mohammad Yaghobi Date: Mon, 15 Sep 2014 00:19:05 +0430 Subject: [PATCH 026/182] Update Persian translation --- src/nls/fa-ir/strings.js | 50 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index f4a6169327c..9ab27b198b0 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -39,12 +39,12 @@ define({ "NO_MODIFICATION_ALLOWED_ERR_FILE" : "دسترسی های تعریف شده برای شما اجازه تغییرات را نمی دهند.", "CONTENTS_MODIFIED_ERR" : "این پرونده قبل خارج از محیط این نرم افزار ویرایش شده است.", "UNSUPPORTED_ENCODING_ERR" : "{APP_NAME} فعلا تنها از پرونده ها با ساختار یونیکدی UTF-8 پشتیبانی می کند.", - "UNSUPPORTED_FILE_TYPE_ERR" : "از این نوع فایل پشتیبانی نمی شود.", + "UNSUPPORTED_FILE_TYPE_ERR" : "از این نوع پرونده پشتیبانی نمی شود.", "FILE_EXISTS_ERR" : "پرونده یا پوشه مد نظر موجود می باشد.", "FILE" : "پرونده", - "FILE_TITLE" : "پرونده", + "FILE_TITLE" : "پرونده", "DIRECTORY" : "پوشه", - "DIRECTORY_TITLE" : "پوشه", + "DIRECTORY_TITLE" : "پوشه", "DIRECTORY_NAMES_LEDE" : "نام های پوشه", "FILENAMES_LEDE" : "نام های پرونده", "FILENAME" : "نام پرونده", @@ -72,7 +72,7 @@ define({ "INVALID_FILENAME_MESSAGE" : "نام پرونده نمی تواند شامل مقادیر زیر باشد: {0} و همچنین نمی توانید از عبارات مورد استفاده نرم افزار استفاده نمایید.", "ENTRY_WITH_SAME_NAME_EXISTS" : "پوشه یا پروندهی با نام {0} هم اکنون موجود است.", "ERROR_CREATING_FILE_TITLE" : "خطا در ایجاد {0}", - "ERROR_CREATING_FILE" : "خطا در هنگام ایجاد {0} {1}. {2}", + "ERROR_CREATING_FILE" : "خطا در هنگام ایجاد {0} {1}. {2}", // Application preferences corrupt error strings "ERROR_PREFS_CORRUPT_TITLE" : "خطا در خواندن تنظیمات", @@ -123,7 +123,7 @@ define({ // Generic dialog/button labels - "DONE" : "انجام", + "DONE" : "انجام", "OK" : "تائید", "CANCEL" : "لغو", "DONT_SAVE" : "ذخیره نکن", @@ -135,12 +135,12 @@ define({ "BUTTON_NO" : "خیر", // Find, Replace, Find in Files - "FIND_MATCH_INDEX" : "{0} از {1}", + "FIND_MATCH_INDEX" : "{0} از {1}", "FIND_NO_RESULTS" : "بدون نتیجه", - "FIND_QUERY_PLACEHOLDER" : "جستجو\u2026", + "FIND_QUERY_PLACEHOLDER" : "جستجو\u2026", "REPLACE_PLACEHOLDER" : "جایگزینی با\u2026", "BUTTON_REPLACE_ALL" : "همه\u2026", - "BUTTON_REPLACE_ALL_IN_FILES" : "جایگزینی\u2026", + "BUTTON_REPLACE_ALL_IN_FILES" : "جایگزینی\u2026", "BUTTON_REPLACE" : "جایگزینی", "BUTTON_NEXT" : "\u25B6", "BUTTON_PREV" : "\u25C0", @@ -165,7 +165,7 @@ define({ "FIND_TITLE_SUMMARY" : "— {0} {1} {2} در {3}", // Find in Files - "FIND_NUM_FILES" : "{0} {1}", + "FIND_NUM_FILES" : "{0} {1}", "FIND_IN_FILES_SCOPED" : "در {0}", "FIND_IN_FILES_NO_SCOPE" : "در پروژ]", "FIND_IN_FILES_ZERO_FILES" : "فیلترسازی تمامی پرونده های منع شده {0}", @@ -178,19 +178,19 @@ define({ "FIND_IN_FILES_FILE_PATH" : "پرونده: {0}", "FIND_IN_FILES_EXPAND_COLLAPSE" : "جهت بازکردن/بستن منوها کلید Ctrl/Cmd را گرفته و کلیک کنید.", "REPLACE_IN_FILES_ERRORS_TITLE" : "خطاهای جایگزینی مقادیر", - "REPLACE_IN_FILES_ERRORS" : "پرونده های زیر قابل ویرایش نبودن. علت می تواند از قابل نوشتن نبودن پرونده های و یا تغییر آن های بعد از جستجو باشد.", + "REPLACE_IN_FILES_ERRORS" : "پرونده های زیر قابل ویرایش نبودن. علت می تواند از قابل نوشتن نبودن پرونده های و یا تغییر آن های بعد از جستجو باشد.", "ERROR_FETCHING_UPDATE_INFO_TITLE" : "درحال بروزرسانی اطلاعات خطا", "ERROR_FETCHING_UPDATE_INFO_MSG" : "بروز خطا در هنگام دستیابی به آخرین اطلاعات بروزرسانی از سرویس دهنده. اطمینان حاصل کنید که به اینترنت متصل بوده و دوباره تلاش نمایید.", // File exclusion filters "NEW_FILE_FILTER" : "اعمال یک تصویه(فیلتر) جدید\u2026", - "CLEAR_FILE_FILTER" : "رفع نادیده گیری پرونده ها", + "CLEAR_FILE_FILTER" : "رفع نادیده گیری پرونده ها", "NO_FILE_FILTER" : "این پرونده ها از پرونده های نادیده گرفته شده نیستند", "EXCLUDE_FILE_FILTER" : "نادیده گیری {0}", "EDIT_FILE_FILTER" : "ویرایش\u2026", "FILE_FILTER_DIALOG" : "ویرایش نادیده گرفته شده ها", "FILE_FILTER_INSTRUCTIONS" : "نادیده گیری پرونده ها و پوشه های منطبق با عبارات زیر یا برخی نویسه های عام. هر عبارت را در یک سطر جدید وارد کنید.", - "FILTER_NAME_PLACEHOLDER" : "نام منع سازی(نادیده گیری مقادیر)-اختیاری", + "FILTER_NAME_PLACEHOLDER" : "نام منع سازی(نادیده گیری مقادیر)-اختیاری", "FILE_FILTER_CLIPPED_SUFFIX" : "و {0} بیشتر", "FILTER_COUNTING_FILES" : "شمارش پرونده ها\u2026", "FILTER_FILE_COUNT" : "همیشه {0} از {1} پرونده {2}", @@ -251,10 +251,10 @@ define({ "STATUSBAR_INSERT" : "واردسازی", "STATUSBAR_OVERWRITE" : "دوباره نویسی", "STATUSBAR_INSOVR_TOOLTIP" : "جهت تغییر حالت از وارد سازی (INS) به بازنویسی (OVR) یا برعکس، کلیک کنید", - "STATUSBAR_LANG_TOOLTIP" : "جهت تغییر نوع فایل، کلیک کنید.", + "STATUSBAR_LANG_TOOLTIP" : "جهت تغییر نوع پرونده، کلیک کنید.", "STATUSBAR_CODE_INSPECTION_TOOLTIP" : "{0}. باز و بسته کردن پنل گزارشات.", "STATUSBAR_DEFAULT_LANG" : "(پیش فرض)", - "STATUSBAR_SET_DEFAULT_LANG" : "اعمال بعنوان پیش فرض برای .{0} پرونده", + "STATUSBAR_SET_DEFAULT_LANG" : "اعمال بعنوان پیش فرض برای .{0} پرونده", // CodeInspection: errors/warnings "ERRORS_PANEL_TITLE_MULTIPLE" : "{0} خطا", @@ -291,7 +291,7 @@ define({ "CMD_FILE_SAVE_ALL" : "ذخیره همه", "CMD_FILE_SAVE_AS" : "ذخیره همه\u2026", "CMD_LIVE_FILE_PREVIEW" : "پیش نمایش زنده", - "CMD_RELOAD_LIVE_PREVIEW" : "بارگزاری مجدد پیش نمایش زنده(با فشار)", + "CMD_RELOAD_LIVE_PREVIEW" : "بارگزاری مجدد پیش نمایش زنده(با فشار)", "CMD_PROJECT_SETTINGS" : "تنظیمات پروژه\u2026", "CMD_FILE_RENAME" : "تغییر نام", "CMD_FILE_DELETE" : "حذف", @@ -340,7 +340,7 @@ define({ "CMD_FIND_IN_SELECTED" : "جستجو در پرونده/پوشه انتخاب شده", "CMD_FIND_IN_SUBTREE" : "جستجو در\u2026", "CMD_REPLACE" : "جستجو و جایگزینی", - "CMD_REPLACE_IN_FILES" : "جایگزینی در پرونده ها", + "CMD_REPLACE_IN_FILES" : "جایگزینی در پرونده ها", "CMD_REPLACE_IN_SELECTED" : "جایگزینی در پرونده/پوشه های انتخاب شده", "CMD_REPLACE_IN_SUBTREE" : "جایگزینی در\u2026", @@ -362,7 +362,7 @@ define({ "CMD_WORKINGSET_SORT_BY_NAME" : "مرتب سازی بر اساس نام", "CMD_WORKINGSET_SORT_BY_TYPE" : "مرتب سازی بر اساس نوع", "CMD_WORKING_SORT_TOGGLE_AUTO" : "مرتب سازی خودکار", - "CMD_THEMES" : "پوسته ها\u2026", + "CMD_THEMES" : "پوسته ها\u2026", // Navigate menu Commands "NAVIGATE_MENU" : "انتقال", @@ -406,7 +406,7 @@ define({ "ABOUT" : "پیرامون", "CLOSE" : "بستن", "ABOUT_TEXT_LINE1" : "پیش روی {VERSION_MINOR} {BUILD_TYPE} {VERSION}", - "ABOUT_TEXT_BUILD_TIMESTAMP" : "build timestamp: ", + "ABOUT_TEXT_BUILD_TIMESTAMP" : "build timestamp: ", "ABOUT_TEXT_LINE3" : "
    یادداشتهای ها، شرایط و ضوابط مربوط به نرم افزار و حقوق شخص ثالث در آدرسhttp://www.adobe.com/go/thirdparty/ جهت تلفیق و بعنوان مرجع قرار داده شده.", "ABOUT_TEXT_LINE4" : "اسناد، نکات و منابع نرم افزار در پیوند https://github.com/adobe/brackets/ در دسترس می باشد. می توانید جهت مشاهده سریع بروزرسانی های قبل از انتشار نرم افزار بهمین لینک مراجعه فرمایید.
    ترجمه توسط محمد یعقوبی", "ABOUT_TEXT_LINE5" : "ساخته شده با \u2764 و JavaScript و بدست:", @@ -424,7 +424,7 @@ define({ "BASEURL_ERROR_HASH_DISALLOWED" : "URL اصلی نمی تواند hashes مشابه \"{0}\" داشته باشد.", "BASEURL_ERROR_INVALID_CHAR" : "برخی کاراکتر های خاص شبیه '{0}' می بایست %-encoded.", "BASEURL_ERROR_UNKNOWN_ERROR" : "خطای ناشناخته در URL اصلی/پایه", - "EMPTY_VIEW_HEADER" : "Select a file while this view has focus", + "EMPTY_VIEW_HEADER" : "Select a file while this view has focus", // Strings for themes-settings.html and themes-general.html "CURRENT_THEME" : "پوسته فعلی", @@ -487,7 +487,7 @@ define({ "INSTALL_EXTENSION_DROP" : "پرونده زیپ را رها کنید تا نصب شود", "INSTALL_EXTENSION_DROP_ERROR" : "نصب/بروزرسانی لغو شد، لطفا خطاهای زیر را برسی کنید:", "INSTALL_FROM_URL" : "با آدرس اینترنتی نصب کنید\u2026", - "INSTALL_EXTENSION_VALIDATING" : "برسی صحت پرونده\u2026", + "INSTALL_EXTENSION_VALIDATING" : "برسی صحت پرونده\u2026", "EXTENSION_AUTHOR" : "مولف", "EXTENSION_DATE" : "تاریخ", "EXTENSION_INCOMPATIBLE_NEWER" : "این افزونه احتیاج به نسخه جدیدی از براکتس دارد.", @@ -500,7 +500,7 @@ define({ "EXTENSION_KEYWORDS" : "کلمات کلیدی", "EXTENSION_TRANSLATED_USER_LANG" : "ترجمه شده به زبان های {0} که زبان شما را نیز در بر دارد", "EXTENSION_TRANSLATED_GENERAL" : "ترجمه شده به زبان های {0}", - "EXTENSION_TRANSLATED_LANGS" : "این افزونه تنها برای زبان های زیر ترجمه شده است: {0}", + "EXTENSION_TRANSLATED_LANGS" : "این افزونه تنها برای زبان های زیر ترجمه شده است: {0}", "EXTENSION_INSTALLED" : "نصب شده", "EXTENSION_UPDATE_INSTALLED" : "این افزونه دریافت شده و بعد از ترک براکتس نصب خواهد شد.", "EXTENSION_SEARCH_PLACEHOLDER" : "جستجو", @@ -527,7 +527,7 @@ define({ "EXTENSIONS_INSTALLED_TITLE" : "نصب شده", "EXTENSIONS_AVAILABLE_TITLE" : "در دسترس", - "EXTENSIONS_THEMES_TITLE" : "پوسته ها", + "EXTENSIONS_THEMES_TITLE" : "پوسته ها", "EXTENSIONS_UPDATES_TITLE" : "بروزرسانی ها", "INLINE_EDITOR_NO_MATCHES" : "هیچ مورد سازگاری دردسترس نیست.", "CSS_QUICK_EDIT_NO_MATCHES" : "هیچ قائده منطبقی برای CSSها نسبت به موردی که انتخاب کردید وجود ندارد.
    از گزینه \"قائده جدید\" برای تغریف یک قائده جدید استفاده کنید.", @@ -557,7 +557,7 @@ define({ "CMD_LOG_NODE_STATE" : "ورود گره به حالت کنسول", "CMD_RESTART_NODE" : "شروع دوباره گره", "CMD_SHOW_ERRORS_IN_STATUS_BAR" : "نمایش خطاها در نوار وظیفه", - "CMD_OPEN_BRACKETS_SOURCE" : "باز کردن منبع براکتس", + "CMD_OPEN_BRACKETS_SOURCE" : "باز کردن منبع براکتس", "LANGUAGE_TITLE" : "انتخاب زبان", "LANGUAGE_MESSAGE" : "زبان:", "LANGUAGE_SUBMIT" : "بارگذاری مجدد براکتس", @@ -585,8 +585,8 @@ define({ "CMD_JUMPTO_DEFINITION" : "پرش جهت تعریف", "CMD_SHOW_PARAMETER_HINT" : "نمایش پارامتر", "NO_ARGUMENTS" : "<بدون پارامتر>", - "DETECTED_EXCLUSION_TITLE" : "خطای منطقی در پرونده JavaScript", - "DETECTED_EXCLUSION_INFO" : "براکتس در حال انجام یک پردازه خطادار می باشد:

    {0}

    This file will no longer be processed for code hints and jump to definition. To turn this back on, open .brackets.json in your project and remove the file from jscodehints.detectedExclusions.", + "DETECTED_EXCLUSION_TITLE" : "خطای منطقی در پرونده JavaScript", + "DETECTED_EXCLUSION_INFO" : "براکتس در حال انجام یک پردازه خطادار می باشد:

    {0}

    This file will no longer be processed for code hints and jump to definition. To turn this back on, open .brackets.json in your project and remove the file from jscodehints.detectedExclusions.", // extensions/default/JSLint "JSLINT_NAME" : "JSLint", From 24c0768dd143cfd355719a494ac20fe739291ae9 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Tue, 16 Sep 2014 14:08:00 +0200 Subject: [PATCH 027/182] Add unit tests --- test/spec/FileUtils-test.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/test/spec/FileUtils-test.js b/test/spec/FileUtils-test.js index e0cd9612c18..f2ea8cdba67 100644 --- a/test/spec/FileUtils-test.js +++ b/test/spec/FileUtils-test.js @@ -22,7 +22,7 @@ */ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, window, $, jasmine, brackets */ +/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, window, $, jasmine, brackets, spyOn */ /*unittests: FileUtils*/ define(function (require, exports, module) { @@ -182,5 +182,23 @@ define(function (require, exports, module) { expect(FileUtils.getSmartFileExtension("foo.bar.php.scss.erb")).toBe("php.scss.erb"); }); }); + + describe("compareFilenames", function () { + + it("should compare filenames using German rules", function () { + spyOn(brackets, "getLocale").andReturn("de-DE"); + // Should be like this: Äckerman, Adler, Rossi, Xavier + expect(FileUtils.compareFilenames("Äckerman", "Adler", false)).toBeLessThan(0); + expect(FileUtils.compareFilenames("Adler", "Rossi", false)).toBeLessThan(0); + expect(FileUtils.compareFilenames("Rossi", "Xavier", false)).toBeLessThan(0); + }); + it("should compare filenames using Swedish rules", function () { + spyOn(brackets, "getLocale").andReturn("sv"); + // Should be like this: Adler, Rossie, Xavier, Äckerman + expect(FileUtils.compareFilenames("Adler", "Rossie", false)).toBeLessThan(0); + expect(FileUtils.compareFilenames("Rossie", "Xavier", false)).toBeLessThan(0); + expect(FileUtils.compareFilenames("Xavier", "Äckerman", false)).toBeLessThan(0); + }); + }); }); }); From ce058226bf25f4fed517b5cacd90fd6ccf8e1b11 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Tue, 16 Sep 2014 22:29:03 -0700 Subject: [PATCH 028/182] Fix bug #8882 (Background flickers when opening themes dropdown) - ensure the 'select:active > option' colors exactly match the 'select > option' colors by explicitly specifying '> option' colors instead of letting them be quasi-inherited from the parent 'select'. Also, add a mousedown (:active) state for dark mode similar to the one in light mode, based on how other dark mode buttons are styled. --- src/styles/brackets_patterns_override.less | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 48c821106b8..4a1f9c37b6b 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -1844,12 +1844,20 @@ select { &:active { background-color: @bc-btn-bg-down; box-shadow: inset 0 1px 0 @bc-shadow-small; + + .dark & { + background-color: @dark-bc-btn-bg-down; + box-shadow: inset 0 1px 0 @dark-bc-shadow-small; + } } + + > option { // Windows (but not Mac) lets you style the dropdown items + background-color: @bc-menu-bg; + color: @bc-menu-text; - > option { // This works on windows. .dark & { - background: @dark-bc-menu-bg !important; - color: @dark-bc-menu-text !important; + background: @dark-bc-menu-bg; + color: @dark-bc-menu-text; } } From 0931ac91814219263aaa1416ab1b1f0b3bfc5e30 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Thu, 18 Sep 2014 19:22:38 +0200 Subject: [PATCH 029/182] Unit tests. --- .../testfiles/subfolder/test.scss | 8 +++++ .../default/UrlCodeHints/unittests.js | 30 +++++++++++++++---- 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 src/extensions/default/UrlCodeHints/testfiles/subfolder/test.scss diff --git a/src/extensions/default/UrlCodeHints/testfiles/subfolder/test.scss b/src/extensions/default/UrlCodeHints/testfiles/subfolder/test.scss new file mode 100644 index 00000000000..bbbb0f10e64 --- /dev/null +++ b/src/extensions/default/UrlCodeHints/testfiles/subfolder/test.scss @@ -0,0 +1,8 @@ +/* test.scss */ +body { + .test { + &.brackets { + background-image: url(); + } + } +} diff --git a/src/extensions/default/UrlCodeHints/unittests.js b/src/extensions/default/UrlCodeHints/unittests.js index d471a413e92..8aeebffe32e 100644 --- a/src/extensions/default/UrlCodeHints/unittests.js +++ b/src/extensions/default/UrlCodeHints/unittests.js @@ -41,6 +41,7 @@ define(function (require, exports, module) { var extensionPath = FileUtils.getNativeModuleDirectoryPath(module), testHtmlPath = extensionPath + "/testfiles/test.html", testCssPath = extensionPath + "/testfiles/subfolder/test.css", + testScssPath = extensionPath + "/testfiles/subfolder/test.scss", testDocument, testEditor, hintsObj; @@ -50,7 +51,7 @@ define(function (require, exports, module) { // strategically so that they sort the same on all OS's (i.e. folders are listed // first, and then files), but this is not true for UrlCodeHints folder. var testfilesDirHints = [ "subfolder/", "test.html"], - subfolderDirHints = [ "chevron.png", "test.css", "test.js"], + subfolderDirHints = [ "chevron.png", "test.css", "test.js", "test.scss"], UrlCodeHintsDirHintsMac = [ "../data.json", "../main.js", "../testfiles/", "../unittests.js"], UrlCodeHintsDirHints = [ "../testfiles/", "../data.json", "../main.js", "../unittests.js"]; @@ -277,7 +278,7 @@ define(function (require, exports, module) { tearDownTests(); }); - it("should hint for background-image: url()", function () { + it("should hint for background-image: url() in CSS", function () { runs(function () { testEditor.setCursorPos({ line: 3, ch: 26 }); hintsObj = null; @@ -287,6 +288,23 @@ define(function (require, exports, module) { runs(function () { verifyUrlHints(hintsObj.hints, subfolderDirHints); }); + + runs(function () { + tearDownTests(); + setupTests(testScssPath); + }); + }); + + it("should hint for background-image: url() in SCSS", function () { + runs(function () { + testEditor.setCursorPos({ line: 4, ch: 34 }); + hintsObj = null; + expectAsyncHints(UrlCodeHints.hintProvider); + }); + + runs(function () { + verifyUrlHints(hintsObj.hints, subfolderDirHints); + }); }); }); @@ -471,7 +489,7 @@ define(function (require, exports, module) { runs(function () { expect(hintsObj).toBeTruthy(); expect(hintsObj.hints).toBeTruthy(); - expect(hintsObj.hints.length).toBe(3); + expect(hintsObj.hints.length).toBe(subfolderDirHints.length); // Complete path is displayed expect(hintsObj.hints[0]).toBe("subfolder/chevron.png"); @@ -526,7 +544,7 @@ define(function (require, exports, module) { runs(function () { expect(hintsObj).toBeTruthy(); expect(hintsObj.hints).toBeTruthy(); - expect(hintsObj.hints.length).toBe(3); + expect(hintsObj.hints.length).toBe(subfolderDirHints.length); // Complete path is displayed expect(hintsObj.hints[0]).toBe("subfolder/chevron.png"); @@ -578,7 +596,7 @@ define(function (require, exports, module) { runs(function () { expect(hintsObj).toBeTruthy(); expect(hintsObj.hints).toBeTruthy(); - expect(hintsObj.hints.length).toBe(3); + expect(hintsObj.hints.length).toBe(subfolderDirHints.length); // Complete path is displayed expect(hintsObj.hints[0]).toBe("subfolder/chevron.png"); @@ -675,7 +693,7 @@ define(function (require, exports, module) { runs(function () { expect(hintsObj).toBeTruthy(); expect(hintsObj.hints).toBeTruthy(); - expect(hintsObj.hints.length).toBe(3); + expect(hintsObj.hints.length).toBe(subfolderDirHints.length); // Complete path is displayed expect(hintsObj.hints[0]).toBe("subfolder/chevron.png"); From d339001a99da0d78b9add35dbad3235ecb144ced Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Mon, 22 Sep 2014 16:00:06 -0700 Subject: [PATCH 030/182] =?UTF-8?q?Fix=20the=20unit=20test=20issue=20and?= =?UTF-8?q?=20replace=20`while=20(true)`=20loop=20with=20clearer=20logic?= =?UTF-8?q?=20in=20`do=20=E2=80=A6=20while`=20loop.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/language/CSSUtils.js | 14 +++++--------- test/spec/CSSUtils-test-files/offsets.css | 6 ++++++ test/spec/CSSUtils-test.js | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js index 1ba07ded2c2..1a87456dfba 100644 --- a/src/language/CSSUtils.js +++ b/src/language/CSSUtils.js @@ -1544,7 +1544,7 @@ define(function (require, exports, module) { } // scan backwards to see if the cursor is in a rule - while (true) { + do { if (ctx.token.type !== "comment") { if (ctx.token.string === "}") { if (isPreprocessorDoc) { @@ -1573,16 +1573,12 @@ define(function (require, exports, module) { if (!isPreprocessorDoc && _hasNonWhitespace(ctx.token.string)) { foundChars = true; } - if (!TokenUtils.movePrevToken(ctx)) { - break; - } + TokenUtils.movePrevToken(ctx); } } else { - if (!TokenUtils.movePrevToken(ctx)) { - break; - } + TokenUtils.movePrevToken(ctx); } - } + } while (!(ctx.pos.line === 0 && ctx.pos.ch === 0)); selector = _stripAtRules(selector); @@ -1604,7 +1600,7 @@ define(function (require, exports, module) { // At this point if we haven't found a selector, but have seen chars when // scanning, assume we are in the middle of a selector. For a preprocessor // document we also need to collect the current selector if the cursor is - // is within the selector or whitespaces immediately before or after it. + // within the selector or whitespaces immediately before or after it. if ((!selector || isPreprocessorDoc) && foundChars) { // scan forward to see if the cursor is in a selector while (true) { diff --git a/test/spec/CSSUtils-test-files/offsets.css b/test/spec/CSSUtils-test-files/offsets.css index 18cf7539dad..c7d62260c28 100644 --- a/test/spec/CSSUtils-test-files/offsets.css +++ b/test/spec/CSSUtils-test-files/offsets.css @@ -49,3 +49,9 @@ div { /* nested comment */ /* border: none */ } +/* another rule inside a comment to test https://github.com/adobe/brackets/issues/9002 */ +/* +p { + color: "black"; +} +*/ diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js index 14c1bc560a2..81ab26d8c2d 100644 --- a/test/spec/CSSUtils-test.js +++ b/test/spec/CSSUtils-test.js @@ -398,10 +398,10 @@ define(function (require, exports, module) { // https://github.com/adobe/brackets/issues/9002 it("should not hang when the cursor is after '{' or '}' inside comments", function () { - var selector = CSSUtils.findSelectorAtDocumentPos(editor, {line: 45, ch: 6}); // after { + var selector = CSSUtils.findSelectorAtDocumentPos(editor, {line: 53, ch: 3}); // after { expect(selector).toEqual(""); - selector = CSSUtils.findSelectorAtDocumentPos(editor, {line: 45, ch: 23}); // after } + selector = CSSUtils.findSelectorAtDocumentPos(editor, {line: 55, ch: 1}); // after } expect(selector).toEqual(""); }); From 1577efe9fd12b24e9af9c377fd1baa3ef5e359c0 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Mon, 22 Sep 2014 16:47:03 +0200 Subject: [PATCH 031/182] Fix "Install from URL" issue --- src/htmlContent/extension-manager-dialog.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/htmlContent/extension-manager-dialog.html b/src/htmlContent/extension-manager-dialog.html index 3a985284c06..abe4fee2ba7 100644 --- a/src/htmlContent/extension-manager-dialog.html +++ b/src/htmlContent/extension-manager-dialog.html @@ -1,5 +1,5 @@ -
    -
    +
    +
    -
    +
    From 7cb6478fe3a3d5fe2973800852607d60f17aee80 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 23 Sep 2014 14:32:18 -0400 Subject: [PATCH 032/182] Better handling for FS events in the tree. This is a fix for #9215. There were edge cases that weren't properly handled in the FileTreeViewModel and also it appears that the filesystem sends events with just a directory entry and no added/removed that could indicate that a directory newly exists. --- src/project/FileTreeViewModel.js | 52 +++++++++++++++++++- src/project/ProjectModel.js | 6 +++ test/spec/FileTreeViewModel-test.js | 76 +++++++++++++++++++++++++++++ test/spec/ProjectModel-test.js | 11 +++++ 4 files changed, 143 insertions(+), 2 deletions(-) diff --git a/src/project/FileTreeViewModel.js b/src/project/FileTreeViewModel.js index abe981aeaea..e7164d162a3 100644 --- a/src/project/FileTreeViewModel.js +++ b/src/project/FileTreeViewModel.js @@ -170,7 +170,7 @@ define(function (require, exports, module) { // Step through the parts of the path and the treeData object simultaneously while (part) { // We hit the end of the tree without finding our object, so return null - if (treeData === null) { + if (!treeData) { return null; } @@ -867,7 +867,7 @@ define(function (require, exports, module) { if (parentPath.length > 0) { var childrenPath = _.clone(parentPath); childrenPath.push("children"); - + treeData = treeData.updateIn(childrenPath, function (children) { return children.set(name, newFile); }); @@ -976,6 +976,13 @@ define(function (require, exports, module) { basename = FileUtils.getBaseName(filePath); if (parentObjectPath) { + // Verify that the children are loaded + var childrenPath = _.clone(parentObjectPath); + childrenPath.push("children"); + if (treeData.getIn(childrenPath) === null) { + return; + } + treeData = _createPlaceholder(treeData, parentPath, basename, isFolder, { notInCreateMode: true, doNotOpen: true @@ -1015,6 +1022,46 @@ define(function (require, exports, module) { this._commitTreeData(treeData); }; + + /** + * Makes sure that the directory exists. This will create a directory object (unloaded) + * if the directory does not already exist. A change message is also fired in that case. + * + * This is useful for file system events which can refer to a directory that we don't + * know about already. + * + * @param {string} path Project-relative path to the directory + */ + FileTreeViewModel.prototype.ensureDirectoryExists = function (path) { + var treeData = this._treeData, + pathWithoutSlash = FileUtils.stripTrailingSlash(path), + parentPath = FileUtils.getDirectoryPath(pathWithoutSlash), + name = pathWithoutSlash.substr(parentPath.length), + targetPath = []; + + if (parentPath) { + targetPath = _filePathToObjectPath(treeData, parentPath); + if (!targetPath) { + return; + } + targetPath.push("children"); + if (!treeData.getIn(targetPath)) { + return; + } + } + + targetPath.push(name); + + if (treeData.getIn(targetPath)) { + return; + } + + treeData = _setIn(treeData, targetPath, Immutable.Map({ + children: null + })); + + this._commitTreeData(treeData); + }; /** * Sets the value of the `sortDirectoriesFirst` flag which tells to view that directories @@ -1083,6 +1130,7 @@ define(function (require, exports, module) { exports.EVENT_CHANGE = EVENT_CHANGE; exports._filePathToObjectPath = _filePathToObjectPath; exports._isFilePathVisible = _isFilePathVisible; + exports._createPlaceholder = _createPlaceholder; // Public API exports.isFile = isFile; diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index af9fc52ad99..2b21c3c257e 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -1104,6 +1104,12 @@ define(function (require, exports, module) { changes.changed = [ this.makeProjectRelativeIfPossible(entry.fullPath) ]; + } else { + // Special case: a directory passed in without added and removed values + // appears to be new. + if (!added && !removed) { + this._viewModel.ensureDirectoryExists(this.makeProjectRelativeIfPossible(entry.fullPath)); + } } if (added) { diff --git a/test/spec/FileTreeViewModel-test.js b/test/spec/FileTreeViewModel-test.js index daf253998e4..dec123974de 100644 --- a/test/spec/FileTreeViewModel-test.js +++ b/test/spec/FileTreeViewModel-test.js @@ -76,6 +76,10 @@ define(function (require, exports, module) { ); }); + it("returns undefined for a file in a path that mistakenly includes a file", function () { + expect(FileTreeViewModel._filePathToObjectPath(treeData, "subdir/afile.js/nofile.js")).toBeNull(); + }); + it("can return if an a path is visible or not", function () { var isFilePathVisible = _.partial(FileTreeViewModel._isFilePathVisible, treeData); expect(isFilePathVisible("subdir/afile.js")).toBe(true); @@ -747,6 +751,78 @@ define(function (require, exports, module) { expect(vm._treeData).not.toBe(originalTreeData); expect(vm._treeData.get("topfile.js")).toBeUndefined(); }); + + it("shouldn't make changes for a new file in a directory that hasn't been loaded", function () { + vm._treeData = vm._treeData.set("unloaded", Immutable.Map({ + children: null + })); + vm.processChanges({ + added: [ + "unloaded/file.txt" + ] + }); + expect(changesFired).toBe(0); + expect(vm._treeData.get("unloaded").toJS()).toEqual({ + children: null + }); + }); + }); + + describe("ensureDirectoryExists", function () { + var vm, + changesFired; + + beforeEach(function () { + vm = new FileTreeViewModel.FileTreeViewModel(); + vm._treeData = Immutable.fromJS({ + subdir: { + children: null + } + }); + changesFired = 0; + + vm.on(FileTreeViewModel.EVENT_CHANGE, function () { + changesFired++; + }); + }); + + it("should do nothing for a directory that already exists", function () { + vm.ensureDirectoryExists("subdir/"); + expect(changesFired).toBe(0); + }); + + it("should create a top-level directory", function () { + vm.ensureDirectoryExists("newdir/"); + expect(changesFired).toBe(1); + expect(vm._treeData.get("newdir").toJS()).toEqual({ + children: null + }); + }); + + it("should do nothing within a subdirectory that doesn't exist", function () { + vm.ensureDirectoryExists("newdir/bar/"); + expect(changesFired).toBe(0); + expect(vm._treeData.get("newdir")).toBeUndefined(); + }); + + it("should create a directory within a directory", function () { + vm._treeData = Immutable.fromJS({ + subdir: { + children: {} + } + }); + vm.ensureDirectoryExists("subdir/newdir/"); + expect(changesFired).toBe(1); + expect(vm._getObject("subdir/newdir/").toJS()).toEqual({ + children: null + }); + }); + + it("should do nothing in a directory that is not loaded", function () { + vm.ensureDirectoryExists("subdir/newdir/"); + expect(changesFired).toBe(0); + expect(vm._getObject("subdir/newdir/")).toBeNull(); + }); }); }); }); diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 6b01b838bb8..7064a7506c3 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -1263,6 +1263,17 @@ define(function (require, exports, module) { }); expect(vm.processChanges).not.toHaveBeenCalled(); }); + + it("should see events with a directory but no added or removed as an add", function () { + model.handleFSEvent({ + isFile: false, + name: "newdir", + fullPath: "/foo/newdir/" + }); + expect(vm._treeData.get("newdir").toJS()).toEqual({ + children: null + }); + }); }); }); }); \ No newline at end of file From 23d421b3fe070c6eaa4fa2d5ab36a7190eca116a Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 23 Sep 2014 15:21:15 -0400 Subject: [PATCH 033/182] Fix the path to the file tree rename input in WorkingSetView test Fix for #9199. --- test/spec/WorkingSetView-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index 76b61bca5cf..a904f808695 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -263,9 +263,9 @@ define(function (require, exports, module) { // In that case, waitsFor will be needed before continuing with the rest of the test. CommandManager.execute(Commands.FILE_RENAME); - var $projectFileItems = $("#project-files-container > ul").children(); + var $projectFileItems = $("#project-files-container ul input").children(); - expect($projectFileItems.find("input").eq(0).val()).toBe(fileName); + expect($("#project-files-container ul input").val()).toBe(fileName); }); }); From d280821d679b81fc3999563a79d129ed180031f2 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 23 Sep 2014 16:02:57 -0400 Subject: [PATCH 034/182] Clear selection, context and rename for deleted files. Fix for #9214. --- src/project/ProjectModel.js | 14 ++++++++++++ test/spec/ProjectModel-test.js | 42 ++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index af9fc52ad99..4bedee77cfa 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -1113,6 +1113,20 @@ define(function (require, exports, module) { } if (removed) { + if (this._selections.selected && + _.find(removed, { fullPath: this._selections.selected })) { + this.setSelected(null); + } + + if (this._selections.rename && + _.find(removed, { fullPath: this._selections.rename.path })) { + this.cancelRename(); + } + + if (this._selections.context && + _.find(removed, { fullPath: this._selections.context })) { + this.setContext(null); + } changes.removed = removed.map(function (entry) { return self.makeProjectRelativeIfPossible(entry.fullPath); }); diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 6b01b838bb8..22c54acfa32 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -1263,6 +1263,48 @@ define(function (require, exports, module) { }); expect(vm.processChanges).not.toHaveBeenCalled(); }); + + it("should unselect a file if it's deleted", function () { + model.setSelected("/foo/topfile.js"); + model.handleFSEvent({ + isFile: false, + name: "foo", + fullPath: "/foo/" + }, null, [{ + name: "topfile.js", + fullPath: "/foo/topfile.js", + isFile: true + }]); + expect(model._selections.selected).toBeNull(); + }); + + it("should cancel renaming a deleted file", function () { + model.startRename("/foo/topfile.js"); + model.handleFSEvent({ + isFile: false, + name: "foo", + fullPath: "/foo/" + }, null, [{ + name: "topfile.js", + fullPath: "/foo/topfile.js", + isFile: true + }]); + expect(model._selections.rename).toBeUndefined(); + }); + + it("should remove context from a deleted file", function () { + model.setContext("/foo/topfile.js"); + model.handleFSEvent({ + isFile: false, + name: "foo", + fullPath: "/foo/" + }, null, [{ + name: "topfile.js", + fullPath: "/foo/topfile.js", + isFile: true + }]); + expect(model._selections.context).toBeNull(); + }); }); }); }); \ No newline at end of file From 7b15afac74941e634c2b38d7a9cb5b09c0d671e5 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 23 Sep 2014 17:25:49 -0400 Subject: [PATCH 035/182] Remove unused variable --- test/spec/WorkingSetView-test.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index a904f808695..925a762d402 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -263,8 +263,6 @@ define(function (require, exports, module) { // In that case, waitsFor will be needed before continuing with the rest of the test. CommandManager.execute(Commands.FILE_RENAME); - var $projectFileItems = $("#project-files-container ul input").children(); - expect($("#project-files-container ul input").val()).toBe(fileName); }); }); From 7b214032140832c878629a7ead0cd87ca029eecc Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Tue, 23 Sep 2014 16:06:09 -0700 Subject: [PATCH 036/182] Fix for #9124. --- src/styles/brackets_patterns_override.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index a9d7f3839a9..578c21ad966 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -886,13 +886,13 @@ a:focus { .dialog-list > li:before { content: "• "; - color: @bc-btn-border; + color: @bc-text-quiet; font-size: 1.5em; position: relative; - top: 1px; + top: 2px; .dark & { - color: @dark-bc-btn-border; + color: @dark-bc-text-quiet; } } From 47eac3b8c37db3106e1255d5fb510717c196c217 Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Tue, 23 Sep 2014 17:38:06 -0700 Subject: [PATCH 037/182] - filter only [Extension] console output for the ExtensionLoader tests --- test/spec/ExtensionLoader-test.js | 44 ++++++++++++++++--------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/test/spec/ExtensionLoader-test.js b/test/spec/ExtensionLoader-test.js index 569b69a5b5e..39117563098 100644 --- a/test/spec/ExtensionLoader-test.js +++ b/test/spec/ExtensionLoader-test.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -27,13 +27,13 @@ define(function (require, exports, module) { 'use strict'; - + // Load dependent modules var ExtensionLoader = require("utils/ExtensionLoader"), SpecRunnerUtils = require("spec/SpecRunnerUtils"); var testPath = SpecRunnerUtils.getTestPath("/spec/ExtensionLoader-test-files"); - + describe("ExtensionLoader", function () { var origTimeout; @@ -49,7 +49,10 @@ define(function (require, exports, module) { var originalConsoleErrorFn = console.error; spyOn(console, "error").andCallFake(function () { originalConsoleErrorFn.apply(console, arguments); - consoleErrors.push(Array.prototype.join.call(arguments)); + + if (arguments[0].indexOf("[Extension]") === 0) { + consoleErrors.push(Array.prototype.join.call(arguments)); + } }); promise = ExtensionLoader.loadExtension(name, config, "main"); @@ -63,15 +66,14 @@ define(function (require, exports, module) { runs(function () { if (error) { if (typeof error === "string") { - expect(console.error.mostRecentCall.args[0]).toBe(error); + expect(consoleErrors[0]).toBe(error); } else { - expect(console.error.mostRecentCall.args[0]).toMatch(error); + expect(consoleErrors[0]).toMatch(error); } } else { - expect(console.error.callCount).toBe(0); expect(consoleErrors).toEqual([]); // causes console errors to be logged in test failure message } - + expect(promise.state()).toBe(promiseState); }); } @@ -105,9 +107,9 @@ define(function (require, exports, module) { runs(function () { spyOn(console, "log").andCallThrough(); }); - + testLoadExtension("RequireJSConfig", "resolved"); - + runs(function () { expect(console.log.mostRecentCall.args[0]).toBe("bar_exported"); }); From 9e9acd3b119e77de3411ed545b5ee3e34f34f5d5 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 23 Sep 2014 21:54:31 -0400 Subject: [PATCH 038/182] Ensure that the selection marker is drawn in the right place... when switching from the working set to the file tree. Fix for #9205. --- src/project/ProjectManager.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 3bd0b48578b..da1d4b605e6 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -391,6 +391,7 @@ define(function (require, exports, module) { */ function _fileViewControllerChange() { actionCreator.setFocused(_hasFileSelectionFocus()); + $projectTreeContainer.trigger("scroll"); } /** From ccc5000490ea7d8570eb39d894f0a26e7d7e1e00 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Tue, 23 Sep 2014 18:58:32 -0700 Subject: [PATCH 039/182] Fix for #9244. --- src/styles/brackets.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 2f7a63b0f58..b51ba7e2b65 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -872,7 +872,7 @@ a, img { } .filetree-context { - border: 1px solid @bc-shadow; + background: @bc-highlight; position: absolute; height: 22px; } From 6ed393913654cb6e28616e28884a1a8fa2a1f683 Mon Sep 17 00:00:00 2001 From: "walf (Localization Automation)" Date: Tue, 23 Sep 2014 21:55:07 -0700 Subject: [PATCH 040/182] Updated by ALF automation. --- src/nls/fr/strings.js | 3 +++ src/nls/ja/strings.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js index cc6e5e2a08e..42f9eb41593 100644 --- a/src/nls/fr/strings.js +++ b/src/nls/fr/strings.js @@ -236,6 +236,9 @@ define({ "SPLITVIEW_MENU_TOOLTIP": "Fractionner l’éditeur horizontalement ou verticalement", "GEAR_MENU_TOOLTIP": "Configurer l’ensemble de travail", + "SPLITVIEW_INFO_TITLE": "[7765195] !é=Already Open=!", + "SPLITVIEW_MULTIPANE_WARNING": "[7765196] !é=The file is already open in another pane. {APP_NAME} will soon support opening the same file in more than one pane. Until then, the file will be shown in the pane it's already open in.

    (You'll only see this message once.)=!", + /** * Keyboard modifier names */ diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js index cfd78c92ce4..cef58c8bb8b 100644 --- a/src/nls/ja/strings.js +++ b/src/nls/ja/strings.js @@ -236,6 +236,9 @@ define({ "SPLITVIEW_MENU_TOOLTIP": "エディターを垂直方向 / 水平方向に分割", "GEAR_MENU_TOOLTIP": "ワーキングセットを構成", + "SPLITVIEW_INFO_TITLE": "!能=[7765195] Already Open_=!", + "SPLITVIEW_MULTIPANE_WARNING": "!能=[7765196] The file is already open in another pane. {APP_NAME} will soon support opening the same file in more than one pane. Until then, the file will be shown in the pane it's already open in.

    (You'll only see this message once.)_=!", + /** * Keyboard modifier names */ From ede71cb2d33c853d9090bec7c0d7ed5d9b3a4064 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 24 Sep 2014 10:52:49 -0400 Subject: [PATCH 041/182] Clear file tree context when context menu item is selected. This is a fix for #9228. --- src/project/FileTreeView.js | 2 +- src/project/ProjectManager.js | 8 +++++++- src/project/ProjectModel.js | 8 ++++++-- test/spec/ProjectModel-test.js | 7 +++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 370f90aef5a..fcf64203997 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -772,7 +772,7 @@ define(function (require, exports, module) { selectionViewInfo: this.props.selectionViewInfo, className: "filetree-context", visible: this.props.selectionViewInfo.get("hasContext"), - widthAdjustment: 2, + widthAdjustment: 0, selectedClassName: ".context-node", forceUpdate: true }); diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 3bd0b48578b..6eaeea13f12 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1096,7 +1096,6 @@ define(function (require, exports, module) { model.setScrollerInfo($projectTreeContainer.scrollTop(), $projectTreeContainer.scrollLeft(), $projectTreeContainer.offset().top); } - // Initialize variables and listeners that depend on the HTML DOM AppInit.htmlReady(function () { $projectTreeContainer = $("#project-files-container"); @@ -1124,6 +1123,13 @@ define(function (require, exports, module) { $projectTreeContainer.on("contextmenu", function () { forceFinishRename(); }); + + // When a context menu item is selected, we need to clear the context + // because we don't get a beforeContextMenuClose event since Bootstrap + // handles this directly. + $("#project-context-menu").on("click.dropdown-menu", function () { + model.setContext(null, true); + }); $projectTreeContainer.on("scroll", function () { // Close open menus on scroll and clear the context, but only if there's a menu open. diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index af9fc52ad99..c8eacd8c003 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -708,8 +708,9 @@ define(function (require, exports, module) { * open/selected file. * * @param {string} path full path of file or directory to which the context should be setBaseUrl + * @param {boolean} _doNotRename True if this context change should not cause a rename operation to finish. This is a special case that goes with context menu handling. */ - ProjectModel.prototype.setContext = function (path) { + ProjectModel.prototype.setContext = function (path, _doNotRename) { // This bit is not ideal: when the user right-clicks on an item in the file tree // and there is already a context menu up, the FileTreeView sends a signal to set the // context to the new element but the PopupManager follows that with a message that it's @@ -722,7 +723,10 @@ define(function (require, exports, module) { } path = _getPathFromFSObject(path); - this.performRename(); + + if (!_doNotRename) { + this.performRename(); + } var currentContext = this._selections.context; this._selections.context = path; this._viewModel.moveMarker("context", this.makeProjectRelativeIfPossible(currentContext), diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 6b01b838bb8..4870fc2e50b 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -688,6 +688,13 @@ define(function (require, exports, module) { model.cancelRename(); expect(vm._treeData.getIn(["afile.js", "context"])).toBeUndefined(); }); + + it("doesn't finish the rename when context is cleared", function () { + model.startRename("/foo/afile.js"); + model.setContext(null, true); + expect(vm._treeData.getIn(["afile.js", "rename"])).toBe(true); + expect(model._selections.rename).toBeDefined(); + }); it("does nothing if setRenameValue is called when there's no rename in progress", function () { model.setRenameValue("/foo/bar/baz"); From 0f6a82c84518fa1fe1759c1560976fb4d0e65ad1 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 24 Sep 2014 11:04:27 -0400 Subject: [PATCH 042/182] Fix click handling for file tree rename inputs. Fix for #9217. --- src/project/FileTreeView.js | 5 +++++ src/project/ProjectManager.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index fcf64203997..d8f825345fe 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -306,6 +306,11 @@ define(function (require, exports, module) { * with a bit of delay in between, we'll invoke the `startRename` action. */ handleClick: function (e) { + // If we're renaming, allow the click to go through to the rename input. + if (this.props.entry.get("rename")) { + return true; + } + // If the user clicks twice within 500ms, that will be picked up by the double click handler // If they click on the node twice with a pause, we'll start a rename. if (this.props.entry.get("selected") && this.state.clickTime) { diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 6eaeea13f12..ff089a8c907 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1106,7 +1106,7 @@ define(function (require, exports, module) { model.setSelectionWidth($projectTreeContainer.width()); $(".main-view").click(function (jqEvent) { - if (jqEvent.target.className !== "rename-input") { + if (jqEvent.target.className !== "jstree-rename-input") { forceFinishRename(); actionCreator.setContext(null); } From a169388c41cedb28a8e20f9c65cc492011662d6d Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 24 Sep 2014 20:33:34 +0200 Subject: [PATCH 043/182] Whitespace changes --- test/spec/FileUtils-test.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/spec/FileUtils-test.js b/test/spec/FileUtils-test.js index 2b1e4181249..9e262adfbda 100644 --- a/test/spec/FileUtils-test.js +++ b/test/spec/FileUtils-test.js @@ -182,9 +182,9 @@ define(function (require, exports, module) { expect(FileUtils.getSmartFileExtension("foo.bar.php.scss.erb")).toBe("php.scss.erb"); }); }); - + describe("compareFilenames", function () { - + it("should compare filenames using German rules", function () { spyOn(brackets, "getLocale").andReturn("de-DE"); // Should be like this: Äckerman, Adler, Rossi, Xavier @@ -192,6 +192,7 @@ define(function (require, exports, module) { expect(FileUtils.compareFilenames("Adler", "Rossi", false)).toBeLessThan(0); expect(FileUtils.compareFilenames("Rossi", "Xavier", false)).toBeLessThan(0); }); + it("should compare filenames using Swedish rules", function () { spyOn(brackets, "getLocale").andReturn("sv"); // Should be like this: Adler, Rossie, Xavier, Äckerman From 7973b239e2321d87d07ec300ccdeb4936027f953 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Wed, 24 Sep 2014 11:41:53 -0700 Subject: [PATCH 044/182] if new pane is created, make it the active pane --- src/view/MainViewManager.js | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/view/MainViewManager.js b/src/view/MainViewManager.js index b34439fdbd0..21641380949 100644 --- a/src/view/MainViewManager.js +++ b/src/view/MainViewManager.js @@ -975,7 +975,7 @@ define(function (require, exports, module) { * Creates a pane for paneId if one doesn't already exist * @param {!string} paneId - id of the pane to create * @private - * @return {Pane} - the pane object of the pane + * @return {?Pane} - the pane object of the new pane, or undefined if no pane created */ function _createPaneIfNecessary(paneId) { var pane; @@ -1006,7 +1006,7 @@ define(function (require, exports, module) { } - return _panes[paneId]; + return pane; } /** @@ -1032,7 +1032,13 @@ define(function (require, exports, module) { * @param {!string} orientation (VERTICAL|HORIZONTAL) */ function _doSplit(orientation) { - var firstPane = _panes[FIRST_PANE]; + var firstPane, newPane; + + if (orientation === _orientation) { + return; + } + + firstPane = _panes[FIRST_PANE]; Resizer.removeSizable(firstPane.$el); if (_orientation) { @@ -1041,7 +1047,7 @@ define(function (require, exports, module) { _$el.addClass("split-" + orientation.toLowerCase()); _orientation = orientation; - _createPaneIfNecessary(SECOND_PANE); + newPane = _createPaneIfNecessary(SECOND_PANE); _makeFirstPaneResizable(); // reset the layout to 50/50 split @@ -1050,6 +1056,11 @@ define(function (require, exports, module) { _initialLayout(); $(exports).triggerHandler("paneLayoutChange", [_orientation]); + + // if new pane was created, make it the active pane + if (newPane) { + setActivePaneId(SECOND_PANE); + } } /** @@ -1377,8 +1388,10 @@ define(function (require, exports, module) { _orientation = (panes.length > 1) ? state.orientation : null; _.forEach(state.panes, function (paneState, paneId) { - var pane = _createPaneIfNecessary(paneId), - promise = pane.loadState(paneState); + var promise; + + _createPaneIfNecessary(paneId); + promise = _panes[paneId].loadState(paneState); promises.push(promise); }); From f1d1323ef1915114ad52b9600deff4241b789866 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 24 Sep 2014 15:21:31 -0400 Subject: [PATCH 045/182] fix alignment nit --- src/project/FileTreeViewModel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/FileTreeViewModel.js b/src/project/FileTreeViewModel.js index e7164d162a3..de4c0ccb8ef 100644 --- a/src/project/FileTreeViewModel.js +++ b/src/project/FileTreeViewModel.js @@ -1037,7 +1037,7 @@ define(function (require, exports, module) { pathWithoutSlash = FileUtils.stripTrailingSlash(path), parentPath = FileUtils.getDirectoryPath(pathWithoutSlash), name = pathWithoutSlash.substr(parentPath.length), - targetPath = []; + targetPath = []; if (parentPath) { targetPath = _filePathToObjectPath(treeData, parentPath); From addcfcee70168b8cad38c9d3cca4922c7f8adff6 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 24 Sep 2014 15:42:25 -0400 Subject: [PATCH 046/182] context mouse down was blocking clicks on the rename input. --- src/project/FileTreeView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index d8f825345fe..174ef2b622c 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -175,8 +175,8 @@ define(function (require, exports, module) { handleMouseDown: function (e) { if (e.button === 2) { this.props.actions.setContext(this.myPath()); + return false; } - return false; } }; From 9236ef69a74589ac0f21bc92ee43bdd97dc06cfb Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 24 Sep 2014 15:50:36 -0400 Subject: [PATCH 047/182] Add missing space in classes on file node. Fix for #9264. --- src/project/FileTreeView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 174ef2b622c..09a4230bfac 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -369,11 +369,11 @@ define(function (require, exports, module) { var fileClasses = ""; if (this.props.entry.get("selected")) { - fileClasses += "jstree-clicked selected-node"; + fileClasses += " jstree-clicked selected-node"; } if (this.props.entry.get("context")) { - fileClasses += "context-node"; + fileClasses += " context-node"; } var nameDisplay; From 1b0ac0b0c5127671d2de8d0cc05d06cfa0d41f08 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Wed, 24 Sep 2014 13:23:48 -0700 Subject: [PATCH 048/182] add split view menuitems to view menu --- src/command/DefaultMenus.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js index c9ee991a102..14be99a4979 100644 --- a/src/command/DefaultMenus.js +++ b/src/command/DefaultMenus.js @@ -122,6 +122,10 @@ define(function (require, exports, module) { menu = Menus.addMenu(Strings.VIEW_MENU, Menus.AppMenuBar.VIEW_MENU); menu.addMenuItem(Commands.CMD_THEMES_OPEN_SETTINGS); menu.addMenuDivider(); + menu.addMenuItem(Commands.CMD_SPLITVIEW_NONE); + menu.addMenuItem(Commands.CMD_SPLITVIEW_VERTICAL); + menu.addMenuItem(Commands.CMD_SPLITVIEW_HORIZONTAL); + menu.addMenuDivider(); menu.addMenuItem(Commands.VIEW_HIDE_SIDEBAR); menu.addMenuDivider(); menu.addMenuItem(Commands.VIEW_INCREASE_FONT_SIZE); From 774430639c60ae005a66267788b66abb2a35ea10 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Wed, 24 Sep 2014 17:03:21 -0700 Subject: [PATCH 049/182] rtc:nits --- src/project/WorkingSetView.js | 38 ++++++++++++++++++-------------- test/spec/WorkingSetView-test.js | 6 +---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index b8bd4993e5c..c46b02738f0 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -62,7 +62,7 @@ define(function (require, exports, module) { var _iconProviders = []; /** - * Icon Providers + * Class Providers * @see {@link WorkingSetView#addClassProvider()} * @private */ @@ -577,9 +577,8 @@ define(function (require, exports, module) { var $li = $(this), file = $li.data(_FILE_KEY), data = {fullPath: file.fullPath, - name: file.name, - isFile: file.isFile}; - + name: file.name, + isFile: file.isFile}; $li.removeAttr("class"); _classProviders.forEach(function (provider) { $li.addClass(provider(data)); @@ -744,21 +743,20 @@ define(function (require, exports, module) { */ if (paneId === this.paneId) { if (!suppressRedraw) { - var $listItem = this._findListItemFromFile(file); - if ($listItem) { - // Make the next file in the list show the close icon, - // without having to move the mouse, if there is a next file. - var $nextListItem = $listItem.next(); - if ($nextListItem && $nextListItem.length > 0) { - var canClose = ($listItem.find(".can-close").length === 1); - var isDirty = _isOpenAndDirty($nextListItem.data(_FILE_KEY)); - this._updateFileStatusIcon($nextListItem, isDirty, canClose); + var $listItem = this._findListItemFromFile(file); + if ($listItem) { + // Make the next file in the list show the close icon, + // without having to move the mouse, if there is a next file. + var $nextListItem = $listItem.next(); + if ($nextListItem && $nextListItem.length > 0) { + var canClose = ($listItem.find(".can-close").length === 1); + var isDirty = _isOpenAndDirty($nextListItem.data(_FILE_KEY)); + this._updateFileStatusIcon($nextListItem, isDirty, canClose); + } + $listItem.remove(); } - $listItem.remove(); + this._redraw(); } - - this._redraw(); - } } else { /* * When this event is handled by a pane that is not being updated then @@ -938,6 +936,9 @@ define(function (require, exports, module) { * if a falsy value is returned then nothing is prepended to the list item */ function addIconProvider(callback) { + if (!callback) { + return; + } _iconProviders.push(callback); // build all views so the provider has a chance to add icons // to all items that have already been created @@ -951,6 +952,9 @@ define(function (require, exports, module) { * The callback can return a string that contains the class (or classes) to add to the list item */ function addClassProvider(callback) { + if (!callback) { + return; + } _classProviders.push(callback); // build all views so the provider has a chance to style // all items that have already been created diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index bd3ac80e356..069019cbd40 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -356,11 +356,9 @@ define(function (require, exports, module) { it("should callback for class", function () { runs(function () { - var master = ["one", "two"], classes = master.slice(0); - - + function classProvider(file) { return classes.pop(); } @@ -380,7 +378,6 @@ define(function (require, exports, module) { it("should allow refresh to be used to update the class list", function () { runs(function () { - function classProvider(file) { return "one"; } @@ -402,6 +399,5 @@ define(function (require, exports, module) { }); }); }); - }); }); From 80d59a687dc1d0ed654f2ba233644f3d91f4f7d9 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 24 Sep 2014 21:59:39 -0400 Subject: [PATCH 050/182] Make sure context bar is positioned properly when focused on working set. --- src/project/ProjectManager.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index ff089a8c907..4f581339289 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -255,6 +255,9 @@ define(function (require, exports, module) { */ ActionCreator.prototype.setContext = function (path) { this.model.setContext(path); + if (path !== null && !_hasFileSelectionFocus()) { + $projectTreeContainer.trigger("scroll"); + } }; /** From a3f6730a93c4752a538922f805a001c220130759 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 24 Sep 2014 22:04:06 -0400 Subject: [PATCH 051/182] Replace magic number 2 with a MIDDLE_MOUSE_BUTTON constant --- src/project/FileTreeView.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 09a4230bfac..1b93e582304 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -54,7 +54,8 @@ define(function (require, exports, module) { // Constants // Time range from first click to second click to invoke renaming. - var CLICK_RENAME_MINIMUM = 500; + var CLICK_RENAME_MINIMUM = 500, + MIDDLE_MOUSE_BUTTON = 2; /** * @private @@ -173,7 +174,7 @@ define(function (require, exports, module) { * Send middle click to the action creator as a setContext action. */ handleMouseDown: function (e) { - if (e.button === 2) { + if (e.button === MIDDLE_MOUSE_BUTTON) { this.props.actions.setContext(this.myPath()); return false; } From c7e61a008bb51e55d17ff04b12dee0e420cc90d6 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Wed, 24 Sep 2014 21:03:18 -0700 Subject: [PATCH 052/182] project model should not resolve fail deferred --- src/project/ProjectManager.js | 24 ++++++++++++++++-------- src/project/ProjectModel.js | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index da1d4b605e6..10143faa96e 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1233,6 +1233,8 @@ define(function (require, exports, module) { * @return {$.Promise} Promise that is resolved with an Array of File objects. */ function getAllFiles(filter, includeWorkingSet) { + var viewFiles, deferred; + // The filter and includeWorkingSet params are both optional. // Handle the case where filter is omitted but includeWorkingSet is // specified. @@ -1241,18 +1243,24 @@ define(function (require, exports, module) { filter = null; } - var viewFiles; if (includeWorkingSet) { viewFiles = MainViewManager.getWorkingSet(MainViewManager.ALL_PANES); } - return model.getAllFiles(filter, viewFiles).fail(function (err) { - if (err === FileSystemError.TOO_MANY_ENTRIES && !_projectWarnedForTooManyFiles) { - _showErrorDialog(ERR_TYPE_MAX_FILES); - _projectWarnedForTooManyFiles = true; - } - return err; - }); + deferred = new $.Deferred(); + model.getAllFiles(filter, viewFiles) + .done(function (fileList) { + deferred.resolve(fileList); + }) + .fail(function (err) { + if (err === FileSystemError.TOO_MANY_ENTRIES && !_projectWarnedForTooManyFiles) { + _showErrorDialog(ERR_TYPE_MAX_FILES); + _projectWarnedForTooManyFiles = true; + } + // resolve with empty list + deferred.resolve([]); + }); + return deferred.promise(); } /** diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index 2b21c3c257e..9f5110ffb8f 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -457,7 +457,7 @@ define(function (require, exports, module) { } }).fail(function (err) { try { - filteredFilesDeferred.resolve([]); + filteredFilesDeferred.reject(err); } catch (e) { console.warn("Unhandled exception in getAllFiles handler: ", e); } From 3cb2e448e5e256db2bf44b8ce4f44d0387e6c573 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Wed, 24 Sep 2014 21:59:26 -0700 Subject: [PATCH 053/182] String tweaks: * Empty pane message: say "pane" instead of "view", and say "open" instead of "select" (to reduce the confusion in #9254) * JS File Inference Problem dialog: ask users to file a Brackets bug; fix capitalization; format more like other errors that call out a filename. * Remove unused UNSUPPORTED_FILETYPE error & its corresponding string (I think this was leftover from an earlier part of splitview) --- src/file/FileUtils.js | 2 -- src/filesystem/FileSystemError.js | 3 +-- src/nls/root/strings.js | 5 ++--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js index 582b39398e6..61b516224eb 100644 --- a/src/file/FileUtils.js +++ b/src/file/FileUtils.js @@ -168,8 +168,6 @@ define(function (require, exports, module) { result = Strings.CONTENTS_MODIFIED_ERR; } else if (name === FileSystemError.UNSUPPORTED_ENCODING) { result = Strings.UNSUPPORTED_ENCODING_ERR; - } else if (name === FileSystemError.UNSUPPORTED_FILETYPE) { - result = Strings.UNSUPPORTED_FILE_TYPE_ERR; } else { result = StringUtils.format(Strings.GENERIC_ERROR, name); } diff --git a/src/filesystem/FileSystemError.js b/src/filesystem/FileSystemError.js index d883a535bec..fc3bf61ce0c 100644 --- a/src/filesystem/FileSystemError.js +++ b/src/filesystem/FileSystemError.js @@ -50,8 +50,7 @@ define(function (require, exports, module) { TOO_MANY_ENTRIES : "TooManyEntries", ALREADY_EXISTS : "AlreadyExists", CONTENTS_MODIFIED : "ContentsModified", - ROOT_NOT_WATCHED : "RootNotBeingWatched", - UNSUPPORTED_FILETYPE : "UnsupportedFileType" + ROOT_NOT_WATCHED : "RootNotBeingWatched" // FUTURE: Add remote connection errors: timeout, not logged in, connection err, etc. }; diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 8a2c39928f1..2d0b151a170 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -38,7 +38,6 @@ define({ "NO_MODIFICATION_ALLOWED_ERR_FILE" : "The permissions do not allow you to make modifications.", "CONTENTS_MODIFIED_ERR" : "The file has been modified outside of {APP_NAME}.", "UNSUPPORTED_ENCODING_ERR" : "{APP_NAME} currently only supports UTF-8 encoded text files.", - "UNSUPPORTED_FILE_TYPE_ERR" : "The file is not a supported file type.", "FILE_EXISTS_ERR" : "The file or directory already exists.", "FILE" : "file", "FILE_TITLE" : "File", @@ -440,7 +439,7 @@ define({ "BASEURL_ERROR_HASH_DISALLOWED" : "The base URL can't contain hashes like \"{0}\".", "BASEURL_ERROR_INVALID_CHAR" : "Special characters like '{0}' must be %-encoded.", "BASEURL_ERROR_UNKNOWN_ERROR" : "Unknown error parsing Base URL", - "EMPTY_VIEW_HEADER" : "Select a file while this view has focus", + "EMPTY_VIEW_HEADER" : "Open a file while this pane has focus", // Strings for themes-settings.html and themes-general.html "CURRENT_THEME" : "Current Theme", @@ -599,7 +598,7 @@ define({ "CMD_SHOW_PARAMETER_HINT" : "Show Parameter Hint", "NO_ARGUMENTS" : "", "DETECTED_EXCLUSION_TITLE" : "JavaScript File Inference Problem", - "DETECTED_EXCLUSION_INFO" : "Brackets ran into trouble processing:

    {0}

    This file will no longer be processed for code hints and jump to definition. To turn this back on, open .brackets.json in your project and remove the file from jscodehints.detectedExclusions.", + "DETECTED_EXCLUSION_INFO" : "Brackets ran into trouble processing {0}.

    This file will no longer be processed for code hints, Jump to Definition or Quick Edit. To reenable this file, open .brackets.json in your project and edit jscodehints.detectedExclusions.

    This is likely a Brackets bug. If you can provide a copy of this file, please file a bug with a link to the file named here.", // extensions/default/JSLint "JSLINT_NAME" : "JSLint", From 70132a1c2ceb930f8a5ecd3178a5778cba8ac3bb Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 10:02:09 -0400 Subject: [PATCH 054/182] Display error messages on rename. Fix for #9230. --- src/project/ProjectManager.js | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index da1d4b605e6..ba64f420bf3 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1217,7 +1217,31 @@ define(function (require, exports, module) { * @return {$.Promise} a promise resolved when the rename is done. */ function renameItemInline(entry) { - return actionCreator.startRename(entry); + var d = new $.Deferred(), + isFolder = entry.isDirectory; + + actionCreator.startRename(entry) + .done(function () { + d.resolve(); + }) + .fail(function (err) { + // Need to do display the error message on the next event loop turn + // because some errors can come up synchronously and then the dialog + // is not displayed. + window.setTimeout(function () { + if (err === ProjectModel.ERROR_INVALID_FILENAME) { + _showErrorDialog(ERR_TYPE_INVALID_FILENAME, isFolder, ProjectModel._invalidChars); + } else { + var errString = err === FileSystemError.ALREADY_EXISTS ? + Strings.FILE_EXISTS_ERR : + FileUtils.getFileErrorString(err); + + _showErrorDialog(ERR_TYPE_RENAME, isFolder, errString, entry.fullPath); + } + }, 10); + d.reject(err); + }); + return d.promise(); } /** From 347412724d9cb25fdb537fe52f1e5481f40de616 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 10:21:31 -0400 Subject: [PATCH 055/182] Allows you to create a file/folder with the default name. Fix for #9216 --- src/project/ProjectModel.js | 2 +- test/spec/ProjectModel-test.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index 2b21c3c257e..c5f2d6d8c9f 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -888,7 +888,7 @@ define(function (require, exports, module) { viewModel = this._viewModel, self = this; - if (oldName === newName) { + if (renameInfo.type !== FILE_CREATING && oldName === newName) { this.cancelRename(); return; } diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 7064a7506c3..b3035252b94 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -770,6 +770,21 @@ define(function (require, exports, module) { expect(model._selections.rename).toBeUndefined(); }); + it("can create an item with the default filename", function () { + spyOn(model, "createAtPath").andReturn(new $.Deferred().resolve().promise()); + model.startCreating("/foo/subdir1/", "Untitled"); + expect(model._selections.rename.path).toBe("/foo/subdir1/Untitled"); + expect(model._selections.rename.newName).toBe("Untitled"); + changesFired = 0; + model.performRename(); + expect(changesFired).toBeGreaterThan(0); + expect(model.createAtPath).toHaveBeenCalledWith("/foo/subdir1/Untitled"); + expect(vm._treeData.getIn(["subdir1", "children", "Untitled"])).toBeDefined(); + expect(vm._treeData.getIn(["subdir1", "children", "Untitled", "creating"])).toBeUndefined(); + expect(vm._treeData.getIn(["subdir1", "children", "Untitled", "rename"])).toBeUndefined(); + expect(model._selections.rename).toBeUndefined(); + }); + it("should do nothing if there is no creation in progress when _doneCreating is called", function () { var treeData = vm._treeData; model.performRename(); From ed0787f848483f6d665358ddc88cc56befec85cd Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 10:31:02 -0400 Subject: [PATCH 056/182] Clean up after trying to create an invalid file. Fix for #9232. --- src/project/ProjectModel.js | 4 ++-- test/spec/ProjectModel-test.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index c5f2d6d8c9f..a1f25e90c8b 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -896,7 +896,7 @@ define(function (require, exports, module) { if (isFolder) { newPath += "/"; } - + delete this._selections.rename; delete this._selections.context; viewModel.moveMarker("rename", oldProjectPath, null); @@ -908,7 +908,7 @@ define(function (require, exports, module) { viewModel.renameItem(oldProjectPath, newName); renameInfo.deferred.resolve(entry); }).fail(function (error) { - self._cancelCreating(); + self._viewModel.deleteAtPath(self.makeProjectRelativeIfPossible(renameInfo.path)); renameInfo.deferred.reject(error); }); } else { diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index b3035252b94..40d1f6b01a9 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -785,7 +785,7 @@ define(function (require, exports, module) { expect(model._selections.rename).toBeUndefined(); }); - it("should do nothing if there is no creation in progress when _doneCreating is called", function () { + it("should do nothing if there is no creation in progress when performRename is called", function () { var treeData = vm._treeData; model.performRename(); expect(changesFired).toBe(0); @@ -856,6 +856,7 @@ define(function (require, exports, module) { isFolder: false } ]); + expect(vm._treeData.get("Untitled")).toBeUndefined(); }); }); }); From 08ecc4bd24b331cb15c5678f6349a5f48e8b4a6d Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 10:47:03 -0400 Subject: [PATCH 057/182] Ensure that `this.state.clickTime` does not produce a null error. As seen in comments of #9264. --- src/project/FileTreeView.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 370f90aef5a..3e052c7721b 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -276,6 +276,14 @@ define(function (require, exports, module) { var fileNode = React.createClass({ mixins: [contextSettable, pathComputer, extendable], + /** + * Ensures that we always have a state object. + */ + getInitialState: function () { + return { + }; + }, + /** * Thanks to immutable objects, we can just do a start object identity check to know * whether or not we need to re-render. From 49da190de2499d390864cb47425bdc133f1d6953 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 11:03:42 -0400 Subject: [PATCH 058/182] Check for left click on directories and files. Fix for #9241 --- src/project/FileTreeView.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 3e052c7721b..6c174c4eef3 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -54,7 +54,8 @@ define(function (require, exports, module) { // Constants // Time range from first click to second click to invoke renaming. - var CLICK_RENAME_MINIMUM = 500; + var CLICK_RENAME_MINIMUM = 500, + LEFT_MOUSE_BUTTON = 0; /** * @private @@ -314,6 +315,10 @@ define(function (require, exports, module) { * with a bit of delay in between, we'll invoke the `startRename` action. */ handleClick: function (e) { + if (e.button !== LEFT_MOUSE_BUTTON) { + return; + } + // If the user clicks twice within 500ms, that will be picked up by the double click handler // If they click on the node twice with a pause, we'll start a rename. if (this.props.entry.get("selected") && this.state.clickTime) { @@ -518,6 +523,10 @@ define(function (require, exports, module) { * If you click on a directory, it will toggle between open and closed. */ handleClick: function (event) { + if (event.button !== LEFT_MOUSE_BUTTON) { + return; + } + var isOpen = this.props.entry.get("open"), setOpen = isOpen ? false : true; From 1ce0eb67be818114d5942c1cf0c7fc9d84a86b60 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 11:21:26 -0400 Subject: [PATCH 059/182] Fix a case in which an expanded subdirectory causes parent from loading fully. --- src/project/FileTreeViewModel.js | 2 +- test/spec/FileTreeViewModel-test.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/project/FileTreeViewModel.js b/src/project/FileTreeViewModel.js index de4c0ccb8ef..54a82eb361b 100644 --- a/src/project/FileTreeViewModel.js +++ b/src/project/FileTreeViewModel.js @@ -306,8 +306,8 @@ define(function (require, exports, module) { nodeList = openNodes[depth] = []; } nodeList.push(directoryPath); + addNodesAtDepth(value.get("children"), directoryPath, depth + 1); } - addNodesAtDepth(value.get("children"), directoryPath, depth + 1); }); } diff --git a/test/spec/FileTreeViewModel-test.js b/test/spec/FileTreeViewModel-test.js index dec123974de..9a0608fe585 100644 --- a/test/spec/FileTreeViewModel-test.js +++ b/test/spec/FileTreeViewModel-test.js @@ -488,6 +488,20 @@ define(function (require, exports, module) { ] ]); }); + + it("should not return an open child node of a closed parent", function () { + vm._treeData = Immutable.fromJS({ + subdir1: { + children: { + subsubdir: { + children: {}, + open: true + } + } + } + }); + expect(vm.getOpenNodes("/foo/bar/")).toEqual([]); + }); }); From 25fa46b282d8a5d90c03c2262301fd4c20e364e8 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 11:27:47 -0400 Subject: [PATCH 060/182] Save tree state when folders are toggled via toggleSubdirectories and closeSubtree. Fix for #9269. --- src/project/ProjectManager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index da1d4b605e6..53a5c067ca6 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -324,7 +324,7 @@ define(function (require, exports, module) { * See `ProjectModel.toggleSubdirectories` */ ActionCreator.prototype.toggleSubdirectories = function (path, openOrClose) { - this.model.toggleSubdirectories(path, openOrClose); + this.model.toggleSubdirectories(path, openOrClose).then(_saveTreeState()); }; /** @@ -332,6 +332,7 @@ define(function (require, exports, module) { */ ActionCreator.prototype.closeSubtree = function (path) { this.model.closeSubtree(path); + _saveTreeState(); }; /** From 4019fd6730140afe27d4c6a07bea9d527c576db7 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 11:36:52 -0400 Subject: [PATCH 061/182] Save tree state via show in file tree. Fix for #9276. --- src/project/ProjectManager.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 53a5c067ca6..21463a32762 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -917,7 +917,9 @@ define(function (require, exports, module) { * @return {$.Promise} Resolved when done; or rejected if not found */ function showInTree(entry) { - return model.showInTree(entry); + return model.showInTree(entry).then(function () { + _saveTreeState(); + }); } From 26789475b9d1c10531f97943bf2adb64c9359e1b Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 12:33:00 -0400 Subject: [PATCH 062/182] Rename input appearance is now much closer to that of release 0.43 --- src/project/FileTreeView.js | 34 ++++++++++++++++++++++++++-------- src/styles/jsTreeTheme.less | 7 +++++-- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 370f90aef5a..b4a1132861d 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -113,6 +113,22 @@ define(function (require, exports, module) { this.props.actions.setRenameValue(this.refs.name.getDOMNode().value.trim()); } }; + + /** + * @private + * + * Gets an appropriate width given the text provided. + * + * @param {string} text Text to measure + * @return {int} Width to use + */ + function _measureText(text) { + var measuringElement = $("
    ", { css : { "position" : "absolute", "top" : "-200px", "left" : ("-1000px"), "visibility" : "hidden" } }).appendTo("body"); + measuringElement.text("pW" + text); + var width = measuringElement.width(); + measuringElement.remove(); + return width; + } /** * @private @@ -141,11 +157,8 @@ define(function (require, exports, module) { }, render: function () { - var measuringElement = $("
    ", { css : { "position" : "absolute", "top" : "-200px", "left" : ("-1000px"), "visibility" : "hidden" } }).appendTo("body"); - measuringElement.text("pW" + this.props.name); - var width = measuringElement.width(); - measuringElement.remove(); - + var width = _measureText(this.props.name); + return DOM.input({ className: "jstree-rename-input", type: "text", @@ -465,14 +478,19 @@ define(function (require, exports, module) { mixins: [renameBehavior], render: function () { + var width = _measureText(this.props.name); + return DOM.input({ - className: "rename-input", + className: "jstree-rename-input", type: "text", defaultValue: this.props.name, autoFocus: true, onKeyDown: this.handleKeyDown, onKeyUp: this.handleKeyUp, - ref: "name" + ref: "name", + style: { + width: width + } }); } }); @@ -640,7 +658,7 @@ define(function (require, exports, module) { var extensions = this.props.extensions, iconClass = extensions && extensions.get("icons") ? "jstree-icons" : "jstree-no-icons", ulProps = this.props.isRoot ? { - className: "jstree-no-dots " + iconClass + className: "jstree-brackets jstree-no-dots " + iconClass } : null; var contents = this.props.contents, diff --git a/src/styles/jsTreeTheme.less b/src/styles/jsTreeTheme.less index c1ae145f854..c6f84c3fa0f 100644 --- a/src/styles/jsTreeTheme.less +++ b/src/styles/jsTreeTheme.less @@ -142,7 +142,7 @@ ins.jstree-icon { .jstree-brackets a.jstree-search { color:aqua; } .jstree-brackets .jstree-locked a { color:silver; cursor:default; } -.jstree-brackets .jstree-rename-input { +#project-files-container .jstree-brackets .jstree-rename-input { background: #000; border: 1px solid #000; border-radius: 2px; @@ -150,14 +150,17 @@ ins.jstree-icon { color: #fff; font-style: normal; font-weight: 400; + font-size: 13px; left: 3px !important; padding: 0; position: absolute; top: 2px; width: 150px; + height: 16px; + line-height: 16px; } -.jstree-brackets .jstree-rename-input:focus { +#project-files-container .jstree-brackets .jstree-rename-input:focus { border: 1px solid @bc-btn-border-focused; box-shadow: 0 0 0 1px @bc-btn-border-focused-glow; outline: none; From f95495350d9bb722d0857d9f037fa7d6f0cf4a26 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 12:43:04 -0400 Subject: [PATCH 063/182] Set the context-node class on the input so that the context marker is in the right place. --- src/project/FileTreeView.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index b4a1132861d..7fbc85ec20d 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -160,7 +160,7 @@ define(function (require, exports, module) { var width = _measureText(this.props.name); return DOM.input({ - className: "jstree-rename-input", + className: "jstree-rename-input " + this.props.fileClasses, type: "text", defaultValue: this.props.name, autoFocus: true, @@ -377,11 +377,11 @@ define(function (require, exports, module) { var fileClasses = ""; if (this.props.entry.get("selected")) { - fileClasses += "jstree-clicked selected-node"; + fileClasses += " jstree-clicked selected-node"; } if (this.props.entry.get("context")) { - fileClasses += "context-node"; + fileClasses += " context-node"; } var nameDisplay; @@ -391,7 +391,8 @@ define(function (require, exports, module) { actions: this.props.actions, entry: this.props.entry, name: this.props.name, - parentPath: this.props.parentPath + parentPath: this.props.parentPath, + fileClasses: fileClasses }); } else { // Need to flatten the argument list because getIcons returns an array From 9bb1d559bfcc5683853161f3879c98c59b1d4be7 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Thu, 25 Sep 2014 09:53:31 -0700 Subject: [PATCH 064/182] changes for code review --- src/view/MainViewManager.js | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/view/MainViewManager.js b/src/view/MainViewManager.js index 21641380949..46d9d59812d 100644 --- a/src/view/MainViewManager.js +++ b/src/view/MainViewManager.js @@ -978,35 +978,34 @@ define(function (require, exports, module) { * @return {?Pane} - the pane object of the new pane, or undefined if no pane created */ function _createPaneIfNecessary(paneId) { - var pane; + var newPane; if (!_panes.hasOwnProperty(paneId)) { - pane = new Pane(paneId, _$el); - _panes[paneId] = pane; + newPane = new Pane(paneId, _$el); + _panes[paneId] = newPane; - $(exports).triggerHandler("paneCreate", [pane.id]); + $(exports).triggerHandler("paneCreate", [newPane.id]); - pane.$el.on("click.mainview dragover.mainview", function () { - setActivePaneId(pane.id); + newPane.$el.on("click.mainview dragover.mainview", function () { + setActivePaneId(newPane.id); }); - $(pane).on("viewListChange.mainview", function () { + $(newPane).on("viewListChange.mainview", function () { _updatePaneHeaders(); - $(exports).triggerHandler("workingSetUpdate", [pane.id]); + $(exports).triggerHandler("workingSetUpdate", [newPane.id]); }); - $(pane).on("currentViewChange.mainview", function (e, newView, oldView) { + $(newPane).on("currentViewChange.mainview", function (e, newView, oldView) { _updatePaneHeaders(); - if (_activePaneId === pane.id) { + if (_activePaneId === newPane.id) { $(exports).triggerHandler("currentFileChange", [newView && newView.getFile(), - pane.id, oldView && oldView.getFile(), - pane.id]); + newPane.id, oldView && oldView.getFile(), + newPane.id]); } }); } - - return pane; + return newPane; } /** @@ -1059,7 +1058,7 @@ define(function (require, exports, module) { // if new pane was created, make it the active pane if (newPane) { - setActivePaneId(SECOND_PANE); + setActivePaneId(newPane.id); } } @@ -1388,12 +1387,8 @@ define(function (require, exports, module) { _orientation = (panes.length > 1) ? state.orientation : null; _.forEach(state.panes, function (paneState, paneId) { - var promise; - _createPaneIfNecessary(paneId); - promise = _panes[paneId].loadState(paneState); - - promises.push(promise); + promises.push(_panes[paneId].loadState(paneState)); }); AsyncUtils.waitForAll(promises).then(function (opensList) { From 81251a72091b71c24fd7b00dfd9f185309e1c2a4 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 13:43:36 -0400 Subject: [PATCH 065/182] Move selection bar to top when not needed. By moving the selection bar to the top when it's not needed, we fix extraneous blank spaces and scrollbars. This provides fixes for: * #9259 * #9252 and maybe #9197. --- src/project/FileTreeView.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 370f90aef5a..f366c381d9a 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -717,15 +717,21 @@ define(function (require, exports, module) { }, render: function () { - var selectionViewInfo = this.props.selectionViewInfo; - - return DOM.div({ - style: { + var selectionViewInfo = this.props.selectionViewInfo, + style = { overflow: "auto", left: selectionViewInfo.get("scrollLeft"), width: selectionViewInfo.get("width") - this.props.widthAdjustment, visibility: this.props.visible ? "visible" : "hidden" - }, + }; + + if (!this.props.visible) { + style.width = 0; + style.top = 0; + } + + return DOM.div({ + style: style, className: this.props.className }); } From 7bfd6b129c04de981d08df614af5f4f02d017d8a Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Thu, 25 Sep 2014 11:15:50 -0700 Subject: [PATCH 066/182] re-enable unit test --- test/spec/ProjectModel-test.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 7064a7506c3..4127683df6a 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -22,7 +22,7 @@ */ /* unittests: ProjectModel */ -/*global $, define, describe, it, xit, expect, beforeEach, waitsForDone, waitsForFail, runs, spyOn, jasmine */ +/*global $, define, describe, it, expect, beforeEach, waitsForDone, waitsForFail, runs, spyOn, jasmine */ define(function (require, exports, module) { "use strict"; @@ -158,10 +158,7 @@ define(function (require, exports, module) { }); }); - // Turned off because these promises are resolved synchronously right now - // which causes this test to fail. The real running system would hit the error condition - // asynchronously. - xit("rejects the promise when there's an error", function () { + it("rejects the promise when there's an error", function () { var pm = getPM(null, "Got An Error"); pm.getAllFiles().then(function (allFiles) { expect("should not have gotten here").toBe("because there should be an error"); From 16579fb1dff5b71e8241bcf3cb00a6fb3775439e Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Thu, 25 Sep 2014 11:27:50 -0700 Subject: [PATCH 067/182] - guard against null and non string arguments passed to console.error --- test/spec/ExtensionLoader-test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/spec/ExtensionLoader-test.js b/test/spec/ExtensionLoader-test.js index 39117563098..006bf721790 100644 --- a/test/spec/ExtensionLoader-test.js +++ b/test/spec/ExtensionLoader-test.js @@ -50,7 +50,8 @@ define(function (require, exports, module) { spyOn(console, "error").andCallFake(function () { originalConsoleErrorFn.apply(console, arguments); - if (arguments[0].indexOf("[Extension]") === 0) { + if (typeof arguments[0] === "string" && + arguments[0].indexOf("[Extension]") === 0) { consoleErrors.push(Array.prototype.join.call(arguments)); } }); From 3d7e3e7d894c39c0c6a67475547d1c9c3d0272b7 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Thu, 25 Sep 2014 12:44:14 -0700 Subject: [PATCH 068/182] Fix a second infinite loop in CSSUtils.findSelectorAtDocumentPos(), caused by cleanups in the fix for the earlier infinite loop bug. To keep loop exit condition more precisely in sync with TokenUtils's logic for when to stop advancing, create new TokenUtils methods for checking if at a stopping point. --- src/language/CSSUtils.js | 2 +- src/utils/TokenUtils.js | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js index d4740a56d3a..17b14779ab1 100644 --- a/src/language/CSSUtils.js +++ b/src/language/CSSUtils.js @@ -1599,7 +1599,7 @@ define(function (require, exports, module) { } else { TokenUtils.movePrevToken(ctx); } - } while (!(ctx.pos.line === 0 && ctx.pos.ch === 0)); + } while (!TokenUtils.isAtStart(ctx)); selector = _stripAtRules(selector); diff --git a/src/utils/TokenUtils.js b/src/utils/TokenUtils.js index 58d7e1c1180..3d87535aa60 100644 --- a/src/utils/TokenUtils.js +++ b/src/utils/TokenUtils.js @@ -76,6 +76,11 @@ define(function (require, exports, module) { return true; } + /** Returns true if movePrevToken() would return false without changing pos */ + function isAtStart(ctx) { + return (ctx.pos.ch <= 0 || ctx.token.start <= 0) && (ctx.pos.line <= 0); + } + /** * Moves the given context forward by one token. * @param {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} ctx @@ -103,6 +108,12 @@ define(function (require, exports, module) { return true; } + /** Returns true if moveNextToken() would return false without changing pos */ + function isAtEnd(ctx) { + var eol = ctx.editor.getLine(ctx.pos.line).length; + return (ctx.pos.ch >= eol || ctx.token.end >= eol) && (ctx.pos.line >= ctx.editor.lineCount() - 1); + } + /** * Moves the given context in the given direction, skipping any whitespace it hits. * @param {function} moveFxn the function to move the context @@ -153,6 +164,8 @@ define(function (require, exports, module) { exports.movePrevToken = movePrevToken; exports.moveNextToken = moveNextToken; + exports.isAtStart = isAtStart; + exports.isAtEnd = isAtEnd; exports.moveSkippingWhitespace = moveSkippingWhitespace; exports.getInitialContext = getInitialContext; exports.offsetInToken = offsetInToken; From d1a53f5d979d6485df8f2b2b48eb94f9dfa76e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Barcia?= Date: Fri, 26 Sep 2014 00:24:19 +0200 Subject: [PATCH 069/182] Update Galician lang --- src/nls/gl/strings.js | 67 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/src/nls/gl/strings.js b/src/nls/gl/strings.js index 52b39a50f35..bc772565376 100644 --- a/src/nls/gl/strings.js +++ b/src/nls/gl/strings.js @@ -38,9 +38,12 @@ define({ "NO_MODIFICATION_ALLOWED_ERR_FILE" : "Os permisos non permiten facer modificacións.", "CONTENTS_MODIFIED_ERR" : "O arquivo foi modificado fóra de {APP_NAME}.", "UNSUPPORTED_ENCODING_ERR" : "{APP_NAME} actualmente só soporta arquivos codificados como UTF-8.", + "UNSUPPORTED_FILE_TYPE_ERR" : "Este tipo de arquivo non é soportado.", "FILE_EXISTS_ERR" : "O arquivo xa existe.", "FILE" : "arquivo", + "FILE_TITLE" : "Arquivo", "DIRECTORY" : "directorio", + "DIRECTORY_TITLE" : "Directorio", "DIRECTORY_NAMES_LEDE" : "nomes de directorios", "FILENAMES_LEDE" : "nomes de arquivos", "FILENAME" : "Nome de arquivo", @@ -70,6 +73,7 @@ define({ "ENTRY_WITH_SAME_NAME_EXISTS" : "Xa existe un arquivo ou directorio co nome {0}.", "ERROR_CREATING_FILE_TITLE" : "Erro creando {0}", "ERROR_CREATING_FILE" : "Houbo un erro ó intentar crear o {0} {1}. {2}", + "ERROR_MIXED_DRAGDROP" : "Non se pode abrir o cartafol ó mesmo tempo que hai abertos outros arquivos.", // Application preferences corrupt error strings "ERROR_PREFS_CORRUPT_TITLE" : "Erro lendo os axustes", @@ -81,7 +85,7 @@ define({ // FileIndexManager error string "ERROR_MAX_FILES_TITLE" : "Erro indexando arquivos", - "ERROR_MAX_FILES" : "Acadouse o número máximo de arquivos indexável. Pode que as accións que buscan arquivos no índice funcionen de maneira incorrecta.", + "ERROR_MAX_FILES" : "Este proxecto contén máis de 30.000 arquivos. Funcións que operan sobre múltiples arquivos poden estar deshabilitadas ou funcionar igual que si o proxecto estivese baleiro. Ler máis acerca de cómo traballar con proxectos grandes.", // Live Preview error strings "ERROR_LAUNCHING_BROWSER_TITLE" : "Erro iniciando navegador", @@ -135,8 +139,7 @@ define({ "BUTTON_NO" : "Non", // Find, Replace, Find in Files - "FIND_RESULT_COUNT" : "{0} resultados", - "FIND_RESULT_COUNT_SINGLE" : "1 resultado", + "FIND_MATCH_INDEX" : "{0} de {1}", "FIND_NO_RESULTS" : "Non hai resultados", "FIND_QUERY_PLACEHOLDER" : "Atopado\u2026", "REPLACE_PLACEHOLDER" : "Reemplazar con\u2026", @@ -219,6 +222,24 @@ define({ "UNTITLED" : "Sen título", "WORKING_FILES" : "Área de traballo", + /** + * MainViewManager + */ + "TOP" : "Arriba", + "BOTTOM" : "Abaixo", + "LEFT" : "Esquerda", + "RIGHT" : "Dereita", + + "CMD_SPLITVIEW_NONE" : "Non Dividir", + "CMD_SPLITVIEW_VERTICAL" : "División Vertical", + "CMD_SPLITVIEW_HORIZONTAL" : "División Horizontal", + "SPLITVIEW_MENU_TOOLTIP" : "Dividir o editor vertical ou horizontalmente", + "GEAR_MENU_TOOLTIP" : "Configurar espacio de traballo", + + "SPLITVIEW_INFO_TITLE" : "Xa está aberto", + "SPLITVIEW_MULTIPANE_WARNING" : "O arquivo xa está aberto noutro panel. {APP_NAME} pronto soportará abrir o mesmo arquivo noutro panel. Ata entón, o arquivo amosarase no panel que xa está aberto en.

    (Só verás esta mensaxe unha vez.)", + + /** * Keyboard modifier names */ @@ -246,6 +267,11 @@ define({ "STATUSBAR_USER_EXTENSIONS_DISABLED" : "Extensións deshabilitadas", "STATUSBAR_INSERT" : "INS", "STATUSBAR_OVERWRITE" : "SOB", + "STATUSBAR_INSOVR_TOOLTIP" : "Fai click para intercambiar entre o modo insertar (INS) e o modo sobrescribir (SOB)", + "STATUSBAR_LANG_TOOLTIP" : "Fai click para cambiar o tipo de arquivo", + "STATUSBAR_CODE_INSPECTION_TOOLTIP" : "{0}. Fai click para amosar/ocultar o panel de reportes.", + "STATUSBAR_DEFAULT_LANG" : "(por defecto)", + "STATUSBAR_SET_DEFAULT_LANG" : "Marcar como predeterminado para os arquivos .{0}", // CodeInspection: errors/warnings "ERRORS_PANEL_TITLE_MULTIPLE" : "Problemas de {0}", @@ -283,6 +309,7 @@ define({ "CMD_FILE_SAVE_ALL" : "Gardar todo", "CMD_FILE_SAVE_AS" : "Gardar como\u2026", "CMD_LIVE_FILE_PREVIEW" : "Vista Previa en Vivo", + "CMD_RELOAD_LIVE_PREVIEW" : "Forzar Recargar a Vista Previa en Vivo", "CMD_PROJECT_SETTINGS" : "Configuración do proxecto\u2026", "CMD_FILE_RENAME" : "Renomear", "CMD_FILE_DELETE" : "Eliminar", @@ -352,6 +379,7 @@ define({ "CMD_SORT_WORKINGSET_BY_NAME" : "Ordenar por Nome", "CMD_SORT_WORKINGSET_BY_TYPE" : "Ordenar por Tipo", "CMD_SORT_WORKINGSET_AUTO" : "Ordenación automática", + "CMD_THEMES" : "Temas\u2026", // Navigate menu Commands "NAVIGATE_MENU" : "Navegación", @@ -378,7 +406,7 @@ define({ "CMD_SUPPORT" : "Soporte de {APP_NAME}", "CMD_SUGGEST" : "Suxerir unha mellora", "CMD_RELEASE_NOTES" : "Notas da versión", - "CMD_GET_INVOLVED" : "Involúcrese", + "CMD_GET_INVOLVED" : "Involúcrate", "CMD_SHOW_EXTENSIONS_FOLDER" : "Abrir cartafol de extensións", "CMD_HOMEPAGE" : "Páxina principal de {APP_TITLE}", "CMD_TWITTER" : "{TWITTER_NAME} en Twitter", @@ -394,7 +422,7 @@ define({ "RELAUNCH_CHROME" : "Reiniciar Chrome", "ABOUT" : "Acerca de\u2026", "CLOSE" : "Pechar", - "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_LINE1" : "Versión {VERSION_MAJOR}.{VERSION_MINOR} {BUILD_TYPE} {VERSION}", "ABOUT_TEXT_BUILD_TIMESTAMP" : "construír marca de tempo: ", "ABOUT_TEXT_LINE3" : "Os avisos, termos e condicións pertencentes a software de terceiros atópanse en {ADOBE_THIRD_PARTY} e inclúense aquí como referencia.", "ABOUT_TEXT_LINE4" : "Podes atopar a documentación e código fonte en https://github.com/adobe/brackets/", @@ -413,6 +441,14 @@ define({ "BASEURL_ERROR_HASH_DISALLOWED" : "A URL base non pode conter hashes como \"{0}\".", "BASEURL_ERROR_INVALID_CHAR" : "Os caracteres especiais como '{0}' deben codificarse en formato %.", "BASEURL_ERROR_UNKNOWN_ERROR" : "Erro descoñecido analizando a URL base", + "EMPTY_VIEW_HEADER" : "Selecciona un arquivo mentres esta vista está activa", + + // Strings for themes-settings.html and themes-general.html + "CURRENT_THEME" : "Tema actual", + "USE_THEME_SCROLLBARS" : "Usar scrollbars do tema", + "FONT_SIZE" : "Tamaño de letra", + "FONT_FAMILY" : "Tipo de letra", + "THEMES_SETTINGS" : "Preferencias dos temas", // CSS Quick Edit "BUTTON_NEW_RULE" : "Nova regra", @@ -435,6 +471,8 @@ define({ "CANCELING_INSTALL" : "Cancelando\u2026", "CANCELING_HUNG" : "A instalación está tardando demasiado; cancelando. Pode que se producira un erro interno.", "INSTALL_CANCELED" : "Instalación cancelada.", + "VIEW_COMPLETE_DESCRIPTION" : "Ver descripción completa", + "VIEW_TRUNCATED_DESCRIPTION" : "Ver descripción corta", // These must match the error codes in ExtensionsDomain.Errors.* : "INVALID_ZIP_FILE" : "O contido descargado non é un arquivo zip válido.", "INVALID_PACKAGE_JSON" : "O arquivo package.json non é válido (error: {0}).", @@ -460,7 +498,11 @@ define({ // For NOT_FOUND_ERR, see generic strings above "EXTENSION_MANAGER_TITLE" : "Xestor de extensións", "EXTENSION_MANAGER_ERROR_LOAD" : "Non se puido acceder o rexistro de extensións. Volve a intentalo máis tarde, por favor.", + "INSTALL_EXTENSION_DRAG" : "Arrastra .zip aquí ou", + "INSTALL_EXTENSION_DROP" : "Solta .zip para instalar", + "INSTALL_EXTENSION_DROP_ERROR" : "A Instalación/Actualizacións foi abortada polos seguintes erros:", "INSTALL_FROM_URL" : "Instalar dende URL\u2026", + "INSTALL_EXTENSION_VALIDATING" : "Validando\u2026", "EXTENSION_AUTHOR" : "Autor", "EXTENSION_DATE" : "Data", "EXTENSION_INCOMPATIBLE_NEWER" : "Esta extensión necesita unha versión máis actualizada de {APP_NAME}.", @@ -471,6 +513,9 @@ define({ "EXTENSION_MORE_INFO" : "Máis información...", "EXTENSION_ERROR" : "Erro na extensión", "EXTENSION_KEYWORDS" : "Palabras clave", + "EXTENSION_TRANSLATED_USER_LANG" : "Traducido a {0} linguas, incluída a túa", + "EXTENSION_TRANSLATED_GENERAL" : "Traducido a {0} linguas", + "EXTENSION_TRANSLATED_LANGS" : "Esta extensión foi traducida ás seguintes linguas: {0}", "EXTENSION_INSTALLED" : "Instalada", "EXTENSION_UPDATE_INSTALLED" : "A actualización de esta extensión descargouse e instalarase despois de recargar {APP_NAME}.", "EXTENSION_SEARCH_PLACEHOLDER" : "Buscar", @@ -493,9 +538,10 @@ define({ "EXTENSION_NOT_INSTALLED" : "Non se puido eliminar a extensión {{0}} porque no se atopa instalada.", "NO_EXTENSIONS" : "Aínda non hai ningunha extensión instalada.
    Fai click na pestana Dispoñibles para comenzar.", "NO_EXTENSION_MATCHES" : "Non hai extensións que coincidan coa túa busca.", - "REGISTRY_SANITY_CHECK_WARNING" : "Ten cuidado ó instalar extensións dende unha fonte descoñecida.", + "REGISTRY_SANITY_CHECK_WARNING" : "NOTA: Estas extensións poden provir de diferentes autores a {APP_NAME}. As extensións non son revisadas e teñen todos os privilexios locais. Ten coidado cando instales extensións de unha fonte descoñecida.", "EXTENSIONS_INSTALLED_TITLE" : "Instaladas", "EXTENSIONS_AVAILABLE_TITLE" : "Dispoñibles", + "EXTENSIONS_THEMES_TITLE" : "Temas", "EXTENSIONS_UPDATES_TITLE" : "Actualizacións", "INLINE_EDITOR_NO_MATCHES" : "Non hai coincidencias dispoñibles.", @@ -525,7 +571,8 @@ define({ "CMD_LOG_NODE_STATE" : "Amosar estado de Node en Consola", "CMD_RESTART_NODE" : "Reiniciar Node", "CMD_SHOW_ERRORS_IN_STATUS_BAR" : "Amosar erros na barra de estado", - + "CMD_OPEN_BRACKETS_SOURCE" : "Abrir código de Brackets", + "LANGUAGE_TITLE" : "Cambiar idioma", "LANGUAGE_MESSAGE" : "Idioma:", "LANGUAGE_SUBMIT" : "Reiniciar {APP_NAME}", @@ -552,7 +599,9 @@ define({ "CMD_JUMPTO_DEFINITION" : "Saltar á definición", "CMD_SHOW_PARAMETER_HINT" : "Amosar suxerencias de parámetros", "NO_ARGUMENTS" : "", - + "DETECTED_EXCLUSION_TITLE" : "Problema de inferencia con un arquivo JavaScript", + "DETECTED_EXCLUSION_INFO" : "Brackets atopouse con problemas procesando:

    {0}

    Este arquivo non volverá a ser procesado para as suxerencias de código e saltar á definición. Para reactivarlo, abre .brackets.json no seu proxecto e elimina o arquivo de jscodehints.detectedExclusions.", + // extensions/default/JSLint "JSLINT_NAME" : "JSLint", @@ -566,4 +615,4 @@ define({ "DOCS_MORE_LINK" : "Máis" }); -/* Last translated for 3a762c3cf91d6f65a5bb19aeb2056afacd777c71 */ +/* Last translated for a4e9a06605cfca5dff5ab5dbacfb1d97c604b6f0 */ From 92992dd8b4800442e6f41532fca86fc110e65782 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Thu, 25 Sep 2014 15:37:02 -0700 Subject: [PATCH 070/182] Code review: add formal type annotations. Fix a bunch of older incorrect type annotations while I'm at it. --- src/utils/TokenUtils.js | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/utils/TokenUtils.js b/src/utils/TokenUtils.js index 3d87535aa60..825dd23db81 100644 --- a/src/utils/TokenUtils.js +++ b/src/utils/TokenUtils.js @@ -38,9 +38,9 @@ define(function (require, exports, module) { /** * Creates a context object for the given editor and position, suitable for passing to the * move functions. - * @param {CodeMirror} editor - * @param {{ch:{string}, line:{number}} pos - * @return {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} + * @param {!CodeMirror} editor + * @param {!{ch:number, line:number}} pos + * @return {!{editor:!CodeMirror, pos:!{ch:number, line:number}, token:Object}} */ function getInitialContext(editor, pos) { return { @@ -52,7 +52,7 @@ define(function (require, exports, module) { /** * Moves the given context backwards by one token. - * @param {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} ctx + * @param {!{editor:!CodeMirror, pos:!{ch:number, line:number}, token:Object}} ctx * @param {boolean=} precise If code is being edited, use true (default) for accuracy. * If parsing unchanging code, use false to use cache for performance. * @return {boolean} whether the context changed @@ -76,14 +76,17 @@ define(function (require, exports, module) { return true; } - /** Returns true if movePrevToken() would return false without changing pos */ + /** + * @param {!{editor:!CodeMirror, pos:!{ch:number, line:number}, token:Object}} ctx + * @return {boolean} true if movePrevToken() would return false without changing pos + */ function isAtStart(ctx) { return (ctx.pos.ch <= 0 || ctx.token.start <= 0) && (ctx.pos.line <= 0); } /** * Moves the given context forward by one token. - * @param {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} ctx + * @param {!{editor:!CodeMirror, pos:!{ch:number, line:number}, token:Object}} ctx * @param {boolean=} precise If code is being edited, use true (default) for accuracy. * If parsing unchanging code, use false to use cache for performance. * @return {boolean} whether the context changed @@ -108,7 +111,10 @@ define(function (require, exports, module) { return true; } - /** Returns true if moveNextToken() would return false without changing pos */ + /** + * @param {!{editor:!CodeMirror, pos:!{ch:number, line:number}, token:Object}} ctx + * @return {boolean} true if moveNextToken() would return false without changing pos + */ function isAtEnd(ctx) { var eol = ctx.editor.getLine(ctx.pos.line).length; return (ctx.pos.ch >= eol || ctx.token.end >= eol) && (ctx.pos.line >= ctx.editor.lineCount() - 1); @@ -117,7 +123,7 @@ define(function (require, exports, module) { /** * Moves the given context in the given direction, skipping any whitespace it hits. * @param {function} moveFxn the function to move the context - * @param {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} ctx + * @param {!{editor:!CodeMirror, pos:!{ch:number, line:number}, token:Object}} ctx * @return {boolean} whether the context changed */ function moveSkippingWhitespace(moveFxn, ctx) { @@ -134,7 +140,7 @@ define(function (require, exports, module) { /** * In the given context, get the character offset of pos from the start of the token. - * @param {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} context + * @param {!{editor:!CodeMirror, pos:!{ch:number, line:number}, token:Object}} context * @return {number} */ function offsetInToken(ctx) { @@ -147,8 +153,8 @@ define(function (require, exports, module) { /** * Returns the mode object and mode name string at a given position - * @param {CodeMirror} cm CodeMirror instance - * @param {line:{number}, ch:{number}} pos Position to query for mode + * @param {!CodeMirror} cm CodeMirror instance + * @param {!{line:number, ch:number}} pos Position to query for mode * @return {mode:{Object}, name:string} */ function getModeAt(cm, pos) { From fe8fd7f03728dba1a675bd3dac04c8964c488cc4 Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Thu, 25 Sep 2014 15:49:50 -0700 Subject: [PATCH 071/182] - simplify the css class handling --- src/project/FileTreeView.js | 49 +++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 7fbc85ec20d..dff8111db88 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -45,7 +45,7 @@ define(function (require, exports, module) { /** * @private * @type {Immutable.Map} - * + * * Stores the file tree extensions for adding classes and icons. The keys of the map * are the "categories" of the extensions and values are vectors of the callback functions. */ @@ -113,12 +113,12 @@ define(function (require, exports, module) { this.props.actions.setRenameValue(this.refs.name.getDOMNode().value.trim()); } }; - + /** * @private - * + * * Gets an appropriate width given the text provided. - * + * * @param {string} text Text to measure * @return {int} Width to use */ @@ -158,7 +158,7 @@ define(function (require, exports, module) { render: function () { var width = _measureText(this.props.name); - + return DOM.input({ className: "jstree-rename-input " + this.props.fileClasses, type: "text", @@ -272,7 +272,7 @@ define(function (require, exports, module) { return classes; } }; - + /** * @private * @@ -375,16 +375,13 @@ define(function (require, exports, module) { }, "." + extension); } - var fileClasses = ""; - if (this.props.entry.get("selected")) { - fileClasses += " jstree-clicked selected-node"; - } - - if (this.props.entry.get("context")) { - fileClasses += " context-node"; - } + var nameDisplay, + cx = React.addons.classSet; - var nameDisplay; + var fileClasses = cx({ + 'jstree-clicked selected-node': this.props.entry.get("selected"), + 'context-node': this.props.entry.get("context") + }); if (this.props.entry.get("rename")) { nameDisplay = fileRenameInput({ @@ -480,7 +477,7 @@ define(function (require, exports, module) { render: function () { var width = _measureText(this.props.name); - + return DOM.input({ className: "jstree-rename-input", type: "text", @@ -531,7 +528,7 @@ define(function (require, exports, module) { handleClick: function (event) { var isOpen = this.props.entry.get("open"), setOpen = isOpen ? false : true; - + if (event.metaKey || event.ctrlKey) { // ctrl-alt-click toggles this directory and its children if (event.altKey) { @@ -698,14 +695,14 @@ define(function (require, exports, module) { * Displays the absolutely positioned box for the selection or context in the * file tree. Its position is determined by passed-in info about the scroller in which * the tree resides and the top of the selected node (as reported by the node itself). - * + * * Props: * * selectionViewInfo: Immutable.Map with width, scrollTop, scrollLeft and offsetTop for the tree container * * visible: should this be visible now * * widthAdjustment: if this box should not fill the entire width, pass in a positive number here which is subtracted from the width in selectionViewInfo */ var fileSelectionBox = React.createClass({ - + /** * Sets up initial state. */ @@ -714,7 +711,7 @@ define(function (require, exports, module) { initialScroll: 0 }; }, - + /** * When the component has updated in the DOM, reposition it to where the currently * selected node is located now. @@ -723,7 +720,7 @@ define(function (require, exports, module) { if (!this.props.visible) { return; } - + var node = this.getDOMNode(), selectedNode = $(node.parentNode).find(this.props.selectedClassName), selectionViewInfo = this.props.selectionViewInfo; @@ -731,13 +728,13 @@ define(function (require, exports, module) { if (selectedNode.length === 0) { return; } - + node.style.top = selectedNode.offset().top - selectionViewInfo.get("offsetTop") + selectionViewInfo.get("scrollTop") + "px"; }, - + render: function () { var selectionViewInfo = this.props.selectionViewInfo; - + return DOM.div({ style: { overflow: "auto", @@ -775,7 +772,7 @@ define(function (require, exports, module) { this.props.extensions !== nextProps.extensions || this.props.selectionViewInfo !== nextProps.selectionViewInfo; }, - + render: function () { var selectionBackground = fileSelectionBox({ ref: "selectionBackground", @@ -795,7 +792,7 @@ define(function (require, exports, module) { selectedClassName: ".context-node", forceUpdate: true }); - + return DOM.div( null, selectionBackground, From bf10c17cf1e165ceaf452614b54f1d3e1ce5507b Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 25 Sep 2014 21:18:27 -0400 Subject: [PATCH 072/182] Fix rename via slow click to display errors as it does for the menu. --- src/project/ProjectManager.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 44dfef0d79b..99e4b297123 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -95,6 +95,7 @@ define(function (require, exports, module) { _fileSystemRename, _showErrorDialog, _saveTreeState, + renameItemInline, _renderTree; /** @@ -268,7 +269,11 @@ define(function (require, exports, module) { * See `ProjectModel.startRename` */ ActionCreator.prototype.startRename = function (path) { - return this.model.startRename(path); + // This is very not Flux-like, which is a sign that Flux may not be the + // right choice here *or* that this architecture needs to evolve subtly + // in how errors are reported (more like the create case). + // See #9284. + renameItemInline(path); }; /** @@ -1216,11 +1221,11 @@ define(function (require, exports, module) { * @param {FileSystemEntry} entry file or directory filesystem object to rename * @return {$.Promise} a promise resolved when the rename is done. */ - function renameItemInline(entry) { + renameItemInline = function (entry) { var d = new $.Deferred(), isFolder = entry.isDirectory; - actionCreator.startRename(entry) + model.startRename(entry) .done(function () { d.resolve(); }) @@ -1242,7 +1247,7 @@ define(function (require, exports, module) { d.reject(err); }); return d.promise(); - } + }; /** * Returns an Array of all files for this project, optionally including From 10adbfc6a7cb3c28edb1a2a82fe72b598713bc2c Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Fri, 26 Sep 2014 08:53:19 -0400 Subject: [PATCH 073/182] Make the errors from renameItemInline more informative. --- src/project/ProjectManager.js | 17 ++++++++--------- src/project/ProjectModel.js | 9 +++++++-- test/spec/ProjectModel-test.js | 6 ++++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 99e4b297123..06a77928808 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1222,29 +1222,28 @@ define(function (require, exports, module) { * @return {$.Promise} a promise resolved when the rename is done. */ renameItemInline = function (entry) { - var d = new $.Deferred(), - isFolder = entry.isDirectory; + var d = new $.Deferred(); model.startRename(entry) .done(function () { d.resolve(); }) - .fail(function (err) { + .fail(function (errorInfo) { // Need to do display the error message on the next event loop turn // because some errors can come up synchronously and then the dialog // is not displayed. window.setTimeout(function () { - if (err === ProjectModel.ERROR_INVALID_FILENAME) { - _showErrorDialog(ERR_TYPE_INVALID_FILENAME, isFolder, ProjectModel._invalidChars); + if (errorInfo.type === ProjectModel.ERROR_INVALID_FILENAME) { + _showErrorDialog(ERR_TYPE_INVALID_FILENAME, errorInfo.isFolder, ProjectModel._invalidChars); } else { - var errString = err === FileSystemError.ALREADY_EXISTS ? + var errString = errorInfo.type === FileSystemError.ALREADY_EXISTS ? Strings.FILE_EXISTS_ERR : - FileUtils.getFileErrorString(err); + FileUtils.getFileErrorString(errorInfo.type); - _showErrorDialog(ERR_TYPE_RENAME, isFolder, errString, entry.fullPath); + _showErrorDialog(ERR_TYPE_RENAME, errorInfo.isFolder, errString, errorInfo.fullPath); } }, 10); - d.reject(err); + d.reject(errorInfo); }); return d.promise(); }; diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index 05d5233b78d..d1b3a46b4f6 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -917,8 +917,13 @@ define(function (require, exports, module) { renameInfo.deferred.resolve({ newPath: newPath }); - }).fail(function (error) { - renameInfo.deferred.reject(error); + }).fail(function (errorType) { + var errorInfo = { + type: errorType, + isFolder: isFolder, + fullPath: oldPath + }; + renameInfo.deferred.reject(errorInfo); }); } }; diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 450cd5f57f4..54c016dd5a9 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -718,8 +718,10 @@ define(function (require, exports, module) { model.performRename(); waitsForFail(promise); runs(function () { - promise.fail(function (err) { - expect(err).toBe(ProjectModel.ERROR_INVALID_FILENAME); + promise.fail(function (errorInfo) { + expect(errorInfo.type).toBe(ProjectModel.ERROR_INVALID_FILENAME); + expect(errorInfo.isFolder).toBe(false); + expect(errorInfo.fullPath).toBe("/foo/afile.js"); }); }); }); From 55fa0278546695a4e03bc2d79d3020b26cedf045 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Fri, 26 Sep 2014 09:03:34 -0400 Subject: [PATCH 074/182] Switch to using display:none rather that moving the box. --- src/project/FileTreeView.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 07efa33ba86..92c65884075 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -734,21 +734,15 @@ define(function (require, exports, module) { }, render: function () { - var selectionViewInfo = this.props.selectionViewInfo, - style = { + var selectionViewInfo = this.props.selectionViewInfo; + + return DOM.div({ + style: { overflow: "auto", left: selectionViewInfo.get("scrollLeft"), width: selectionViewInfo.get("width") - this.props.widthAdjustment, - visibility: this.props.visible ? "visible" : "hidden" - }; - - if (!this.props.visible) { - style.width = 0; - style.top = 0; - } - - return DOM.div({ - style: style, + display: this.props.visible ? "block" : "none" + }, className: this.props.className }); } From 0845338fec46b6c233943b8ccdde68a465bb801e Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Fri, 26 Sep 2014 10:42:37 -0400 Subject: [PATCH 075/182] Click to rename works on a timeout. This is more like the earlier implementation of click-to-rename and provides more consistent behavior for double clicking to add to working set. Fix for #9200. --- src/project/FileTreeView.js | 44 +++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 07efa33ba86..f281b1cf5f5 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -282,6 +282,7 @@ define(function (require, exports, module) { */ getInitialState: function () { return { + clickTimer: null }; }, @@ -300,14 +301,35 @@ define(function (require, exports, module) { * context boxes as appropriate. */ componentDidUpdate: function (prevProps, prevState) { - if (this.props.entry.get("selected") && !prevProps.entry.get("selected")) { + var wasSelected = prevProps.entry.get("selected"), + isSelected = this.props.entry.get("selected"); + + if (isSelected && !wasSelected) { // TODO: This shouldn't really know about project-files-container // directly. It is probably the case that our React tree should actually // start with project-files-container instead of just the interior of // project-files-container and then the file tree will be one self-contained // functional unit. ViewUtils.scrollElementIntoView($("#project-files-container"), $(this.getDOMNode()), true); + } else if (!isSelected && wasSelected && this.state.clickTimer !== null) { + this.clearTimer(); + } + }, + + clearTimer: function () { + if (this.state.clickTimer !== null) { + window.clearTimeout(this.state.clickTimer); + this.setState({ + clickTimer: null + }); + } + }, + + startRename: function () { + if (!this.props.entry.get("rename")) { + this.props.actions.startRename(this.myPath()); } + this.clearTimer(); }, /** @@ -319,21 +341,15 @@ define(function (require, exports, module) { return; } - // If the user clicks twice within 500ms, that will be picked up by the double click handler - // If they click on the node twice with a pause, we'll start a rename. - if (this.props.entry.get("selected") && this.state.clickTime) { - var timeSincePreviousClick = new Date().getTime() - this.state.clickTime; - if (!this.props.entry.get("rename") && (timeSincePreviousClick > CLICK_RENAME_MINIMUM)) { - this.props.actions.startRename(this.myPath()); + if (this.props.entry.get("selected")) { + if (this.state.clickTimer === null && !this.props.entry.get("rename")) { + var timer = window.setTimeout(this.startRename, CLICK_RENAME_MINIMUM); this.setState({ - clickTime: 0 + clickTimer: timer }); } } else { this.props.actions.setSelected(this.myPath()); - this.setState({ - clickTime: new Date().getTime() - }); } return false; }, @@ -344,10 +360,10 @@ define(function (require, exports, module) { */ handleDoubleClick: function () { if (!this.props.entry.get("rename")) { + if (this.state.clickTimer !== null) { + this.clearTimer(); + } this.props.actions.selectInWorkingSet(this.myPath()); - this.setState({ - clickTime: 0 - }); } }, From 0038495cb9041e2397d5976603024ce9b09fd9c9 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Fri, 26 Sep 2014 11:03:09 -0400 Subject: [PATCH 076/182] Adds the shadow to project-files-container. Fix for #9251. --- src/project/ProjectManager.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 44dfef0d79b..77f796ac1b7 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -71,7 +71,8 @@ define(function (require, exports, module) { Urls = require("i18n!nls/urls"), FileSyncManager = require("project/FileSyncManager"), ProjectModel = require("project/ProjectModel"), - FileTreeView = require("project/FileTreeView"); + FileTreeView = require("project/FileTreeView"), + ViewUtils = require("utils/ViewUtils"); /** * @private @@ -120,6 +121,15 @@ define(function (require, exports, module) { * @type {jQueryObject} */ var $projectTreeContainer; + + /** + * @private + * + * Reference to the container of the React component. Everything in this + * node is managed by React. + * @type {Element} + */ + var fileTreeViewContainer; /** * @private @@ -597,7 +607,7 @@ define(function (require, exports, module) { if (!projectRoot) { return; } - FileTreeView.render($projectTreeContainer[0], model._viewModel, projectRoot, actionCreator, forceRender); + FileTreeView.render(fileTreeViewContainer, model._viewModel, projectRoot, actionCreator, forceRender); }; /** @@ -1105,6 +1115,8 @@ define(function (require, exports, module) { $projectTreeContainer.css("overflow", "auto"); $projectTreeContainer.css("position", "relative"); + fileTreeViewContainer = $("
    ").appendTo($projectTreeContainer)[0]; + model.setSelectionWidth($projectTreeContainer.width()); $(".main-view").click(function (jqEvent) { @@ -1136,6 +1148,8 @@ define(function (require, exports, module) { }); _renderTree(); + + ViewUtils.addScrollerShadow($projectTreeContainer[0]); }); /** From 106606585025219ee663c7b061058f09362f7570 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Fri, 26 Sep 2014 11:42:13 -0400 Subject: [PATCH 077/182] `.then` for toggleSubdirectories should saveTreeState at the correct time. --- src/project/ProjectManager.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 21463a32762..168ca7abcd8 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -324,7 +324,7 @@ define(function (require, exports, module) { * See `ProjectModel.toggleSubdirectories` */ ActionCreator.prototype.toggleSubdirectories = function (path, openOrClose) { - this.model.toggleSubdirectories(path, openOrClose).then(_saveTreeState()); + this.model.toggleSubdirectories(path, openOrClose).then(_saveTreeState); }; /** @@ -917,9 +917,7 @@ define(function (require, exports, module) { * @return {$.Promise} Resolved when done; or rejected if not found */ function showInTree(entry) { - return model.showInTree(entry).then(function () { - _saveTreeState(); - }); + return model.showInTree(entry).then(_saveTreeState); } From f3644f7e2a97265f8fe56fb37b7240e42edf8b3d Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Fri, 26 Sep 2014 11:51:55 -0700 Subject: [PATCH 078/182] restore default font-family definition --- src/styles/brackets_theme_default.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles/brackets_theme_default.less b/src/styles/brackets_theme_default.less index 3b233addcf6..5938cf06392 100644 --- a/src/styles/brackets_theme_default.less +++ b/src/styles/brackets_theme_default.less @@ -131,6 +131,8 @@ .dark & { color: @dark-bc-text; } + + font-family: "SourceCodePro-Medium", "ＭＳ ゴシック", "MS Gothic", monospace; } .code-font-win() { From 6cb6a89d6eeb8df51d053ab755edb6052797f322 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Fri, 26 Sep 2014 15:33:50 -0400 Subject: [PATCH 079/182] Revert to the previous selection in the file tree if there's an error. Fix for #9313. --- src/project/ProjectManager.js | 19 +++++++++++++++++-- src/project/ProjectModel.js | 12 ++++++++---- test/spec/ProjectModel-test.js | 15 ++++++++++++--- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index ca3ad04b192..eedcb78b6ca 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -187,6 +187,21 @@ define(function (require, exports, module) { } }, 10); } + + /** + * @private + * + * Reverts to the previous selection (useful if there's an error). + * + * @param {string|File} previousPath The previously selected path. + * @param {boolean} switchToWorkingSet True if we need to switch focus to the Working Set + */ + function _revertSelection(previousPath, switchToWorkingSet) { + model.setSelected(previousPath); + if (switchToWorkingSet) { + FileViewController.setFileViewFocus(FileViewController.WORKING_SET_VIEW); + } + } /** * @constructor @@ -225,9 +240,9 @@ define(function (require, exports, module) { // activity. this.model.on(ProjectModel.EVENT_SHOULD_SELECT, function (e, data) { if (data.add) { - FileViewController.openFileAndAddToWorkingSet(data.path); + FileViewController.openFileAndAddToWorkingSet(data.path).fail(_.partial(_revertSelection, data.previousPath, !data.hadFocus)); } else { - FileViewController.openAndSelectDocument(data.path, FileViewController.PROJECT_MANAGER); + FileViewController.openAndSelectDocument(data.path, FileViewController.PROJECT_MANAGER).fail(_.partial(_revertSelection, data.previousPath, !data.hadFocus)); } }); diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index 0ad11c079e4..2546d67269e 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -659,19 +659,23 @@ define(function (require, exports, module) { this._viewModel.moveMarker("context", this.makeProjectRelativeIfPossible(this._selections.context), null); delete this._selections.context; } + + var previousSelection = this._selections.selected; this._selections.selected = path; if (path) { - $(this).trigger(EVENT_SHOULD_FOCUS); - if (!doNotOpen) { $(this).trigger(EVENT_SHOULD_SELECT, { - path: path + path: path, + previousPath: previousSelection, + hadFocus: this._focused }); } + + $(this).trigger(EVENT_SHOULD_FOCUS); } }; - + /** * Gets the currently selected file or directory. * diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 1645a95190b..08ca4b0b492 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -425,15 +425,26 @@ define(function (require, exports, module) { expect(vm._treeData.getIn(["afile.js", "selected"])).toBe(true); expect(model._selections.selected).toBe("/foo/afile.js"); expect(changesFired).toBe(1); + expect(selectionEvents).toEqual([{ + path: "/foo/afile.js", + previousPath: undefined, + hadFocus: true + }]); }); it("should change the selection from the old to the new", function () { model.setSelected("/foo/afile.js"); changesFired = 0; + selectionEvents = []; model.setSelected("/foo/subdir1/afile.js"); expect(vm._treeData.getIn(["afile.js", "selected"])).toBe(undefined); expect(vm._treeData.getIn(["subdir1", "children", "afile.js", "selected"])).toBe(true); expect(changesFired).toBe(1); + expect(selectionEvents).toEqual([{ + path: "/foo/subdir1/afile.js", + previousPath: "/foo/afile.js", + hadFocus: true + }]); }); it("shouldn't fire a changed message if there was no change in selection", function () { @@ -1121,9 +1132,7 @@ define(function (require, exports, module) { expect(vm._treeData.getIn(["subdir1", "open"])).toBe(true); expect(vm._treeData.getIn(["subdir1", "children", "subsubdir", "open"])).toBe(true); expect(vm._treeData.getIn(["subdir1", "children", "subsubdir", "children", "interior.txt", "selected"])).toBe(true); - expect(data.shouldSelectEvents).toEqual([{ - path: "/foo/subdir1/subsubdir/interior.txt" - }]); + expect(data.shouldSelectEvents[0].path).toEqual("/foo/subdir1/subsubdir/interior.txt"); }); }); }); From 64586a1adb300d73fd1ca01f499bade1f944b657 Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Fri, 26 Sep 2014 13:46:28 -0700 Subject: [PATCH 080/182] - fix the failing project manager tests --- test/spec/ProjectManager-test.js | 118 +++++++++++++++---------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/test/spec/ProjectManager-test.js b/test/spec/ProjectManager-test.js index f90016a428b..6f440e5e137 100644 --- a/test/spec/ProjectManager-test.js +++ b/test/spec/ProjectManager-test.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -27,7 +27,7 @@ define(function (require, exports, module) { "use strict"; - + var ProjectManager, // Load from brackets.test CommandManager, // Load from brackets.test FileSystem, // Load from brackets.test @@ -39,7 +39,7 @@ define(function (require, exports, module) { describe("ProjectManager", function () { - + this.category = "integration"; var testPath = SpecRunnerUtils.getTestPath("/spec/ProjectManager-test-files"), @@ -54,16 +54,16 @@ define(function (require, exports, module) { runs(function () { waitsForDone(SpecRunnerUtils.copy(testPath, tempDir), "copy temp files"); }); - + SpecRunnerUtils.createTestWindowAndRun(this, function (w) { testWindow = w; - + // Load module instances from brackets.test brackets = testWindow.brackets; ProjectManager = testWindow.brackets.test.ProjectManager; CommandManager = testWindow.brackets.test.CommandManager; FileSystem = testWindow.brackets.test.FileSystem; - + SpecRunnerUtils.loadProjectInTestWindow(tempDir); }); }); @@ -76,11 +76,11 @@ define(function (require, exports, module) { SpecRunnerUtils.closeTestWindow(); SpecRunnerUtils.removeTempDirectory(); }); - + afterEach(function () { testWindow.closeAllFiles(); }); - + function waitForDialog() { var $dlg; waitsFor(function () { @@ -104,7 +104,7 @@ define(function (require, exports, module) { var error, stat, complete = false; var filePath = tempDir + "/Untitled.js"; var file = FileSystem.getFileForPath(filePath); - + runs(function () { file.stat(function (err, _stat) { error = err; @@ -136,7 +136,7 @@ define(function (require, exports, module) { runs(function () { expect(gotError).toBeTruthy(); expect(didCreate).toBeFalsy(); - + SpecRunnerUtils.clickDialogButton(Dialogs.DIALOG_BTN_OK); }); }); @@ -156,7 +156,7 @@ define(function (require, exports, module) { runs(function () { expect(gotError).toBeTruthy(); expect(didCreate).toBeFalsy(); - + SpecRunnerUtils.clickDialogButton(Dialogs.DIALOG_BTN_OK); }); }); @@ -173,25 +173,25 @@ define(function (require, exports, module) { chars = "?*|/"; } len = chars.length; - + function createFile() { // skip rename ProjectManager.createNewItem(tempDir, "file" + charAt + ".js", true) .done(function () { didCreate = true; }) .fail(function () { gotError = true; }); } - + function waitForFileCreate() { return !didCreate && gotError; } - + function assertFile() { expect(gotError).toBeTruthy(); expect(didCreate).toBeFalsy(); - + SpecRunnerUtils.clickDialogButton(Dialogs.DIALOG_BTN_OK); } - + for (i = 0; i < len; i++) { didCreate = false; gotError = false; @@ -219,18 +219,18 @@ define(function (require, exports, module) { .done(function () { didCreate = true; }) .fail(function () { gotError = true; }); } - + function waitForFileCreate() { return didCreate || gotError; } - + function assertFile() { expect(gotError).toBeTruthy(); expect(didCreate).toBeFalsy(); - + SpecRunnerUtils.clickDialogButton(Dialogs.DIALOG_BTN_OK); } - + for (i = 0; i < len; i++) { didCreate = false; gotError = false; @@ -244,7 +244,7 @@ define(function (require, exports, module) { } }); }); - + describe("deleteItem", function () { it("should delete the selected file in the project tree", function () { var complete = false, @@ -284,7 +284,7 @@ define(function (require, exports, module) { var promise = ProjectManager.deleteItem(selectedFile); waitsForDone(promise, "ProjectManager.deleteItem() timeout", 5000); }); - + // Verify that file no longer exists. runs(function () { complete = false; @@ -295,7 +295,7 @@ define(function (require, exports, module) { }); }); waitsFor(function () { return complete; }, 1000); - + runs(function () { expect(error).toBe(FileSystemError.NOT_FOUND); @@ -312,7 +312,7 @@ define(function (require, exports, module) { error, stat, promise; - + // Delete the root folder and all files/folders in it. runs(function () { promise = ProjectManager.deleteItem(rootFolderEntry); @@ -330,7 +330,7 @@ define(function (require, exports, module) { }); }); waitsFor(function () { return complete; }, 1000); - + runs(function () { expect(error).toBe(FileSystemError.NOT_FOUND); @@ -340,14 +340,14 @@ define(function (require, exports, module) { }); }); }); - + describe("Selection indicator", function () { - + function getItemName(fullPath) { if (fullPath === null) { return null; } - + var isFolder = _.last(fullPath) === "/", withoutSlash = isFolder ? fullPath.substr(0, fullPath.length - 1) : fullPath; @@ -355,11 +355,11 @@ define(function (require, exports, module) { } function expectSelected(fullPath) { - var $projectTreeItems = testWindow.$("#project-files-container > div > ul").children(), + var $projectTreeItems = testWindow.$("#project-files-container > div > div > ul").children(), $selectedItem = $projectTreeItems.find("a.jstree-clicked"); - + var name = getItemName(fullPath); - + if (!name) { expect($selectedItem.length).toBe(0); } else { @@ -367,19 +367,19 @@ define(function (require, exports, module) { expect($selectedItem.text().trim()).toBe(name); } } - + it("should deselect after opening file not rendered in tree", function () { var promise, exposedFile = tempDir + "/file.js", unexposedFile = tempDir + "/directory/interiorfile.js"; - + runs(function () { promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: exposedFile }); waitsForDone(promise); }); runs(function () { expectSelected(exposedFile); - + promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: unexposedFile }); waitsForDone(promise); }); @@ -387,13 +387,13 @@ define(function (require, exports, module) { expectSelected(null); }); }); - + function findExtantNode(fullPath) { var $treeItems = testWindow.$("#project-files-container li"), $result; - + var name = getItemName(fullPath); - + $treeItems.is(function () { var $treeNode = testWindow.$(this); if ($treeNode.children("a").text().trim() === name) { @@ -404,27 +404,27 @@ define(function (require, exports, module) { }); return $result; } - + function toggleFolder(fullPath, open) { var $treeNode = findExtantNode(fullPath); - + var expectedClass = open ? "jstree-open" : "jstree-closed"; expect($treeNode.hasClass(expectedClass)).toBe(false); - + $treeNode.children("a").children("span").click(); - + // if a folder has never been expanded before, this will be async waitsFor(function () { return $treeNode.hasClass(expectedClass); }, (open ? "Open" : "Close") + " tree node", 1000); } - + it("should reselect previously selected file when made visible again", function () { var promise, initialFile = tempDir + "/file.js", folder = tempDir + "/directory/", fileInFolder = tempDir + "/directory/interiorfile.js"; - + runs(function () { promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: initialFile }); waitsForDone(promise); @@ -449,13 +449,13 @@ define(function (require, exports, module) { toggleFolder(folder, false); // close folder }); }); - + it("should deselect after opening file hidden in tree, but select when made visible again", function () { var promise, initialFile = tempDir + "/file.js", folder = tempDir + "/directory/", fileInFolder = tempDir + "/directory/interiorfile.js"; - + runs(function () { promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: initialFile }); waitsForDone(promise); @@ -481,14 +481,14 @@ define(function (require, exports, module) { }); }); }); - + describe("File Display", function () { it("should not show useless directory entries", function () { var shouldShow = ProjectManager.shouldShow; var makeEntry = function (name) { return { name: name }; }; - + expect(shouldShow(makeEntry(".git"))).toBe(false); expect(shouldShow(makeEntry(".svn"))).toBe(false); expect(shouldShow(makeEntry(".DS_Store"))).toBe(false); @@ -504,7 +504,7 @@ define(function (require, exports, module) { expect(shouldShow(makeEntry(".cvsignore"))).toBe(true); expect(shouldShow(makeEntry(".hgignore"))).toBe(true); expect(shouldShow(makeEntry(".hgtags"))).toBe(false); - + }); }); From a451b324441fb2ed6447ec13391f2f68fa209227 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Fri, 26 Sep 2014 14:39:57 -0700 Subject: [PATCH 081/182] don't rescan doc when reattaching to editor --- src/LiveDevelopment/Documents/HTMLDocument.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/LiveDevelopment/Documents/HTMLDocument.js b/src/LiveDevelopment/Documents/HTMLDocument.js index f5ec62e04e9..c6ba540d17b 100644 --- a/src/LiveDevelopment/Documents/HTMLDocument.js +++ b/src/LiveDevelopment/Documents/HTMLDocument.js @@ -162,8 +162,7 @@ define(function HTMLDocumentModule(require, exports, module) { } if (this._instrumentationEnabled) { - // Update instrumentation for new editor - HTMLInstrumentation.scanDocument(this.doc); + // Resync instrumentation with editor HTMLInstrumentation._markText(this.editor); } }; From 25e7f3f3688b1f87c297ee40a9fdf9d339932689 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Fri, 26 Sep 2014 15:01:23 -0700 Subject: [PATCH 082/182] set focus in new pane only if there is a file in original pane --- src/view/MainViewManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/view/MainViewManager.js b/src/view/MainViewManager.js index 46d9d59812d..a904cee552d 100644 --- a/src/view/MainViewManager.js +++ b/src/view/MainViewManager.js @@ -1056,8 +1056,8 @@ define(function (require, exports, module) { $(exports).triggerHandler("paneLayoutChange", [_orientation]); - // if new pane was created, make it the active pane - if (newPane) { + // if new pane was created, and original pane is not empty, make new pane the active pane + if (newPane && getWorkingSetSize(firstPane.id) > 0) { setActivePaneId(newPane.id); } } From 9314a98b027c3e8d45dbc8e09530c7806c30240b Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Fri, 26 Sep 2014 15:21:58 -0700 Subject: [PATCH 083/182] also check for temporary view --- src/view/MainViewManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/MainViewManager.js b/src/view/MainViewManager.js index a904cee552d..cc1b881aafc 100644 --- a/src/view/MainViewManager.js +++ b/src/view/MainViewManager.js @@ -1057,7 +1057,7 @@ define(function (require, exports, module) { $(exports).triggerHandler("paneLayoutChange", [_orientation]); // if new pane was created, and original pane is not empty, make new pane the active pane - if (newPane && getWorkingSetSize(firstPane.id) > 0) { + if (newPane && getCurrentlyViewedFile(firstPane.id)) { setActivePaneId(newPane.id); } } From a3a8e7a20a4b42da9a53a7bb186091b9c6875386 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Fri, 26 Sep 2014 16:32:53 -0700 Subject: [PATCH 084/182] make sure there's an editor --- src/LiveDevelopment/Documents/HTMLDocument.js | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/LiveDevelopment/Documents/HTMLDocument.js b/src/LiveDevelopment/Documents/HTMLDocument.js index f5ec62e04e9..652c6a388c8 100644 --- a/src/LiveDevelopment/Documents/HTMLDocument.js +++ b/src/LiveDevelopment/Documents/HTMLDocument.js @@ -186,16 +186,19 @@ define(function HTMLDocumentModule(require, exports, module) { HTMLDocument.prototype.updateHighlight = function () { var editor = this.editor, ids = []; + if (Inspector.config.highlight) { - _.each(this.editor.getSelections(), function (sel) { - var tagID = HTMLInstrumentation._getTagIDAtDocumentPos( - editor, - sel.reversed ? sel.end : sel.start - ); - if (tagID !== -1) { - ids.push(tagID); - } - }); + if (editor) { + _.each(editor.getSelections(), function (sel) { + var tagID = HTMLInstrumentation._getTagIDAtDocumentPos( + editor, + sel.reversed ? sel.end : sel.start + ); + if (tagID !== -1) { + ids.push(tagID); + } + }); + } if (!ids.length) { HighlightAgent.hide(); From 326b4ff5efb7dffb9efdfbe8a6b0ca0d4dd65642 Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Fri, 26 Sep 2014 18:19:18 -0700 Subject: [PATCH 085/182] - avoid the jumping lines --- src/styles/jsTreeTheme.less | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/styles/jsTreeTheme.less b/src/styles/jsTreeTheme.less index c6f84c3fa0f..6345e7e922f 100644 --- a/src/styles/jsTreeTheme.less +++ b/src/styles/jsTreeTheme.less @@ -24,13 +24,14 @@ /* Styles for jsTree control */ /* (these are based on jsTree's default theme .css file, so they are not very LESS-like) */ +@li-min-height: 22px; .jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; } -.jstree li { display:block; min-height:18px; line-height:16px; white-space:nowrap; margin-left:18px; min-width:18px; } +.jstree li { display:block; min-height:@li-min-height; line-height:16px; white-space:nowrap; margin-left:18px; min-width:18px; } .jstree-rtl li { margin-left:0; margin-right:18px; } .jstree > ul > li { margin-left:0px; } .jstree-rtl > ul > li { margin-right:0px; } -.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } + +.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } + .jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } .jstree a:focus { outline: none; } .jstree a > ins { height:16px; width:16px; } @@ -154,7 +155,7 @@ ins.jstree-icon { left: 3px !important; padding: 0; position: absolute; - top: 2px; + top: 4px; width: 150px; height: 16px; line-height: 16px; From 7fa90ab9ec766f791679bce08b07326e4390b413 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Sun, 28 Sep 2014 10:07:00 -0400 Subject: [PATCH 086/182] Properly handle clicks when renaming nested files and directories. Fix for #9316 --- src/project/FileTreeView.js | 48 ++++++++++++++++++++++++----------- src/project/ProjectManager.js | 2 +- src/styles/jsTreeTheme.less | 11 ++++++-- 3 files changed, 43 insertions(+), 18 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 1107947be8e..299988f6975 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -95,6 +95,18 @@ define(function (require, exports, module) { * and invoking the correct action based on that input. */ var renameBehavior = { + /** + * Stop clicks from propagating so that clicking on the rename input doesn't + * cause directories to collapse. + */ + handleClick: function (e) { + e.stopPropagation(); + if (e.button !== LEFT_MOUSE_BUTTON) { + return false; + } + return true; + }, + /** * If the user presses enter or escape, we either successfully complete or cancel, respectively, * the rename or create operation that is underway. @@ -162,12 +174,13 @@ define(function (require, exports, module) { var width = _measureText(this.props.name); return DOM.input({ - className: "jstree-rename-input " + this.props.fileClasses, + className: "jstree-rename-input", type: "text", defaultValue: this.props.name, autoFocus: true, onKeyDown: this.handleKeyDown, onKeyUp: this.handleKeyUp, + onClick: this.handleClick, style: { width: width }, @@ -423,8 +436,7 @@ define(function (require, exports, module) { actions: this.props.actions, entry: this.props.entry, name: this.props.name, - parentPath: this.props.parentPath, - fileClasses: fileClasses + parentPath: this.props.parentPath }); } else { // Need to flatten the argument list because getIcons returns an array @@ -520,10 +532,11 @@ define(function (require, exports, module) { autoFocus: true, onKeyDown: this.handleKeyDown, onKeyUp: this.handleKeyUp, - ref: "name", style: { width: width - } + }, + onClick: this.handleClick, + ref: "name" }); } }); @@ -635,22 +648,26 @@ define(function (require, exports, module) { directoryClasses += " context-node"; } - var nameDisplay; + var nameDisplay, renameInput; if (entry.get("rename")) { - nameDisplay = directoryRenameInput({ + renameInput = directoryRenameInput({ actions: this.props.actions, entry: this.props.entry, name: this.props.name, parentPath: this.props.parentPath }); - } else { - // Need to flatten the arguments because getIcons returns an array - var aArgs = _.flatten([{ - href: "#", - className: directoryClasses - }, this.getIcons(), this.props.name], true); - nameDisplay = DOM.a.apply(DOM.a, aArgs); } + + // Need to flatten the arguments because getIcons returns an array + var aArgs = _.flatten([{ + href: "#", + className: directoryClasses + }, this.getIcons()], true); + if (!entry.get("rename")) { + aArgs.push(this.props.name); + } + + nameDisplay = DOM.a.apply(DOM.a, aArgs); return DOM.li({ className: this.getClasses("jstree-" + nodeClass), @@ -661,7 +678,8 @@ define(function (require, exports, module) { className: "jstree-icon" }, " "), nameDisplay, - childNodes); + childNodes, + renameInput); } }); diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index ca3ad04b192..42b54eaac09 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1128,7 +1128,7 @@ define(function (require, exports, module) { model.setSelectionWidth($projectTreeContainer.width()); $(".main-view").click(function (jqEvent) { - if (jqEvent.target.className !== "jstree-rename-input") { + if (!jqEvent.target.classList.contains("jstree-rename-input")) { forceFinishRename(); actionCreator.setContext(null); } diff --git a/src/styles/jsTreeTheme.less b/src/styles/jsTreeTheme.less index 6345e7e922f..1d5588ba15e 100644 --- a/src/styles/jsTreeTheme.less +++ b/src/styles/jsTreeTheme.less @@ -31,8 +31,15 @@ .jstree-rtl li { margin-left:0; margin-right:18px; } .jstree > ul > li { margin-left:0px; } .jstree-rtl > ul > li { margin-right:0px; } -.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } + -.jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } +.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } +.jstree a { + white-space: nowrap; + text-decoration: none; + padding: 1px 2px; + margin: 0; + line-height: 16px; + height: 16px; +} .jstree a:focus { outline: none; } .jstree a > ins { height:16px; width:16px; } .jstree a > .jstree-icon { margin-right:3px; } From ce6952ce483ecac3eaa5d31914ce92f6c706561e Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Sun, 28 Sep 2014 17:25:53 -0400 Subject: [PATCH 087/182] Make sure all switches between working set and file tree are displayed. Fix for #9225. --- src/project/ProjectManager.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index ca3ad04b192..7cdafcffcb6 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -387,6 +387,16 @@ define(function (require, exports, module) { return selectedEntry; } + /** + * @private + * + * Handler for changes in the focus between working set and file tree view. + */ + function _fileViewControllerChange() { + actionCreator.setFocused(_hasFileSelectionFocus()); + $projectTreeContainer.trigger("scroll"); + } + /** * @private * @@ -396,21 +406,10 @@ define(function (require, exports, module) { var curFullPath = MainViewManager.getCurrentlyViewedPath(MainViewManager.ACTIVE_PANE); if (curFullPath && _hasFileSelectionFocus()) { actionCreator.setSelected(curFullPath, true); - actionCreator.setFocused(true); } else { actionCreator.setSelected(null); - actionCreator.setFocused(false); } - } - - /** - * @private - * - * Handler for changes in the focus between working set and file tree view. - */ - function _fileViewControllerChange() { - actionCreator.setFocused(_hasFileSelectionFocus()); - $projectTreeContainer.trigger("scroll"); + _fileViewControllerChange(); } /** From 826a469eb4328986993050100db5b97eda966ec2 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Sun, 28 Sep 2014 19:13:04 -0400 Subject: [PATCH 088/182] Support ctrl-click for context on the Mac. Fix for #9349 --- src/project/FileTreeView.js | 19 +++++++++---- src/project/ProjectManager.js | 2 +- test/spec/FileTreeView-test.js | 51 +++++++++++++++++++++++++++++++++- 3 files changed, 64 insertions(+), 8 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 1107947be8e..b64c9dae340 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -54,9 +54,9 @@ define(function (require, exports, module) { // Constants // Time range from first click to second click to invoke renaming. - var CLICK_RENAME_MINIMUM = 500, - MIDDLE_MOUSE_BUTTON = 2, - LEFT_MOUSE_BUTTON = 0; + var CLICK_RENAME_MINIMUM = 500, + RIGHT_MOUSE_BUTTON = 2, + LEFT_MOUSE_BUTTON = 0; /** * @private @@ -188,7 +188,8 @@ define(function (require, exports, module) { * Send middle click to the action creator as a setContext action. */ handleMouseDown: function (e) { - if (e.button === MIDDLE_MOUSE_BUTTON) { + if (e.button === RIGHT_MOUSE_BUTTON || + (this.props.platform === "mac" && e.button === LEFT_MOUSE_BUTTON && e.ctrlKey)) { this.props.actions.setContext(this.myPath()); return false; } @@ -621,6 +622,7 @@ define(function (require, exports, module) { extensions: this.props.extensions, actions: this.props.actions, forceRender: this.props.forceRender, + platform: this.props.platform, sortDirectoriesFirst: this.props.sortDirectoriesFirst }); } else { @@ -712,6 +714,7 @@ define(function (require, exports, module) { actions: this.props.actions, extensions: this.props.extensions, forceRender: this.props.forceRender, + platform: this.props.platform, key: name }); } else { @@ -723,6 +726,7 @@ define(function (require, exports, module) { extensions: this.props.extensions, sortDirectoriesFirst: this.props.sortDirectoriesFirst, forceRender: this.props.forceRender, + platform: this.props.platform, key: name }); } @@ -843,7 +847,8 @@ define(function (require, exports, module) { contents: this.props.treeData, extensions: this.props.extensions, actions: this.props.actions, - forceRender: this.props.forceRender + forceRender: this.props.forceRender, + platform: this.props.platform }) ); } @@ -857,8 +862,9 @@ define(function (require, exports, module) { * @param {Directory} projectRoot Directory object from which the fullPath of the project root is extracted * @param {ActionCreator} actions object with methods used to communicate events that originate from the user * @param {boolean} forceRender Run render on the entire tree (useful if an extension has new data that it needs rendered) + * @param {string} platform mac, win, linux */ - function render(element, viewModel, projectRoot, actions, forceRender) { + function render(element, viewModel, projectRoot, actions, forceRender, platform) { if (!projectRoot) { return; } @@ -870,6 +876,7 @@ define(function (require, exports, module) { parentPath: projectRoot.fullPath, actions: actions, extensions: _extensions, + platform: platform, forceRender: forceRender }), element); diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index ca3ad04b192..83664f41b4c 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -616,7 +616,7 @@ define(function (require, exports, module) { if (!projectRoot) { return; } - FileTreeView.render(fileTreeViewContainer, model._viewModel, projectRoot, actionCreator, forceRender); + FileTreeView.render(fileTreeViewContainer, model._viewModel, projectRoot, actionCreator, forceRender, brackets.platform); }; /** diff --git a/test/spec/FileTreeView-test.js b/test/spec/FileTreeView-test.js index 2d6be895810..3923428b904 100644 --- a/test/spec/FileTreeView-test.js +++ b/test/spec/FileTreeView-test.js @@ -21,7 +21,7 @@ * */ -/*global $, define, describe, it, expect */ +/*global $, define, describe, it, expect, jasmine */ /*unittests: FileTreeView*/ define(function (require, exports, module) { @@ -103,6 +103,55 @@ define(function (require, exports, module) { expect($ins.text()).toBe("ICON"); }); + it("should set context on a node by right click", function () { + var actions = jasmine.createSpyObj("actions", ["setContext"]); + var rendered = RTU.renderIntoDocument(FileTreeView._fileNode({ + name: "afile.js", + entry: Immutable.Map(), + actions: actions, + parentPath: "/foo/" + })); + var node = rendered.getDOMNode(); + React.addons.TestUtils.Simulate.mouseDown(node, { + button: 2 + }); + expect(actions.setContext).toHaveBeenCalledWith("/foo/afile.js"); + }); + + it("should set context on a node by control click on Mac", function () { + var actions = jasmine.createSpyObj("actions", ["setContext"]); + var rendered = RTU.renderIntoDocument(FileTreeView._fileNode({ + name: "afile.js", + entry: Immutable.Map(), + actions: actions, + parentPath: "/foo/", + platform: "mac" + })); + var node = rendered.getDOMNode(); + React.addons.TestUtils.Simulate.mouseDown(node, { + button: 0, + ctrlKey: true + }); + expect(actions.setContext).toHaveBeenCalledWith("/foo/afile.js"); + }); + + it("should not set context on a node by control click on Windows", function () { + var actions = jasmine.createSpyObj("actions", ["setContext"]); + var rendered = RTU.renderIntoDocument(FileTreeView._fileNode({ + name: "afile.js", + entry: Immutable.Map(), + actions: actions, + parentPath: "/foo/", + platform: "win" + })); + var node = rendered.getDOMNode(); + React.addons.TestUtils.Simulate.mouseDown(node, { + button: 0, + ctrlKey: true + }); + expect(actions.setContext).not.toHaveBeenCalled(); + }); + it("should allow icon extensions to return a jQuery object for the icon", function () { var extensionCalls = 0, rendered = RTU.renderIntoDocument(FileTreeView._fileNode({ From 70e5add4be9cf5cdbaee9ef467fdb43a65e4404b Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Sun, 28 Sep 2014 21:18:38 -0400 Subject: [PATCH 089/182] Fix comment for mouseDown handler --- src/project/FileTreeView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index b64c9dae340..396172f4ed0 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -179,8 +179,8 @@ define(function (require, exports, module) { /** * @private * - * This mixin handles middle click action to make a file the "context" object for performing - * operations like rename. + * This mixin handles right click (or control click on Mac) action to make a file + * the "context" object for performing operations like rename. */ var contextSettable = { From 0adb06e8de91caced65eaf87c3d6fad6a44dd54f Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Sun, 28 Sep 2014 21:19:41 -0400 Subject: [PATCH 090/182] Fix other comment for file tree mouseDown events --- src/project/FileTreeView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 396172f4ed0..8a6e75eff94 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -185,7 +185,7 @@ define(function (require, exports, module) { var contextSettable = { /** - * Send middle click to the action creator as a setContext action. + * Send matching mouseDown events to the action creator as a setContext action. */ handleMouseDown: function (e) { if (e.button === RIGHT_MOUSE_BUTTON || From 7600a4300bd23def40f1b9e9a27d19bcf4f1e560 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Mon, 29 Sep 2014 10:26:15 +0200 Subject: [PATCH 091/182] Remove tabindex, Apply .no-focus to the whole dialog --- src/htmlContent/extension-manager-dialog.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/htmlContent/extension-manager-dialog.html b/src/htmlContent/extension-manager-dialog.html index abe4fee2ba7..2ea7139d69e 100644 --- a/src/htmlContent/extension-manager-dialog.html +++ b/src/htmlContent/extension-manager-dialog.html @@ -1,5 +1,5 @@ -
    -
    +
    +
    -
    +
    From 3490daae19f4f3408cb3fa45289d05456e0ff49b Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 29 Sep 2014 08:10:54 -0400 Subject: [PATCH 092/182] When renaming a file, adjust the selection as well if needed. Fix for #9225. This also fixes #9294. --- src/project/ProjectModel.js | 5 +++++ test/spec/ProjectModel-test.js | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index 0ad11c079e4..bf7fad601e8 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -903,6 +903,10 @@ define(function (require, exports, module) { delete this._selections.rename; delete this._selections.context; + if (this._selections.selected === oldPath) { + this._selections.selected = newPath; + } + viewModel.moveMarker("rename", oldProjectPath, null); viewModel.moveMarker("context", oldProjectPath, null); viewModel.moveMarker("creating", oldProjectPath, null); @@ -910,6 +914,7 @@ define(function (require, exports, module) { if (renameInfo.type === FILE_CREATING) { this.createAtPath(newPath).done(function (entry) { viewModel.renameItem(oldProjectPath, newName); + self.selectInWorkingSet(newPath); renameInfo.deferred.resolve(entry); }).fail(function (error) { self._viewModel.deleteAtPath(self.makeProjectRelativeIfPossible(renameInfo.path)); diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 1645a95190b..4f81be5b1a2 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -692,6 +692,14 @@ define(function (require, exports, module) { expect(vm._treeData.getIn(["afile.js", "rename"])).toBe(true); expect(model._selections.rename).toBeDefined(); }); + + it("adjusts the selection if the renamed file was selected", function () { + model.setSelected("/foo/afile.js"); + model.startRename("/foo/afile.js"); + model.setRenameValue("something.js"); + model.performRename(); + expect(model._selections.selected).toBe("/foo/something.js"); + }); it("does nothing if setRenameValue is called when there's no rename in progress", function () { model.setRenameValue("/foo/bar/baz"); @@ -759,7 +767,7 @@ define(function (require, exports, module) { expect(changesFired).toBeGreaterThan(0); }); - it("should save the item when done creating", function () { + it("should save the item and open it in working set when done creating", function () { spyOn(model, "createAtPath").andReturn(new $.Deferred().resolve().promise()); model.startCreating("/foo/subdir1/", "Untitled"); expect(model._selections.rename.path).toBe("/foo/subdir1/Untitled"); @@ -774,6 +782,10 @@ define(function (require, exports, module) { expect(vm._treeData.getIn(["subdir1", "children", "newfile.js", "creating"])).toBeUndefined(); expect(vm._treeData.getIn(["subdir1", "children", "newfile.js", "rename"])).toBeUndefined(); expect(model._selections.rename).toBeUndefined(); + expect(selectionEvents).toEqual([{ + path: "/foo/subdir1/newfile.js", + add: true + }]); }); it("can create an item with the default filename", function () { From 5c6e5455e0dc755080d872e6f23a9d0629243595 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 29 Sep 2014 08:36:38 -0400 Subject: [PATCH 093/182] Always update scroll information for the file tree so that selection is positioned correctly. This was a premature optimization avoiding offset computation which is generally expensive. --- src/project/FileTreeViewModel.js | 1 - src/project/ProjectManager.js | 16 ++-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/project/FileTreeViewModel.js b/src/project/FileTreeViewModel.js index 54a82eb361b..fed2c377e62 100644 --- a/src/project/FileTreeViewModel.js +++ b/src/project/FileTreeViewModel.js @@ -1104,7 +1104,6 @@ define(function (require, exports, module) { this._selectionViewInfo = this._selectionViewInfo.set("offsetTop", offsetTop); } - $(this).trigger(EVENT_CHANGE); }; /** diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 7cdafcffcb6..e58df81ca01 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -266,9 +266,6 @@ define(function (require, exports, module) { */ ActionCreator.prototype.setContext = function (path) { this.model.setContext(path); - if (path !== null && !_hasFileSelectionFocus()) { - $projectTreeContainer.trigger("scroll"); - } }; /** @@ -394,7 +391,6 @@ define(function (require, exports, module) { */ function _fileViewControllerChange() { actionCreator.setFocused(_hasFileSelectionFocus()); - $projectTreeContainer.trigger("scroll"); } /** @@ -615,6 +611,7 @@ define(function (require, exports, module) { if (!projectRoot) { return; } + model.setScrollerInfo($projectTreeContainer.scrollTop(), $projectTreeContainer.scrollLeft(), $projectTreeContainer.offset().top); FileTreeView.render(fileTreeViewContainer, model._viewModel, projectRoot, actionCreator, forceRender); }; @@ -1106,15 +1103,6 @@ define(function (require, exports, module) { _renderTree(); } - /** - * @private - * - * Updates the scroller positioning on scroll or sidebar changes. - */ - function _updateScrollerInfo() { - model.setScrollerInfo($projectTreeContainer.scrollTop(), $projectTreeContainer.scrollLeft(), $projectTreeContainer.offset().top); - } - // Initialize variables and listeners that depend on the HTML DOM AppInit.htmlReady(function () { $projectTreeContainer = $("#project-files-container"); @@ -1158,7 +1146,7 @@ define(function (require, exports, module) { Menus.closeAll(); actionCreator.setContext(null); } - _updateScrollerInfo(); + _renderTree(); }); _renderTree(); From fc2e4b71e3958975ab0a21e133e5897e875e04ec Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 29 Sep 2014 09:36:31 -0400 Subject: [PATCH 094/182] Rerender on change of focus between working set and file tree --- src/project/ProjectManager.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index e58df81ca01..7139a57c3e9 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -391,6 +391,7 @@ define(function (require, exports, module) { */ function _fileViewControllerChange() { actionCreator.setFocused(_hasFileSelectionFocus()); + _renderTree(); } /** From 21440374c911f4db2e8759a07352e7b536862891 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 29 Sep 2014 10:36:08 -0400 Subject: [PATCH 095/182] Limit the cases in which previous context is saved to avoid context highlight flashing. --- src/project/ProjectManager.js | 2 +- src/project/ProjectModel.js | 13 +++++++++---- test/spec/ProjectModel-test.js | 3 +-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 7139a57c3e9..08d28ca36a0 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1127,7 +1127,7 @@ define(function (require, exports, module) { }); $(Menus.getContextMenu(Menus.ContextMenuIds.PROJECT_MENU)).on("beforeContextMenuClose", function () { - actionCreator.setContext(null); + model.setContext(null, false, true); }); $projectTreeContainer.on("contextmenu", function () { diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index bf7fad601e8..47a26ac279e 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -709,17 +709,22 @@ define(function (require, exports, module) { * * @param {string} path full path of file or directory to which the context should be setBaseUrl * @param {boolean} _doNotRename True if this context change should not cause a rename operation to finish. This is a special case that goes with context menu handling. + * @param {boolean} _saveContext True if the current context should be saved (see comment below) */ - ProjectModel.prototype.setContext = function (path, _doNotRename) { + ProjectModel.prototype.setContext = function (path, _doNotRename, _saveContext) { // This bit is not ideal: when the user right-clicks on an item in the file tree // and there is already a context menu up, the FileTreeView sends a signal to set the // context to the new element but the PopupManager follows that with a message that it's // closing the context menu (because it closes the previous one and then opens the new // one.) This timing means that we need to provide some special case handling here. - if (!path) { - this._selections.previousContext = this._selections.context; + if (_saveContext) { + if (!path) { + this._selections.previousContext = this._selections.context; + } else { + this._selections.previousContext = path; + } } else { - this._selections.previousContext = path; + delete this._selections.previousContext; } path = _getPathFromFSObject(path); diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 4f81be5b1a2..c538f24dfb5 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -453,7 +453,7 @@ define(function (require, exports, module) { it("should be able to restore the context to handle the context menu events", function () { model.setContext("/foo/afile.js"); - model.setContext(null); + model.setContext(null, false, true); model.restoreContext(); expect(model._selections.context).toBe("/foo/afile.js"); }); @@ -617,7 +617,6 @@ define(function (require, exports, module) { expect(vm._treeData.getIn(["afile.js", "context"])).toBe(true); expect(model._selections).toEqual({ context: "/foo/afile.js", - previousContext: "/foo/afile.js", rename: { deferred: jasmine.any(Object), path: "/foo/afile.js", From 99b700dd7ae369fc76b4f4966b81ee797722fdaf Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 29 Sep 2014 10:46:40 -0400 Subject: [PATCH 096/182] Don't try to open newly created directories. --- src/project/ProjectModel.js | 6 +++++- test/spec/ProjectModel-test.js | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index 47a26ac279e..5b0de97707d 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -919,7 +919,11 @@ define(function (require, exports, module) { if (renameInfo.type === FILE_CREATING) { this.createAtPath(newPath).done(function (entry) { viewModel.renameItem(oldProjectPath, newName); - self.selectInWorkingSet(newPath); + + if (!isFolder) { + self.selectInWorkingSet(newPath); + } + renameInfo.deferred.resolve(entry); }).fail(function (error) { self._viewModel.deleteAtPath(self.makeProjectRelativeIfPossible(renameInfo.path)); diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index c538f24dfb5..7ebec307894 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -786,6 +786,16 @@ define(function (require, exports, module) { add: true }]); }); + + it("should create a directory but not open it", function () { + spyOn(model, "createAtPath").andReturn(new $.Deferred().resolve().promise()); + model.startCreating("/foo/", "Untitled", true); + model.setRenameValue("newdir"); + model.performRename(); + expect(model.createAtPath).toHaveBeenCalledWith("/foo/newdir/"); + expect(vm._treeData.getIn(["newdir", "children"]).toJS()).toEqual({}); + expect(selectionEvents).toEqual([]); + }); it("can create an item with the default filename", function () { spyOn(model, "createAtPath").andReturn(new $.Deferred().resolve().promise()); From b4d08e7924c9b65553d3ae9d022a47a8bf8a2fe0 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 29 Sep 2014 11:41:41 -0400 Subject: [PATCH 097/182] Signal change in file tree when selectionViewInfo changes. There is a special case in which we don't signal that change (it's noted in the code). This should eliminate some cases of inconsistency. A related change is that setSelection will no longer select items that aren't visible in the tree (something that does not happen in real life anyhow). This is a fix for #9343. --- src/project/FileTreeViewModel.js | 51 ++++++++++++++++++----------- src/project/ProjectModel.js | 8 +++-- test/spec/FileTreeViewModel-test.js | 9 +++++ test/spec/ProjectModel-test.js | 10 +++--- 4 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/project/FileTreeViewModel.js b/src/project/FileTreeViewModel.js index fed2c377e62..716e2929b4c 100644 --- a/src/project/FileTreeViewModel.js +++ b/src/project/FileTreeViewModel.js @@ -59,8 +59,8 @@ define(function (require, exports, module) { */ function FileTreeViewModel() { // For convenience in callbacks, make a bound version of this method so that we can - // just refer to it as this._commitTreeData when passing in a callback. - this._commitTreeData = this._commitTreeData.bind(this); + // just refer to it as this._commit when passing in a callback. + this._commit = this._commit.bind(this); } /** @@ -136,9 +136,18 @@ define(function (require, exports, module) { * * @param {Immutable.Map} treeData new treeData state */ - FileTreeViewModel.prototype._commitTreeData = function (treeData) { + FileTreeViewModel.prototype._commit = function (treeData, selectionViewInfo) { + var changed = false; if (treeData && treeData !== this._treeData) { this._treeData = treeData; + changed = true; + } + + if (selectionViewInfo && selectionViewInfo !== this._selectionViewInfo) { + this._selectionViewInfo = selectionViewInfo; + changed = true; + } + if (changed) { $(this).trigger(EVENT_CHANGE); } }; @@ -435,14 +444,15 @@ define(function (require, exports, module) { * @param {string|null} newPath Project relative file path with where to place the marker, or null if the marker is being removed from the tree */ FileTreeViewModel.prototype.moveMarker = function (markerName, oldPath, newPath) { - var newTreeData = _moveMarker(this._treeData, markerName, oldPath, newPath); + var newTreeData = _moveMarker(this._treeData, markerName, oldPath, newPath), + selectionViewInfo = this._selectionViewInfo; if (markerName === "selected") { - this._selectionViewInfo = this._selectionViewInfo.set("hasSelection", !!newPath); + selectionViewInfo = selectionViewInfo.set("hasSelection", !!newPath); } else if (markerName === "context") { - this._selectionViewInfo = this._selectionViewInfo.set("hasContext", !!newPath); + selectionViewInfo = selectionViewInfo.set("hasContext", !!newPath); } - this._commitTreeData(newTreeData); + this._commit(newTreeData, selectionViewInfo); }; /** @@ -471,7 +481,7 @@ define(function (require, exports, module) { return directory; }); - this._commitTreeData(treeData); + this._commit(treeData); }; /** @@ -531,7 +541,7 @@ define(function (require, exports, module) { FileTreeViewModel.prototype.setDirectoryOpen = function (path, open) { var result = _setDirectoryOpen(this._treeData, path, open); if (result && result.treeData) { - this._commitTreeData(result.treeData); + this._commit(result.treeData); } return result ? result.needsLoading : false; }; @@ -591,7 +601,7 @@ define(function (require, exports, module) { directory = _closeSubtree(directory); treeData = _setIn(treeData, subtreePath, directory); - this._commitTreeData(treeData); + this._commit(treeData); }; /** @@ -783,7 +793,7 @@ define(function (require, exports, module) { children = _mergeContentsIntoChildren(children, contents); treeData = _setIn(treeData, objectPath, children); - this._commitTreeData(treeData); + this._commit(treeData); }; /** @@ -825,7 +835,7 @@ define(function (require, exports, module) { * @param {string} path Project-relative path */ FileTreeViewModel.prototype.openPath = function (path) { - this._commitTreeData(_openPath(this._treeData, path)); + this._commit(_openPath(this._treeData, path)); }; /** @@ -887,7 +897,7 @@ define(function (require, exports, module) { */ FileTreeViewModel.prototype.createPlaceholder = function (basedir, name, isFolder) { var treeData = _createPlaceholder(this._treeData, basedir, name, isFolder); - this._commitTreeData(treeData); + this._commit(treeData); }; /** @@ -923,7 +933,7 @@ define(function (require, exports, module) { FileTreeViewModel.prototype.deleteAtPath = function (path) { var treeData = _deleteAtPath(this._treeData, path); if (treeData) { - this._commitTreeData(treeData); + this._commit(treeData); } }; @@ -1020,7 +1030,7 @@ define(function (require, exports, module) { }); } - this._commitTreeData(treeData); + this._commit(treeData); }; /** @@ -1060,7 +1070,7 @@ define(function (require, exports, module) { children: null })); - this._commitTreeData(treeData); + this._commit(treeData); }; /** @@ -1082,12 +1092,15 @@ define(function (require, exports, module) { * @param {int} width New width */ FileTreeViewModel.prototype.setSelectionWidth = function (width) { - this._selectionViewInfo = this._selectionViewInfo.set("width", width); - $(this).trigger(EVENT_CHANGE); + var selectionViewInfo = this._selectionViewInfo; + selectionViewInfo = selectionViewInfo.set("width", width); + this._commit(null, selectionViewInfo); }; /** * Sets the scroll position of the file tree to help position the selection bar. + * SPECIAL CASE NOTE: this does not trigger a change event because this data is + * explicitly set in the rendering process (see ProjectManager._renderTree). * * @param {int} scrollTop Scroll position * @param {int=} scrollLeft Horizontal scroll position @@ -1103,7 +1116,7 @@ define(function (require, exports, module) { if (offsetTop !== undefined) { this._selectionViewInfo = this._selectionViewInfo.set("offsetTop", offsetTop); } - + // Does not emit change event. See SPECIAL CASE NOTE in docstring above. }; /** diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index 5b0de97707d..047ea0603b7 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -649,11 +649,15 @@ define(function (require, exports, module) { return; } - this.performRename(); - var oldProjectPath = this.makeProjectRelativeIfPossible(this._selections.selected), pathInProject = this.makeProjectRelativeIfPossible(path); + if (path && !this._viewModel.isFilePathVisible(pathInProject)) { + return; + } + + this.performRename(); + this._viewModel.moveMarker("selected", oldProjectPath, pathInProject); if (this._selections.context) { this._viewModel.moveMarker("context", this.makeProjectRelativeIfPossible(this._selections.context), null); diff --git a/test/spec/FileTreeViewModel-test.js b/test/spec/FileTreeViewModel-test.js index 9a0608fe585..64290d7ab9f 100644 --- a/test/spec/FileTreeViewModel-test.js +++ b/test/spec/FileTreeViewModel-test.js @@ -632,6 +632,15 @@ define(function (require, exports, module) { vm.moveMarker("context", "subdir1/afile.js", null); expect(vm._selectionViewInfo.get("hasContext")).toBe(false); }); + + it("should signal a change when just selectionViewInfo changes", function () { + vm.moveMarker("context", null, "subdir1/afile.js"); + vm.deleteAtPath("subdir1/afile.js"); + changesFired = 0; + vm.moveMarker("context", "subdir1/afile.js", null); + expect(vm._selectionViewInfo.get("hasContext")).toBe(false); + expect(changesFired).toBe(1); + }); }); describe("createPlaceholder", function () { diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 7ebec307894..96b59aec3e1 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -467,17 +467,17 @@ define(function (require, exports, module) { expect(changesFired).toBe(1); }); - it("can select a file that is not visible", function () { + it("won't select a file that is not visible", function () { model.setSelected("/foo/subdir2/bar.js"); expect(changesFired).toBe(0); - expect(model._selections.selected).toBe("/foo/subdir2/bar.js"); + expect(model._selections.selected).toBeUndefined(); }); - it("will unselect the previously selected file when selecting one that's not visible", function () { + it("will maintain the previously selected file when selecting one that's not visible", function () { model.setSelected("/foo/subdir1/afile.js"); model.setSelected("/foo/subdir2/bar.js"); - expect(vm._treeData.getIn(["subdir1", "children", "afile.js", "selected"])).toBeUndefined(); - expect(model._selections.selected).toBe("/foo/subdir2/bar.js"); + expect(vm._treeData.getIn(["subdir1", "children", "afile.js", "selected"])).toBe(true); + expect(model._selections.selected).toBe("/foo/subdir1/afile.js"); }); it("can accept a filesystem object", function () { From 9d6f197ddea8d58ddd49aa6d71daba480667a698 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Mon, 29 Sep 2014 09:41:18 -0700 Subject: [PATCH 098/182] Fix for #9328. --- src/styles/brackets.less | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index b51ba7e2b65..19c66edc225 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -855,7 +855,8 @@ a, img { background: @bc-sidebar-selection; border-top: 1px solid @bc-shadow-small; border-bottom: 1px solid @bc-highlight; - height: 22px; + box-sizing: border-box; + height: 23px; position: absolute; } @@ -863,18 +864,19 @@ a, img { background: @bc-sidebar-selection; border-top: 1px solid @bc-shadow-small; border-bottom: 1px solid @bc-highlight; - height: 22px; + box-sizing: border-box; + height: 23px; width: 9px; /* quiet scrollbar width */ - height: 22px; position: fixed; z-index: @z-index-brackets-selection-extension; /* scroller-shadow appears above the extension */ } .filetree-context { - background: @bc-highlight; + background: rgba(255, 255, 255, 0.06); + box-sizing: border-box; position: absolute; - height: 22px; + height: 23px; } //Initially start with the open files hidden, they will get show as files are added From 7527fda65719cc426f263aa8273c740d1bbf8b27 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Mon, 29 Sep 2014 10:26:16 -0700 Subject: [PATCH 099/182] Kept jstree rename input text from shifting and tweaked unfocused pane header text color on light UI. --- src/styles/brackets.less | 2 +- src/styles/jsTreeTheme.less | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 19c66edc225..0a32dfeaad3 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -490,7 +490,7 @@ a, img { box-sizing: border-box; border-bottom: 1px solid rgba(0, 0, 0, 0.05); padding: 5px 10px; - color: @bc-text-quiet; + color: @bc-text-thin-quiet; background-color: @background; .dark & { diff --git a/src/styles/jsTreeTheme.less b/src/styles/jsTreeTheme.less index 6345e7e922f..40f18da8570 100644 --- a/src/styles/jsTreeTheme.less +++ b/src/styles/jsTreeTheme.less @@ -148,22 +148,24 @@ ins.jstree-icon { border: 1px solid #000; border-radius: 2px; box-shadow: @bc-shadow-small; + box-sizing: border-box; color: #fff; font-style: normal; font-weight: 400; font-size: 13px; left: 3px !important; + top: 2px !important; + margin: 0; padding: 0; - position: absolute; - top: 4px; + position: relative; width: 150px; - height: 16px; - line-height: 16px; + height: 17px; + line-height: 17px; } #project-files-container .jstree-brackets .jstree-rename-input:focus { border: 1px solid @bc-btn-border-focused; - box-shadow: 0 0 0 1px @bc-btn-border-focused-glow; + box-shadow: none; outline: none; } From 65ec43bf9e93e01e405e851ef0dac7ffead184bd Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 29 Sep 2014 13:47:39 -0400 Subject: [PATCH 100/182] Trigger for shadow on file tree to move when working set changes. This restores the same handling that was in ProjectManager previously. This is a fix for #9358. --- src/project/ProjectManager.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index ca3ad04b192..3825358dcbf 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1133,6 +1133,10 @@ define(function (require, exports, module) { actionCreator.setContext(null); } }); + + $("#working-set-list-container").on("contentChanged", function () { + $projectTreeContainer.trigger("contentChanged"); + }); $(Menus.getContextMenu(Menus.ContextMenuIds.PROJECT_MENU)).on("beforeContextMenuOpen", function () { actionCreator.restoreContext(); From 91b392bf349ece5058595b26a11c651697ee7ff6 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Mon, 29 Sep 2014 14:58:13 -0700 Subject: [PATCH 101/182] Code review: Update link in JS code hints error dialog --- src/nls/root/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 2d0b151a170..5f7f54b5f95 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -598,7 +598,7 @@ define({ "CMD_SHOW_PARAMETER_HINT" : "Show Parameter Hint", "NO_ARGUMENTS" : "", "DETECTED_EXCLUSION_TITLE" : "JavaScript File Inference Problem", - "DETECTED_EXCLUSION_INFO" : "Brackets ran into trouble processing {0}.

    This file will no longer be processed for code hints, Jump to Definition or Quick Edit. To reenable this file, open .brackets.json in your project and edit jscodehints.detectedExclusions.

    This is likely a Brackets bug. If you can provide a copy of this file, please file a bug with a link to the file named here.", + "DETECTED_EXCLUSION_INFO" : "Brackets ran into trouble processing {0}.

    This file will no longer be processed for code hints, Jump to Definition or Quick Edit. To reenable this file, open .brackets.json in your project and edit jscodehints.detectedExclusions.

    This is likely a Brackets bug. If you can provide a copy of this file, please file a bug with a link to the file named here.", // extensions/default/JSLint "JSLINT_NAME" : "JSLint", From a1babad675315e3086d9cc9966bab07396319b68 Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Mon, 29 Sep 2014 16:59:29 -0700 Subject: [PATCH 102/182] - fix the position of the selection div when entering rename mode --- src/project/FileTreeView.js | 12 ++++++------ src/styles/jsTreeTheme.less | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 8a6e75eff94..7411ca12958 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -179,7 +179,7 @@ define(function (require, exports, module) { /** * @private * - * This mixin handles right click (or control click on Mac) action to make a file + * This mixin handles right click (or control click on Mac) action to make a file * the "context" object for performing operations like rename. */ var contextSettable = { @@ -318,7 +318,7 @@ define(function (require, exports, module) { componentDidUpdate: function (prevProps, prevState) { var wasSelected = prevProps.entry.get("selected"), isSelected = this.props.entry.get("selected"); - + if (isSelected && !wasSelected) { // TODO: This shouldn't really know about project-files-container // directly. It is probably the case that our React tree should actually @@ -330,7 +330,7 @@ define(function (require, exports, module) { this.clearTimer(); } }, - + clearTimer: function () { if (this.state.clickTimer !== null) { window.clearTimeout(this.state.clickTimer); @@ -339,7 +339,7 @@ define(function (require, exports, module) { }); } }, - + startRename: function () { if (!this.props.entry.get("rename")) { this.props.actions.startRename(this.myPath()); @@ -360,7 +360,7 @@ define(function (require, exports, module) { if (e.button !== LEFT_MOUSE_BUTTON) { return; } - + if (this.props.entry.get("selected")) { if (this.state.clickTimer === null && !this.props.entry.get("rename")) { var timer = window.setTimeout(this.startRename, CLICK_RENAME_MINIMUM); @@ -772,7 +772,7 @@ define(function (require, exports, module) { return; } - node.style.top = selectedNode.offset().top - selectionViewInfo.get("offsetTop") + selectionViewInfo.get("scrollTop") + "px"; + node.style.top = selectedNode.offset().top - selectionViewInfo.get("offsetTop") + selectionViewInfo.get("scrollTop") - selectedNode.position().top + "px"; }, render: function () { diff --git a/src/styles/jsTreeTheme.less b/src/styles/jsTreeTheme.less index 40f18da8570..f01b2cba447 100644 --- a/src/styles/jsTreeTheme.less +++ b/src/styles/jsTreeTheme.less @@ -24,7 +24,7 @@ /* Styles for jsTree control */ /* (these are based on jsTree's default theme .css file, so they are not very LESS-like) */ -@li-min-height: 22px; +@li-min-height: 23px; .jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; } .jstree li { display:block; min-height:@li-min-height; line-height:16px; white-space:nowrap; margin-left:18px; min-width:18px; } From 539028c60d4fcdbc4005be564c636dfa36dbafa7 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Mon, 29 Sep 2014 17:02:28 -0700 Subject: [PATCH 103/182] fix parameter order --- src/project/ProjectManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 7f376b840ef..30e3b4f8baf 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -859,7 +859,7 @@ define(function (require, exports, module) { }); } else { console.log("error loading project"); - _showErrorDialog(ERR_TYPE_LOADING_PROJECT_NATIVE, null, rootPath, err || FileSystemError.NOT_FOUND) + _showErrorDialog(ERR_TYPE_LOADING_PROJECT_NATIVE, true, err || FileSystemError.NOT_FOUND, rootPath) .done(function () { // Reset _projectRoot to null so that the following _loadProject call won't // run the 'beforeProjectClose' event a second time on the original project, From b133287c27a0459620d2ac6cf2f4e3242a9c03ef Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Mon, 29 Sep 2014 18:33:28 -0700 Subject: [PATCH 104/182] be smarter about fallback projects --- src/project/ProjectManager.js | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 7f376b840ef..d563cf70bd6 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -681,6 +681,18 @@ define(function (require, exports, module) { } } + /** + * Get previous project from MRU list, or Getting Started folder if no previous projects. + * @return {string} + */ + function _getPreviousProjectPath() { + var recentProjects = PreferencesManager.getViewState("recentProjects"); + if (recentProjects && recentProjects.length > 0) { + return recentProjects[0]; + } + return _getWelcomeProjectPath(); + } + /** * Initial project path is stored in prefs, which defaults to the welcome project on * first launch. @@ -870,11 +882,19 @@ define(function (require, exports, module) { // project directory. // TODO (issue #267): When Brackets supports having no project directory // defined this code will need to change - _loadProject(_getWelcomeProjectPath()).always(function () { - // Make sure not to reject the original deferred until the fallback - // project is loaded, so we don't violate expectations that there is always - // a current project before continuing after _loadProject(). - result.reject(); + var fallbackPath = _getPreviousProjectPath(); + rootEntry = FileSystem.getDirectoryForPath(fallbackPath); + rootEntry.exists(function (err, exists) { + if (!exists) { + // In case user has deleted Getting Started folder + fallbackPath = FileUtils.getNativeBracketsDirectoryPath(); + } + _loadProject(fallbackPath).always(function () { + // Make sure not to reject the original deferred until the fallback + // project is loaded, so we don't violate expectations that there is always + // a current project before continuing after _loadProject(). + result.reject(); + }); }); }); } From de617d69a590cd601bbf967cbe23730e510db9d0 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 29 Sep 2014 22:30:19 -0400 Subject: [PATCH 105/182] Doc update in FileTreeViewModel._commit --- src/project/FileTreeViewModel.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/project/FileTreeViewModel.js b/src/project/FileTreeViewModel.js index 716e2929b4c..f426fc99d9c 100644 --- a/src/project/FileTreeViewModel.js +++ b/src/project/FileTreeViewModel.js @@ -134,7 +134,8 @@ define(function (require, exports, module) { * state moves atomically from one value to the next. This method stores the next version * of the state, if it has changed, and triggers a change event so that the UI can update. * - * @param {Immutable.Map} treeData new treeData state + * @param {?Immutable.Map} treeData new treeData state + * @param {?Immutable.Map} selectionViewInfo updated information for the selection/context bars */ FileTreeViewModel.prototype._commit = function (treeData, selectionViewInfo) { var changed = false; From 98c59d2277b7d697f84f54f5777c2a186d72e727 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Mon, 29 Sep 2014 22:40:42 -0700 Subject: [PATCH 106/182] implement working set dragging for splitview --- src/document/DocumentCommandHandlers.js | 18 +- src/editor/EditorManager.js | 6 +- src/htmlContent/working-set.html | 2 +- src/project/WorkingSetView.js | 1032 ++++++++++++++------ src/styles/brackets_patterns_override.less | 22 + src/styles/brackets_scrollbars.less | 5 + src/styles/brackets_variables.less | 1 + src/view/MainViewManager.js | 88 +- src/view/Pane.js | 90 +- 9 files changed, 957 insertions(+), 307 deletions(-) diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index 6161435c857..0432e47359d 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -244,12 +244,13 @@ define(function (require, exports, module) { * @param {!string} fullPath * @param {boolean=} silent If true, don't show error message * @param {string=} paneId, the id oi the pane in which to open the file. Can be undefined, a valid pane id or ACTIVE_PANE. + * @param {{*}=} options, command options * @return {$.Promise} a jQuery promise that will either * - be resolved with a file for the specified file path or * - be rejected with FileSystemError if the file can not be read. * If paneId is undefined, the ACTIVE_PANE constant */ - function _doOpen(fullPath, silent, paneId) { + function _doOpen(fullPath, silent, paneId, options) { var result = new $.Deferred(); // workaround for https://github.com/adobe/brackets/issues/6001 @@ -288,7 +289,7 @@ define(function (require, exports, module) { }); var file = FileSystem.getFileForPath(fullPath); - MainViewManager._open(paneId, file) + MainViewManager._open(paneId, file, options) .done(function () { result.resolve(file); }) @@ -314,10 +315,11 @@ define(function (require, exports, module) { * @param {?string} fullPath - The path of the file to open; if it's null we'll prompt for it * @param {boolean=} silent - If true, don't show error message * @param {string=} paneId - the pane in which to open the file. Can be undefined, a valid pane id or ACTIVE_PANE + * @param {{*}=} options - options to pass to MainViewManager._open * @return {$.Promise} a jQuery promise resolved with a Document object or * rejected with an err */ - function _doOpenWithOptionalPath(fullPath, silent, paneId) { + function _doOpenWithOptionalPath(fullPath, silent, paneId, options) { var result; paneId = paneId || MainViewManager.ACTIVE_PANE; if (!fullPath) { @@ -341,7 +343,7 @@ define(function (require, exports, module) { }); MainViewManager.addListToWorkingSet(paneId, filesToOpen); - _doOpen(paths[paths.length - 1], silent, paneId) + _doOpen(paths[paths.length - 1], silent, paneId, options) .done(function (file) { _defaultOpenDialogFullPath = FileUtils.getDirectoryPath( @@ -357,7 +359,7 @@ define(function (require, exports, module) { } }); } else { - result = _doOpen(fullPath, silent, paneId); + result = _doOpen(fullPath, silent, paneId, options); } return result.promise(); @@ -414,9 +416,11 @@ define(function (require, exports, module) { paneId = (commandData && commandData.paneId) || MainViewManager.ACTIVE_PANE, result = new $.Deferred(); - _doOpenWithOptionalPath(fileInfo.path, silent, paneId) + _doOpenWithOptionalPath(fileInfo.path, silent, paneId, commandData && commandData.options) .done(function (file) { - MainViewManager.setActivePaneId(paneId); + if (!commandData || !commandData.options || !commandData.options.noPaneActivate) { + MainViewManager.setActivePaneId(paneId); + } // If a line and column number were given, position the editor accordingly. if (fileInfo.line !== null) { diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js index 8e54549a339..56bf14bbed6 100644 --- a/src/editor/EditorManager.js +++ b/src/editor/EditorManager.js @@ -554,8 +554,10 @@ define(function (require, exports, module) { // show the view pane.showView(document._masterEditor); - // give it focus - document._masterEditor.focus(); + if (MainViewManager.getActivePaneId() === pane.id) { + // give it focus + document._masterEditor.focus(); + } if (createdNewEditor) { _restoreEditorViewState(document._masterEditor); diff --git a/src/htmlContent/working-set.html b/src/htmlContent/working-set.html index 879982641c6..7d18a73e11e 100644 --- a/src/htmlContent/working-set.html +++ b/src/htmlContent/working-set.html @@ -1,4 +1,4 @@ -
    +
    {{WORKING_FILES}}
    diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index c46b02738f0..298e5d92f26 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -41,19 +41,19 @@ define(function (require, exports, module) { Menus = require("command/Menus"), FileViewController = require("project/FileViewController"), ViewUtils = require("utils/ViewUtils"), + KeyEvent = require("utils/KeyEvent"), paneListTemplate = require("text!htmlContent/working-set.html"), Strings = require("strings"), _ = require("thirdparty/lodash"); - /** - * Currently open views + * Open view dictionary + * Maps PaneId to WorkingSetView * @private - * @type {Array.WorkingSetView} - * + * @type {Object.} */ - var _views = []; - + var _views = {}; + /** * Icon Providers * @see {@link WorkingSetView#addIconProvider()} @@ -76,15 +76,53 @@ define(function (require, exports, module) { var LEFT_BUTTON = 1, MIDDLE_BUTTON = 2; - /** + /** * Each list item in the working set stores a references to the related document in the list item's data. * Use `listItem.data(_FILE_KEY)` to get the document reference * @type {string} * @private */ var _FILE_KEY = "file"; - + + /** + * Constants for hitTest.where + * @enum {string} + */ + var NOMANSLAND = "nomansland", + NOMOVEITEM = "nomoveitem", + ABOVEITEM = "aboveitem", + BELOWITEM = "belowitem", + TOPSCROLL = "topscroll", + BOTSCROLL = "bottomscroll", + BELOWVIEW = "belowview", + ABOVEVIEW = "aboveview"; + + + /** + * Refreshes all Pane View List Views + */ + function refresh(rebuild) { + _.forEach(_views, function (view) { + var top = view.$openFilesContainer.scrollTop(); + if (rebuild) { + view._rebuildViewList(true); + } else { + view._redraw(); + } + view.$openFilesContainer.scrollTop(top); + }); + } + /** + * Synchronizes the selection indicator for all views + */ + function syncSelectionIndicator() { + _.forEach(_views, function (view) { + view.$openFilesContainer.triggerHandler("scroll"); + }); + } + + /** * Updates the appearance of the list element based on the parameters provided. * @private * @param {!HTMLLIElement} listElement @@ -96,7 +134,8 @@ define(function (require, exports, module) { ViewUtils.toggleClass($(listItem), "selected", shouldBeSelected); } - /** + + /** * Determines if a file is dirty * @private * @param {!File} file - file to test @@ -108,6 +147,674 @@ define(function (require, exports, module) { return (docIfOpen && docIfOpen.isDirty); } + + /** + * Turns on/off the flag which suppresses rebuilding of the working set + * when the "workingSetSort" event is dispatched from MainViewManager. + * Only used while dragging things around in the working set to disable + * rebuilding the list while dragging. + * @private + * @param {boolean} suppress - true suppress, false to allow sort redrawing + */ + function _suppressSortRedrawForAllViews(suppress) { + _.forEach(_views, function (view) { + view.suppressSortRedraw = suppress; + }); + } + + /** + * turns off the scroll shadow on view containers so they don't interfere with dragging + * @private + * @param {Boolean} disable - true to disable, false to enable + */ + function _suppressScrollShadowsOnAllViews(disable) { + _.forEach(_views, function (view) { + if (disable) { + ViewUtils.removeScrollerShadow(view.$openFilesContainer[0], null); + } else if (view.$openFilesContainer[0].scrollHeight > view.$openFilesContainer[0].clientHeight) { + ViewUtils.addScrollerShadow(view.$openFilesContainer[0], null, true); + } + }); + } + + /** + * Deactivates all views so the selection marker does not show + * @private + * @param {Boolean} deactivate - true to deactivate, false to reactivate + */ + function _deactivateAllViews(deactivate) { + _.forEach(_views, function (view) { + if (deactivate) { + if (view.$el.hasClass("active")) { + view.$el.removeClass("active").addClass("reactivate"); + view.$openFilesList.trigger("selectionHide"); + } + } else { + if (view.$el.hasClass("reactivate")) { + view.$el.removeClass("reactivate").addClass("active"); + } + // don't update the scroll pos + view._fireSelectionChanged(false); + } + }); + } + + /** + * Finds the WorkingSetView object for the specified element + * @private + * @param {jQuery} $el - the element to find the view for + * @return {View} view object + */ + function _viewFromEl($el) { + if (!$el.hasClass("working-set-view")) { + $el = $el.parents(".working-set-view"); + } + + var id = $el.attr("id").match(/working\-set\-list\-([\w]+[\w\d\-\.\:\_]*)/).pop(); + return _views[id]; + } + + /** + * Makes the specified element draggable + * @private + * @param {jQuery} $el - the element to make draggable + */ + function _makeDraggable($el) { + var interval, + sourceFile = $el.data(_FILE_KEY); + + // turn off the "hover-scroll" + function endScroll($el) { + if (interval) { + window.clearInterval(interval); + interval = undefined; + //console.log("end-scroll"); + } + } + + // We scroll the list while hovering over the first or last visible list element + // in the working set, so that positioning a working set item before or after one + // that has been scrolled out of view can be performed. + // + // This function will call the drag interface repeatedly on an interval to allow + // the item to be dragged while scrolling the list until the mouse is moved off + // the first or last item or endScroll is called + function scroll($container, $el, dir, callback) { + var container = $container[0], + maxScroll = container.scrollHeight - container.clientHeight; + if (maxScroll && dir && !interval) { + // Scroll view if the mouse is over the first or last pixels of the container + interval = window.setInterval(function () { + var scrollTop = $container.scrollTop(); + if ((dir === -1 && scrollTop <= 0) || (dir === 1 && scrollTop >= maxScroll)) { + //console.log("hit end of scroll range"); + endScroll($el); + } else { + $container.scrollTop(scrollTop + 7 * dir); + callback($el); + } + }, 50); + } + } + + // The mouse down handler pretty much handles everything + $el.mousedown(function (e) { + var scrollDir = 0, + dragged = false, + startPageY = e.pageY, + lastPageY = startPageY, + itemHeight = $el.height(), + tryClosing = $(e.target).hasClass("can-close"), + offset = $el.offset(), + $copy = $el.clone(), + $ghost = $("
    ").append($("
      ").append($copy).css("padding", "0")), + sourceView = _viewFromEl($el), + currentFile = MainViewManager.getCurrentlyViewedFile(), + activePaneId = MainViewManager.getActivePaneId(), + activeView = _views[activePaneId], + draggingCurrentFile = ($el.hasClass("selected") && sourceView.paneId === activePaneId), + startingIndex = MainViewManager.findInWorkingSet(sourceView.paneId, sourceFile.fullPath), + currentView = sourceView, + lastHit = { where: NOMANSLAND }; + + // Switches the view context to match the hit context + function updateContext(hit) { + // just set the container and update + currentView = _viewFromEl(hit.which); + } + + // Determines where the mouse hit was + function hitTest(e) { + var pageY = $ghost.offset().top, + direction = e.pageY - lastPageY, + result = { + where: NOMANSLAND + }, + lookCount = 0, + hasScroller = false, + onTopScroller = false, + onBottomScroller = false, + $workingFilesContainer = $("#working-set-list-container"), + $container, + $hit, + $item, + $view, + gTop, + gHeight, + gBottom, + deltaY, + containerOffset, + scrollerTopArea, + scrollerBottomArea; + + // if the mouse is outside of the view then + // return nomansland -- this prevents some UI glitches + // that appear when dragging onto a second monitor + if (e.pageX < 0 || e.pageX > $workingFilesContainer.width()) { + return result; + } + + do { + // Turn off the ghost so elementFromPoint ignores it + $ghost.hide(); + + $hit = $(window.document.elementFromPoint(e.pageX, pageY)); + $view = $hit.closest(".working-set-view"); + $item = $hit.closest("#working-set-list-container li"); + + // Show the ghost again + $ghost.show(); + + $container = $view.children(".open-files-container"); + + if ($container.length) { + containerOffset = $container.offset(); + + // Compute "scrollMe" regions + scrollerTopArea = { top: containerOffset.top - 14, + bottom: containerOffset.top + 7}; + + scrollerBottomArea = { top: containerOffset.top + $container.height() - 7, + bottom: containerOffset.top + $container.height() + 14}; + } + + // If we hit ourself then look for another + // element to insert before/after + if ($item[0] === $el[0]) { + if (direction > 0) { + $item = $item.next(); + if ($item.length) { + pageY += itemHeight; + } + } else { + $item = $item.prev(); + if ($item.length) { + pageY -= itemHeight; + } + } + } + + // If we didn't hit anything then + // back up and try again in the other direction + if (!$item.length) { + pageY += itemHeight; + } + + // we're going to do this twice + } while (!$item.length && ++lookCount < 2); + + // if we hit a span or an anchor tag and didn't + // find an item then force the selection hit to + // the item so we can bail out on the scrollMe + // region at the top and bottom of the list + if ($item.length === 0 && ($hit.is("a") || $hit.is("span"))) { + $item = $hit.parents("#working-set-list-container li"); + } + + //console.log("actual: " + $hit[0].tagName + " " + $hit.attr("class")); + //console.log("hit: " + $hit[0].tagName + " " + $hit.attr("class")); + + // compute ghost location, we compute the insertion point based + // on where the ghost is, not where the mouse is + gTop = $ghost.offset().top; + gHeight = $ghost.height(); + gBottom = gTop + gHeight; + deltaY = pageY - e.pageY; + + // data to help us determine if we have a scroller + hasScroller = $item.length && $container.length && $container[0].scrollHeight > $container[0].clientHeight; + + // data to help determine if the ghost is in either of the scrollMe regions + onTopScroller = hasScroller && scrollerTopArea && ((gTop >= scrollerTopArea.top && gTop <= scrollerTopArea.bottom) || + (gBottom >= scrollerTopArea.top && gBottom <= scrollerTopArea.bottom)); + onBottomScroller = hasScroller && scrollerBottomArea && ((gTop >= scrollerBottomArea.top && gTop <= scrollerBottomArea.bottom) || + (gBottom >= scrollerBottomArea.top && gBottom <= scrollerBottomArea.bottom)); + + + //console.log("lastY: " + lastPageY + " currentY " + e.pageY + " direction:" + (direction > 0 ? " down " : " up ")); + //console.log($item.length ? $item.text() : "no-hit-item"); + + // helpers + function mouseIsInTopHalf($elem) { + var top = $elem.offset().top, + height = $elem.height(); + + return (pageY < top + (height / 2)); + } + + function ghostIsAbove($elem) { + var top = $elem.offset().top, + checkVal = gTop; + + if (direction > 0) { + checkVal += gHeight; + } + + return (checkVal <= (top + (itemHeight / 2))); + } + + function ghostIsBelow($elem) { + var top = $elem.offset().top, + checkVal = gTop; + + if (direction > 0) { + checkVal += gHeight; + } + + return (checkVal >= (top + (itemHeight / 2))); + } + + function elIsClearBelow($a, $b) { + var aTop = $a.offset().top, + bTop = $b.offset().top; + + return (aTop >= bTop + $b.height()); + } + + function draggingBelowWorkingSet() { + return ($hit.length === 0 || elIsClearBelow($hit, $workingFilesContainer)); + } + + function targetIsContainer() { + return ($hit.is(".working-set-view") || + $hit.is(".open-files-container") || + ($hit.is("ul") && $hit.parent().is(".open-files-container"))); + } + + function findViewFor($elem) { + if ($elem.is(".working-set-view")) { + return $elem; + } + return $elem.parents(".working-set-view"); + } + + if ($item.length) { + // We hit an item (li) + if (onTopScroller && (direction <= 0 || lastHit.where === TOPSCROLL)) { + result = { + where: TOPSCROLL, + which: $item + }; + } else if (onBottomScroller && (direction >= 0 || lastHit.where === BOTSCROLL)) { + result = { + where: BOTSCROLL, + which: $item + }; + } else if (ghostIsAbove($item)) { + result = { + where: ABOVEITEM, + which: $item + }; + } else if (ghostIsBelow($item)) { + result = { + where: BELOWITEM, + which: $item + }; + } + } else if ($el.parent()[0] !== $hit[0]) { + // Didn't hit an li, figure out + // where to go from here + $view = $el.parents(".working-set-view"); + + if ($hit.is(".working-set-header") || $hit.is(".scroller-shadow") || $hit.is(".scroller-shadow")) { + if (direction < 0) { + if (ghostIsBelow($hit)) { + return result; + } + } else { + return result; + } + } + + if (draggingBelowWorkingSet()) { + return result; + } + + if (targetIsContainer()) { + if (mouseIsInTopHalf($hit)) { + result = { + where: ABOVEVIEW, + which: findViewFor($hit) + }; + } else { + result = { + where: BELOWVIEW, + which: findViewFor($hit) + }; + } + return result; + } + + // console.log($hit.attr("class")); + + // Data to determine to help determine if we should + // append to the previous or prepend to the next + var $prev = $view.prev(), + $next = $view.next(); + + if (direction < 0) { + // moving up, if there is a view above + // then we want to append to the view above + // otherwise we're in nomandsland + if ($prev.length) { + result = { + where: BELOWVIEW, + which: $prev + }; + } + } else if (direction > 0) { + // moving down, if there is a view below + // then we want to append to the view below + // otherwise we're in nomandsland + if ($next.length) { + result = { + where: ABOVEVIEW, + which: $next + }; + } + } else if (mouseIsInTopHalf($view)) { + // we're inside the top half of + // a view so prepend to the view we hit + result = { + where: ABOVEVIEW, + which: $view + }; + } else { + // we're inside the bottom half of + // a view so append to the view we hit + result = { + where: BELOWVIEW, + which: $view + }; + } + } else { + // The item doesn't need updating + result = { + where: NOMOVEITEM, + which: $hit + }; + } + + //console.log(e.pageY + " " + result.where + " " + (result.which ? result.which.text() : "")); + return result; + } + + // mouse move handler -- this pretty much does + // the heavy lifting for dragging the item around + $(window).on("mousemove.wsvdragging", function (e) { + //console.log("e.pageY " + e.pageY + " e.pageX " + e.pageX); + // The drag function + function drag(e) { + if (!dragged) { + + // sort redraw and scroll shadows + // cause problems during drag so disable them + _suppressSortRedrawForAllViews(true); + _suppressScrollShadowsOnAllViews(true); + + // remove the "active" class to remove the + // selection indicator so we don't have to + // keep it in sync while we're dragging + _deactivateAllViews(true); + + // add a "dragging" class to the outer container + $("#working-set-list-container").addClass("dragging"); + + // add a class to the element we're dragging if + // its the currently selected file so that we + // can show it as selected while dragging it + if (!draggingCurrentFile) { + $(activeView._findListItemFromFile(currentFile)).addClass("drag-show-as-selected"); + } + + // we've dragged the item so set + // dragged to true so we don't try and open it + dragged = true; + } + + // reset the scrolling direction to no-scroll + scrollDir = 0; + + // Find out where to to drag it to + lastHit = hitTest(e); + + // if the drag goes into nomansland then + // drop the opacity on the drag affordance + // and show the inserted item at reduced opacity + switch (lastHit.where) { + case NOMANSLAND: + case BELOWVIEW: + case ABOVEVIEW: + $el.css({opacity: ".75"}); + $ghost.css("opacity", ".25"); + break; + default: + $el.css({opacity: ".0001"}); + $ghost.css("opacity", ""); + break; + } + + // now do the insertion + switch (lastHit.where) { + case TOPSCROLL: + case ABOVEITEM: + if (lastHit.where === TOPSCROLL) { + scrollDir = -1; + } + $el.insertBefore(lastHit.which); + updateContext(lastHit); + break; + case BOTSCROLL: + case BELOWITEM: + if (lastHit.where === BOTSCROLL) { + scrollDir = 1; + } + $el.insertAfter(lastHit.which); + updateContext(lastHit); + break; + case BELOWVIEW: + $el.appendTo(lastHit.which.find("ul")); + updateContext(lastHit); + break; + case ABOVEVIEW: + $el.prependTo(lastHit.which.find("ul")); + updateContext(lastHit); + break; + } + + // we need to scroll + if (scrollDir) { + // we're in range to scroll + scroll(currentView.$openFilesContainer, $el, scrollDir, function () { + // as we scroll, recompute the element and insert + // it before/after the item to drag it in to place + drag(e); + }); + } else { + // we've moved away from the top/bottom "scrolling" region + endScroll($el); + } + } + + // move the drag affordance + $ghost.css("top", $ghost.offset().top + (e.pageY - lastPageY)); + + // if we have't started dragging yet then we wait until + // the mouse has moved 3 pixels before we start dragging + // to avoid the item moving when clicked or double clicked + if (dragged || Math.abs(e.pageY - startPageY) > 3) { + drag(e); + } + + lastPageY = e.pageY; + e.stopPropagation(); + }); + + + function scrollCurrentViewToBottom() { + var $container = currentView.$openFilesContainer, + container = $container[0], + maxScroll = container.scrollHeight - container.clientHeight; + + if (maxScroll) { + $container.scrollTop(maxScroll); + } + } + + // Close down the drag operation + function preDropCleanup() { + $("#working-set-list-container").removeClass("dragging"); + $("#working-set-list-container .drag-show-as-selected").removeClass("drag-show-as-selected"); + endScroll($el); + // re-activate the views (adds the "active" class to the view that was previously active) + _deactivateAllViews(false); + // turn scroll wheel back on + window.onmousewheel = window.document.onmousewheel = null; + $(window).off(".wsvdragging"); + $ghost.remove(); + $el.css("opacity", ""); + + if (dragged && $el.next().length === 0) { + scrollCurrentViewToBottom(); + } + } + + // Final Cleanup + function postDropCleanup(noRefresh) { + // re-enable stuff we turned off + _suppressSortRedrawForAllViews(false); + _suppressScrollShadowsOnAllViews(false); + + // we don't need to refresh if the + // item was not dragged or opened + if (!noRefresh) { + // rebuild the view + refresh(true); + } + // focus the editor + MainViewManager.focusActivePane(); + } + + // Drop + function drop() { + preDropCleanup(); + if (sourceView.paneId === currentView.paneId && startingIndex === $el.index()) { + // if the item was dragged but not moved then don't open or close + if (!dragged) { + // Click on close icon, or middle click anywhere - close the item without selecting it first + if (tryClosing || e.which === MIDDLE_BUTTON) { + CommandManager + .execute(Commands.FILE_CLOSE, {file: sourceFile, + paneId: sourceView.paneId}) + .always(function () { + postDropCleanup(); + }); + } else { + // Normal right and left click - select the item + CommandManager + .execute(Commands.FILE_OPEN, {fullPath: sourceFile.fullPath, + paneId: currentView.paneId}) + .always(function () { + postDropCleanup(); + }); + } + } else { + // no need to refresh + postDropCleanup(true); + } + } else if (sourceView.paneId === currentView.paneId) { + // item was reordered + MainViewManager._moveWorkingSetItem(sourceView.paneId, startingIndex, $el.index()); + postDropCleanup(); + } else { + // item was dragged to another working set + MainViewManager._moveView(sourceView.paneId, currentView.paneId, sourceFile, $el.index()) + .always(function () { + // if the current document was dragged to another working set + // then reopen it to make it the currently selected file + if (draggingCurrentFile) { + CommandManager + .execute(Commands.FILE_OPEN, {fullPath: sourceFile.fullPath, + paneId: currentView.paneId}) + .always(function () { + postDropCleanup(); + }); + } else { + postDropCleanup(); + } + }); + } + } + + // initialization + $(window).on("mouseup.wsvdragging", function () { + drop(); + }); + + // let escape cancel the drag + $(window).on("keydown.wsvdragging", function (e) { + if (e.keyCode === KeyEvent.DOM_VK_ESCAPE) { + preDropCleanup(); + postDropCleanup(); + e.stopPropagation(); + } + }); + + // turn off scroll wheel + window.onmousewheel = window.document.onmousewheel = function (e) { + e.preventDefault(); + }; + + // close all menus, and disable sorting + Menus.closeAll(); + + // Dragging only happens with the left mouse button + // or (on the Mac) when the ctrl key isn't pressed + if (e.which !== LEFT_BUTTON || (e.ctrlKey && brackets.platform === "mac")) { + drop(); + return; + } + + // setup our ghost element as position absolute + // so we can put it wherever we want to while dragging + if (draggingCurrentFile) { + $ghost.addClass("dragging-current-file"); + } + + $ghost.css({ + top: offset.top, + left: offset.left, + width: $el.width() + 8 + }); + + // this will give the element the appearence that it's ghosted if the user + // drags the element out of the view and goes off into no mans land + $ghost.appendTo($("body")); + + e.stopPropagation(); + }); + } + /* * WorkingSetView constructor * @constructor @@ -214,13 +921,18 @@ define(function (require, exports, module) { /** * Redraw selection when list size changes or DocumentManager currentDocument changes. + * @param {boolean=} scrollIntoView = Scrolls the selected item into view (the default behavior) * @private */ - WorkingSetView.prototype._fireSelectionChanged = function () { - this._scrollSelectedFileIntoView(); + WorkingSetView.prototype._fireSelectionChanged = function (scrollIntoView) { + var reveal = (scrollIntoView === undefined || scrollIntoView === true); + + if (reveal) { + this._scrollSelectedFileIntoView(); + } if (FileViewController.getFileSelectionFocus() === FileViewController.WORKING_SET_VIEW && this.$el.hasClass("active")) { - this.$openFilesList.trigger("selectionChanged"); + this.$openFilesList.trigger("selectionChanged", reveal); } else { this.$openFilesList.trigger("selectionHide"); } @@ -324,209 +1036,6 @@ define(function (require, exports, module) { }; /** - * Starts the drag and drop working set view reorder. - * @private - * @param {!Event} event - jQuery event - * @param {!HTMLLIElement} $listItem - jQuery element - * @param {?bool} fromClose - true if reorder was called from the close icon - */ - WorkingSetView.prototype._reorderListItem = function (event, $listItem, fromClose) { - var self = this, - $prevListItem = $listItem.prev(), - $nextListItem = $listItem.next(), - selected = $listItem.hasClass("selected"), - prevSelected = $prevListItem.hasClass("selected"), - nextSelected = $nextListItem.hasClass("selected"), - index = MainViewManager.findInWorkingSet(self.paneId, $listItem.data(_FILE_KEY).fullPath), - height = $listItem.height(), - startPageY = event.pageY, - listItemTop = startPageY - $listItem.offset().top, - listItemBottom = $listItem.offset().top + height - startPageY, - offsetTop = this.$openFilesContainer.offset().top, - scrollElement = this.$openFilesContainer.get(0), - containerHeight = scrollElement.clientHeight, - maxScroll = scrollElement.scrollHeight - containerHeight, - hasScroll = scrollElement.scrollHeight > containerHeight, - hasBottomShadow = scrollElement.scrollHeight > scrollElement.scrollTop + containerHeight, - addBottomShadow = false, - interval = false, - moved = false; - - // Don't redraw the working set for the next events - self.suppressSortRedraw = true; - - function drag(e) { - var top = e.pageY - startPageY; - - // Drag if the item is not the first and moving it up or - // if the item is not the last and moving down - if (($prevListItem.length && top < 0) || ($nextListItem.length && top > 0)) { - // Reorder the list once the item is halfway to the new position - if (Math.abs(top) > height / 2) { - // If moving up, place the previows item after the moving item - if (top < 0) { - $prevListItem.insertAfter($listItem); - startPageY -= height; - top = top + height; - MainViewManager._swapWorkingSetListIndexes(self.paneId, index, --index); - // If moving down, place the next item before the moving item - } else { - $nextListItem.insertBefore($listItem); - startPageY += height; - top = top - height; - MainViewManager._swapWorkingSetListIndexes(self.paneId, index, ++index); - } - - // Update the selection when the previows or next element were selected - if (!selected && ((top > 0 && prevSelected) || (top < 0 && nextSelected))) { - self._fireSelectionChanged(); - } - - // Update the previows and next items - $prevListItem = $listItem.prev(); - $nextListItem = $listItem.next(); - prevSelected = $prevListItem.hasClass("selected"); - nextSelected = $nextListItem.hasClass("selected"); - - // If the last item of the list was selected and the previows was moved to its location, then - // the it will show a bottom shadow even if it shouldnt because of the way the scrollHeight is - // handle with relative position. This will remove that shadow and add it on drop. - if (!addBottomShadow && !hasBottomShadow && !$nextListItem.length && prevSelected) { - ViewUtils.removeScrollerShadow(self.$openFilesContainer[0], null); - ViewUtils.addScrollerShadow(self.$openFilesContainer[0], null, false); - addBottomShadow = true; - } - } - // Set the top to 0 as the event probably didnt fired at the exact start/end of the list - } else { - top = 0; - } - - // Move the item - $listItem.css("top", top + "px"); - - // Update the selection position - if (selected) { - self._fireSelectionChanged(); - } - - // Once the movement is greater than 3 pixels, it is assumed that the user wantes to reorder files and not open - if (!moved && Math.abs(top) > 3) { - Menus.closeAll(); - moved = true; - - // Don't redraw the working set for the next events - self.suppressSortRedraw = true; - } - } - - function endScroll() { - window.clearInterval(interval); - interval = false; - } - - function scroll(e) { - var dir = 0; - // Mouse over the first visible pixels and moving up - if (e.pageY - listItemTop < offsetTop + 7) { - dir = -1; - // Mouse over the last visible pixels and moving down - } else if (e.pageY + listItemBottom > offsetTop + containerHeight - 7) { - dir = 1; - } - - if (dir && !interval) { - // Scroll view if the mouse is over the first or last pixels of the container - interval = window.setInterval(function () { - var scrollTop = self.$openFilesContainer.scrollTop(); - // End scroll if there isn't more to scroll - if ((dir === -1 && scrollTop <= 0) || (dir === 1 && scrollTop >= maxScroll)) { - endScroll(); - // Scroll and drag list item - } else { - self.$openFilesContainer.scrollTop(scrollTop + 7 * dir); - startPageY -= 7 * dir; - drag(e); - } - }, 100); - } else if (!dir && interval) { - endScroll(); - } - } - - function drop() { - // Enable Mousewheel - window.onmousewheel = window.document.onmousewheel = null; - - // Removes the styles, placing the item in the chosen place - $listItem.removeAttr("style"); - - // End the scrolling if needed - if (interval) { - window.clearInterval(interval); - } - - // If item wasn't dragged, treat as a click - if (!moved) { - // Click on close icon, or middle click anywhere - close the item without selecting it first - if (fromClose || event.which === MIDDLE_BUTTON) { - CommandManager.execute(Commands.FILE_CLOSE, {file: $listItem.data(_FILE_KEY), - paneId: self.paneId}); - } else { - // Normal right and left click - select the item - FileViewController.openAndSelectDocument($listItem.data(_FILE_KEY).fullPath, - FileViewController.WORKING_SET_VIEW, - self.paneId); - } - - } else { - // Update the file selection - if (selected) { - self._fireSelectionChanged(); - ViewUtils.scrollElementIntoView(self.$openFilesContainer, $listItem, false); - } - - // Restore the shadow - if (addBottomShadow) { - ViewUtils.addScrollerShadow(self.$openFilesContainer[0], null, true); - } - } - // The drag is done, so set back to the default - self.suppressSortRedraw = false; - } - - - // Only drag with the left mouse button, and control key is not down - // on Mac, end the drop in other cases - if (event.which !== LEFT_BUTTON || (event.ctrlKey && brackets.platform === "mac")) { - drop(); - return; - } - - // Disable Mousewheel while dragging - window.onmousewheel = window.document.onmousewheel = function (e) { - e.preventDefault(); - }; - - // Style the element - $listItem.css("position", "relative").css("z-index", 1); - - var $holder = $(window); - - // Event Handlers - $holder.on(self._makeEventName("mousemove"), function (e) { - if (hasScroll) { - scroll(e); - } - drag(e); - }); - $holder.on(self._makeEventName("mouseup"), function (e) { - $holder.off(self._makeEventName("")); - drop(); - }); - }; - - /** * Updates the appearance of the list element based on the parameters provided * @private * @param {!HTMLLIElement} listElement @@ -534,8 +1043,7 @@ define(function (require, exports, module) { * @param {bool} canClose */ WorkingSetView.prototype._updateFileStatusIcon = function (listElement, isDirty, canClose) { - var self = this, - $fileStatusIcon = listElement.find(".file-status-icon"), + var $fileStatusIcon = listElement.find(".file-status-icon"), showIcon = isDirty || canClose; // remove icon if its not needed @@ -547,17 +1055,7 @@ define(function (require, exports, module) { } else if (showIcon && $fileStatusIcon.length === 0) { $fileStatusIcon = $("
      ") - .prependTo(listElement) - .mousedown(function (e) { - // Try to drag if that is what is wanted if not it will be the equivalent to File > Close; - // it doesn't merely remove a file from the working set - self._reorderListItem(e, $(this).parent(), true); - - // stopPropagation of mousedown for fileStatusIcon so the parent
    • item, which - // selects documents on mousedown, doesn't select the document in the case - // when the click is on fileStatusIcon - e.stopPropagation(); - }); + .prependTo(listElement); } // Set icon's class @@ -567,7 +1065,7 @@ define(function (require, exports, module) { } }; - /** + /** * Updates the working set item class list * @private */ @@ -623,11 +1121,7 @@ define(function (require, exports, module) { // Update the listItem's apperance this._updateFileStatusIcon($newItem, _isOpenAndDirty(file), false); _updateListItemSelection($newItem, selectedFile); - - $newItem.mousedown(function (e) { - self._reorderListItem(e, $(this)); - e.preventDefault(); - }); + _makeDraggable($newItem); $newItem.hover( function () { @@ -639,7 +1133,7 @@ define(function (require, exports, module) { ); }; - /** + /** * Deletes all the list items in the view and rebuilds them from the working set model * @private */ @@ -658,7 +1152,7 @@ define(function (require, exports, module) { } }; - /** + /** * Updates the pane view's selection state * @private */ @@ -680,9 +1174,8 @@ define(function (require, exports, module) { */ WorkingSetView.prototype._updateListSelection = function () { var file = MainViewManager.getCurrentlyViewedFile(this.paneId); - - this._updateViewState(); + this._updateViewState(); // Iterate through working set list and update the selection on each this.$openFilesContainer.find("ul").children().each(function () { @@ -694,7 +1187,7 @@ define(function (require, exports, module) { this._fireSelectionChanged(); }; - /** + /** * workingSetAdd event handler * @private * @param {jQuery.Event} e - event object @@ -725,7 +1218,7 @@ define(function (require, exports, module) { } }; - /** + /** * workingSetRemove event handler * @private * @param {jQuery.Event} e - event object @@ -768,7 +1261,7 @@ define(function (require, exports, module) { } }; - /** + /** * workingSetRemoveList event handler * @private * @param {jQuery.Event} e - event object @@ -803,7 +1296,7 @@ define(function (require, exports, module) { } }; - /** + /** * dirtyFlagChange event handler * @private * @param {jQuery.Event} e - event object @@ -832,7 +1325,7 @@ define(function (require, exports, module) { }; - /** + /** * Initializes the WorkingSetView object */ WorkingSetView.prototype.init = function () { @@ -865,11 +1358,11 @@ define(function (require, exports, module) { this.$openFilesContainer.on("contextmenu.workingSetView", function (e) { Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_CONTEXT_MENU).open(e); }); - + this._redraw(); }; - /** + /** * Destroys the WorkingSetView DOM element and removes all event handlers */ WorkingSetView.prototype.destroy = function () { @@ -884,48 +1377,24 @@ define(function (require, exports, module) { * paneDestroy event handler */ $(MainViewManager).on("paneDestroy", function (e, paneId) { - var index = _.findIndex(_views, function (workingSetListView) { - return workingSetListView.paneId === paneId; - }); - - if (index >= 0) { - var views = _views.splice(index, 1); - _.forEach(views, function (view) { - view.destroy(); - }); - } + var view = _views[paneId]; + delete _views[view.paneId]; + view.destroy(); }); - /** + /** * Creates a new WorkingSetView object for the specified pane * @param {!jQuery} $container - the WorkingSetView's DOM parent node * @param {!string} paneId - the id of the pane the view is being created for */ function createWorkingSetViewForPane($container, paneId) { - // make sure the pane doesn't already have a view - var index = _.findIndex(_views, function (workingSetListView) { - return workingSetListView.paneId === paneId; - }); - - // if there wasn't already a view for the pane then create a new one - if (index === -1) { - _views.push(new WorkingSetView($container, paneId)); + var view = _views[paneId]; + if (!view) { + view = new WorkingSetView($container, paneId); + _views[view.paneId] = view; } } - /** - * Refreshes all Pane View List Views - * @param {boolean=} reconstruct - completely rebuilds the view list - */ - function refresh(reconstruct) { - _.forEach(_views, function (view) { - if (reconstruct) { - view._rebuildViewList(); - } else { - view._redraw(); - } - }); - } /** * adds an icon provider to the view. @@ -961,15 +1430,6 @@ define(function (require, exports, module) { refresh(true); } - /** - * Synchronizes the selection indicator for all views - */ - function syncSelectionIndicator() { - _.forEach(_views, function (workingSetListView) { - workingSetListView.$openFilesContainer.triggerHandler("scroll"); - }); - } - // Public API exports.createWorkingSetViewForPane = createWorkingSetViewForPane; exports.refresh = refresh; diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 5bb9f4a9cab..2b828e11bda 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -75,6 +75,28 @@ a:focus { } } +/* working set drag ghost styles */ + +.wsv-drag-ghost { + letter-spacing: .01em; + position: absolute; + z-index: @z-index-brackets-drag-ghost; + background-color: transparent; + + text-shadow: 0px 1px 2px @bc-shadow-large; + + .dark & { + text-shadow: 0px 1px 2px @dark-bc-shadow-large; + } +} + +.wsv-drag-ghost.dragging-current-file { + background-color: @bc-sidebar-selection; +} + +#working-set-list-container .drag-show-as-selected { + background-color: @bc-sidebar-selection; +} /* Toolbar-related styles */ diff --git a/src/styles/brackets_scrollbars.less b/src/styles/brackets_scrollbars.less index a804cf3a58a..4209d8ccdd3 100644 --- a/src/styles/brackets_scrollbars.less +++ b/src/styles/brackets_scrollbars.less @@ -55,6 +55,7 @@ background-color: transparent; } + .dragging ::-webkit-scrollbar-thumb, :hover::-webkit-scrollbar-thumb, :focus::-webkit-scrollbar-thumb { border-radius: 999px; @@ -62,11 +63,13 @@ border: 2px solid transparent; } + .dragging ::-webkit-scrollbar-thumb, :hover::-webkit-scrollbar-thumb:vertical, :focus::-webkit-scrollbar-thumb:vertical { min-height: 20px; } + .dragging :-webkit-scrollbar-thumb, :hover::-webkit-scrollbar-thumb:horizontal, :focus::-webkit-scrollbar-thumb:horizontal { min-width: 20px; @@ -116,6 +119,8 @@ ::-webkit-scrollbar-thumb { box-shadow: 0 0 0 12px @win-scrollbar-thumb inset; } + + .dragging ::-webkit-scrollbar-thumb, ::-webkit-scrollbar-thumb:hover, ::-webkit-scrollbar-thumb:focus { box-shadow: 0 0 0 12px @win-scrollbar-thumb-hover inset; diff --git a/src/styles/brackets_variables.less b/src/styles/brackets_variables.less index 10289a54fda..a938ca2771f 100644 --- a/src/styles/brackets_variables.less +++ b/src/styles/brackets_variables.less @@ -55,6 +55,7 @@ @z-index-brackets-resizer-div: (@z-index-brackets-sidebar-resizer + 1); @z-index-brackets-panel-resizer: (@z-index-brackets-ui + 2); +@z-index-brackets-drag-ghost: 999; @z-index-brackets-context-menu-base: 1000; @z-index-brackets-stylesheet-menu: 1000; @z-index-brackets-inline-editor-error: 1000; diff --git a/src/view/MainViewManager.js b/src/view/MainViewManager.js index cc1b881aafc..c245ce69742 100644 --- a/src/view/MainViewManager.js +++ b/src/view/MainViewManager.js @@ -57,6 +57,8 @@ * (e, fileAdded:File, index:number, paneId:string) * - workingSetAddList -- When multiple files are added to the working set * (e, fileAdded:Array., paneId:string) + * - workingSetMove - When a File has moved to a different working set + * (e, File:FILE, sourcePaneId:string, destinationPaneId:string) * - workingSetRemove -- When a file is removed from the working set * (e, fileRemoved:File, suppressRedraw:boolean, paneId:string) * - workingSetRemoveList -- When multiple files are removed from the working set @@ -787,6 +789,46 @@ define(function (require, exports, module) { } } + /** + * moves a view from one pane to another + * @param {!string} sourcePaneId - id of the source pane + * @param {!string} destinationPaneId - id of the destination pane + * @param {!File} file - the File to move + * @param {Number} destinationIndex - the working set index of the file in the destination pane + * @return {jQuery.Promise} a promise that resolves when the move has completed. + * @private + */ + function _moveView(sourcePaneId, destinationPaneId, file, destinationIndex) { + var result = new $.Deferred(), + sourcePane = _getPane(sourcePaneId), + destinationPane = _getPane(destinationPaneId); + + sourcePane.moveView(file, destinationPane, destinationIndex) + .done(function () { + // update the mru list + _mruList.every(function (record) { + if (record.file === file && record.paneId === sourcePane.id) { + record.paneId = destinationPane.id; + return false; + } + return true; + }); + }) + .always(function () { + $(exports).triggerHandler("workingSetMove", [file, sourcePane.id, destinationPane.id]); + result.resolve(); + }); + + return result.promise(); + } + + /** + * DocumentManager.pathDeleted Event handler to remove a file + * from the MRU list + * @param {!jQuery.event} e - + * @param {!string} fullPath - path of the file to remove + * @private + */ function _removeDeletedFileFromMRU(e, fullPath) { var index, compare = function (record) { @@ -808,7 +850,7 @@ define(function (require, exports, module) { * @param {sortFunctionCallback} compareFn - callback to determine sort order (called on each item) * @see {@link Pane.sortViewList()} for more information * @see {@link https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/sort|Sort Array - MDN} - * @privaate + * @private */ function _sortWorkingSet(paneId, compareFn) { _forEachPaneOrPanes(paneId, function (pane) { @@ -816,6 +858,23 @@ define(function (require, exports, module) { $(exports).triggerHandler("workingSetSort", [pane.id]); }); } + + + /** + * moves a working set item from one index to another shifting the items + * after in the working set up and reinserting it at the desired location + * @param {!string} paneId - id of the pane to sort + * @param {!number} fromIndex - the index of the item to move + * @param {!number} toIndex - the index to move to + * @privaate + */ + function _moveWorkingSetItem(paneId, fromIndex, toIndex) { + var pane = _getPane(paneId); + + pane.moveWorkingSetItem(fromIndex, toIndex); + $(exports).triggerHandler("workingSetSort", [pane.id]); + $(exports).triggerHandler("_workingSetDisableAutoSort", [pane.id]); + } /** * Mutually exchanges the files at the indexes passed by parameters. @@ -1071,10 +1130,13 @@ define(function (require, exports, module) { * Do not use this API unless you have a document object without a file object * @param {!string} paneId - id of the pane in which to open the document * @param {!Document} doc - document to edit + * @param {{noPaneActivate:boolean}=} optionsIn - options * @private */ - function _edit(paneId, doc) { - var currentPaneId = _getPaneIdForPath(doc.file.fullPath); + function _edit(paneId, doc, optionsIn) { + var currentPaneId = _getPaneIdForPath(doc.file.fullPath), + options = optionsIn || {}; + if (currentPaneId) { // If the doc is open in another pane @@ -1083,7 +1145,9 @@ define(function (require, exports, module) { // we could just do pane.showView(doc._masterEditor) in that // case but Editor Manager may do some state syncing paneId = currentPaneId; - setActivePaneId(paneId); + if (!options.noPaneActivate) { + setActivePaneId(paneId); + } } var pane = _getPane(paneId); @@ -1104,14 +1168,16 @@ define(function (require, exports, module) { * or a document for editing. If it's a document for editing, edit is called on the document * @param {!string} paneId - id of the pane in which to open the document * @param {!File} file - file to open + * @param {{noPaneActivate:boolean}=} optionsIn - options * @return {jQuery.Promise} promise that resolves to a File object or * rejects with a File error or string */ - function _open(paneId, file) { - var result = new $.Deferred(); + function _open(paneId, file, optionsIn) { + var result = new $.Deferred(), + options = optionsIn || {}; if (!file || !_getPane(paneId)) { - throw new Error("bad argument"); + return result.reject("bad argument").promise(); } var currentPaneId = _getPaneIdForPath(file.fullPath); @@ -1139,7 +1205,9 @@ define(function (require, exports, module) { // we could just do pane.showView(doc._masterEditor) in that // case but Editor Manager may do some state syncing paneId = currentPaneId; - setActivePaneId(paneId); + if (!options.noPaneActivate) { + setActivePaneId(paneId); + } } // See if there is already a view for the file @@ -1173,7 +1241,7 @@ define(function (require, exports, module) { } else { DocumentManager.getDocumentForPath(file.fullPath) .done(function (doc) { - _edit(paneId, doc); + _edit(paneId, doc, options); result.resolve(doc.file); }) .fail(function (fileError) { @@ -1583,9 +1651,11 @@ define(function (require, exports, module) { // Private Helpers exports._removeView = _removeView; + exports._moveView = _moveView; // Private API exports._sortWorkingSet = _sortWorkingSet; + exports._moveWorkingSetItem = _moveWorkingSetItem; exports._swapWorkingSetListIndexes = _swapWorkingSetListIndexes; exports._destroyEditorIfNotNeeded = _destroyEditorIfNotNeeded; exports._edit = _edit; diff --git a/src/view/Pane.js b/src/view/Pane.js index 466c35edcb2..94f7b5ca38c 100644 --- a/src/view/Pane.js +++ b/src/view/Pane.js @@ -164,6 +164,17 @@ define(function (require, exports, module) { ProjectManager = require("project/ProjectManager"), paneTemplate = require("text!htmlContent/pane.html"); + /** + * Make an index request object + * @param {boolean} requestIndex - true to request an index, false if not + * @param {number} index - the index to request + * @return {indexRequested:boolean, index:number} an object that can be pased to + * Pane._addToViewList to insert the item at a specific index + * @see {Pane._addToViewList} + */ + function _makeIndexRequestObject(requestIndex, index) { + return {indexRequested: requestIndex, index: index}; + } /** * @typedef {!$el: jQuery, getFile:function():!File, updateLayout:function(forceRefresh:boolean), destroy:function(), getScrollPos:function():?, adjustScrollPos:function(state:Object=, heightDelta:number)=, getViewState:function():?*=, restoreViewState:function(viewState:!*)=, notifyContainerChange:function()=, notifyVisibilityChange:function(boolean)=} View @@ -375,6 +386,69 @@ define(function (require, exports, module) { this._notifyCurrentViewChange(null, currentView); } }; + + /** + * moves a view from one pane to another + * @param {!File} file - the File to move + * @param {Pane} destinationPane - the destination pane + * @param {Number} destinationIndex - the working set index of the file in the destination pane + * @return {jQuery.Promise} a promise object which resolves after the view has been moved and its + * replacement document has been opened + * @private + */ + Pane.prototype.moveView = function (file, destinationPane, destinationIndex) { + var self = this, + openNextPromise = new $.Deferred(), + result = new $.Deferred(); + + if ((this.getCurrentlyViewedPath() === file.fullPath)) { + var nextFile = this.traverseViewListByMRU(1, file.fullPath); + if (nextFile) { + this._execOpenFile(nextFile.fullPath) + .fail(function () { + // the FILE_OPEN failed + self._hideCurrentView(); + }) + .always(function () { + openNextPromise.resolve(); + }); + } else { + this._hideCurrentView(); + openNextPromise.resolve(); + } + } else { + openNextPromise.resolve(); + } + + + openNextPromise.done(function () { + // Remove file from all 3 view lists + self._viewList.splice(self.findInViewList(file.fullPath), 1); + self._viewListMRUOrder.splice(self.findInViewListMRUOrder(file.fullPath), 1); + self._viewListAddedOrder.splice(self.findInViewListAddedOrder(file.fullPath), 1); + + // insert the view into the working set + destinationPane._addToViewList(file, _makeIndexRequestObject(true, destinationIndex)); + + //move the view, + var view = self._views[file.fullPath]; + + if (view) { + delete self._views[file.fullPath]; + destinationPane.addView(view, !destinationPane.getCurrentlyViewedFile()); + result.resolve(); + } else if (!destinationPane.getCurrentlyViewedFile()) { + // The view has not have been created and the pane was + // not showing anything so open the file moved in to the pane + destinationPane._execOpenFile(file.fullPath).always(function () { + result.resolve(); + }); + } else { + result.resolve(); + } + }); + return result.promise(); + }; /** * Merges the another Pane object's contents into this Pane @@ -595,7 +669,7 @@ define(function (require, exports, module) { Pane.prototype.addToViewList = function (file, index) { var indexRequested = (index !== undefined && index !== null && index >= 0 && index < this._viewList.length); - this._addToViewList(file, {indexRequested: indexRequested, index: index}); + this._addToViewList(file, _makeIndexRequestObject(indexRequested, index)); if (!indexRequested) { index = this._viewList.length - 1; @@ -717,6 +791,18 @@ define(function (require, exports, module) { this._viewList.sort(_.partial(compareFn, this.id)); }; + + /** + * moves a working set item from one index to another shifting the items + * after in the working set up and reinserting it at the desired location + * @param {!number} fromIndex - the index of the item to move + * @param {!number} toIndex - the index to move to + * @privaate + */ + Pane.prototype.moveWorkingSetItem = function (fromIndex, toIndex) { + this._viewList.splice(toIndex, 0, this._viewList.splice(fromIndex, 1)[0]); + }; + /** * Swaps two items in the file view list (used while dragging items in the working set view) * @param {number} index1 - the index of the first item to swap @@ -1026,7 +1112,7 @@ define(function (require, exports, module) { * @return {jQuery.promise} promise that will resolve when the file is opened */ Pane.prototype._execOpenFile = function (fullPath) { - return CommandManager.execute(Commands.FILE_OPEN, { fullPath: fullPath, paneId: this.id}); + return CommandManager.execute(Commands.CMD_ADD_TO_WORKINGSET_AND_OPEN, { fullPath: fullPath, paneId: this.id, options: {noPaneActivate: true}}); }; /** From ce9f3dc6d60243fdac1c740a2bb0f3184f6dd45f Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Mon, 29 Sep 2014 22:59:15 -0700 Subject: [PATCH 107/182] final wsv drag cleanup --- src/project/WorkingSetView.js | 27 ++++++++++----------------- src/view/MainViewManager.js | 4 +--- src/view/Pane.js | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 298e5d92f26..6cc409db545 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -53,7 +53,7 @@ define(function (require, exports, module) { * @type {Object.} */ var _views = {}; - + /** * Icon Providers * @see {@link WorkingSetView#addIconProvider()} @@ -97,7 +97,6 @@ define(function (require, exports, module) { BELOWVIEW = "belowview", ABOVEVIEW = "aboveview"; - /** * Refreshes all Pane View List Views */ @@ -134,7 +133,6 @@ define(function (require, exports, module) { ViewUtils.toggleClass($(listItem), "selected", shouldBeSelected); } - /** * Determines if a file is dirty * @private @@ -228,7 +226,6 @@ define(function (require, exports, module) { if (interval) { window.clearInterval(interval); interval = undefined; - //console.log("end-scroll"); } } @@ -247,7 +244,6 @@ define(function (require, exports, module) { interval = window.setInterval(function () { var scrollTop = $container.scrollTop(); if ((dir === -1 && scrollTop <= 0) || (dir === 1 && scrollTop >= maxScroll)) { - //console.log("hit end of scroll range"); endScroll($el); } else { $container.scrollTop(scrollTop + 7 * dir); @@ -360,7 +356,8 @@ define(function (require, exports, module) { pageY += itemHeight; } - // we're going to do this twice + // look one more time below the mouse + // if we didn't get a hit } while (!$item.length && ++lookCount < 2); // if we hit a span or an anchor tag and didn't @@ -371,9 +368,6 @@ define(function (require, exports, module) { $item = $hit.parents("#working-set-list-container li"); } - //console.log("actual: " + $hit[0].tagName + " " + $hit.attr("class")); - //console.log("hit: " + $hit[0].tagName + " " + $hit.attr("class")); - // compute ghost location, we compute the insertion point based // on where the ghost is, not where the mouse is gTop = $ghost.offset().top; @@ -391,9 +385,6 @@ define(function (require, exports, module) { (gBottom >= scrollerBottomArea.top && gBottom <= scrollerBottomArea.bottom)); - //console.log("lastY: " + lastPageY + " currentY " + e.pageY + " direction:" + (direction > 0 ? " down " : " up ")); - //console.log($item.length ? $item.text() : "no-hit-item"); - // helpers function mouseIsInTopHalf($elem) { var top = $elem.offset().top, @@ -441,6 +432,12 @@ define(function (require, exports, module) { ($hit.is("ul") && $hit.parent().is(".open-files-container"))); } + function targetIsNoDrop() { + return $hit.is(".working-set-header") || + $hit.is(".scroller-shadow") || + $hit.is(".scroller-shadow"); + } + function findViewFor($elem) { if ($elem.is(".working-set-view")) { return $elem; @@ -476,7 +473,7 @@ define(function (require, exports, module) { // where to go from here $view = $el.parents(".working-set-view"); - if ($hit.is(".working-set-header") || $hit.is(".scroller-shadow") || $hit.is(".scroller-shadow")) { + if (targetIsNoDrop()) { if (direction < 0) { if (ghostIsBelow($hit)) { return result; @@ -505,8 +502,6 @@ define(function (require, exports, module) { return result; } - // console.log($hit.attr("class")); - // Data to determine to help determine if we should // append to the previous or prepend to the next var $prev = $view.prev(), @@ -555,14 +550,12 @@ define(function (require, exports, module) { }; } - //console.log(e.pageY + " " + result.where + " " + (result.which ? result.which.text() : "")); return result; } // mouse move handler -- this pretty much does // the heavy lifting for dragging the item around $(window).on("mousemove.wsvdragging", function (e) { - //console.log("e.pageY " + e.pageY + " e.pageX " + e.pageX); // The drag function function drag(e) { if (!dragged) { diff --git a/src/view/MainViewManager.js b/src/view/MainViewManager.js index c245ce69742..3889ded1211 100644 --- a/src/view/MainViewManager.js +++ b/src/view/MainViewManager.js @@ -813,8 +813,7 @@ define(function (require, exports, module) { } return true; }); - }) - .always(function () { + $(exports).triggerHandler("workingSetMove", [file, sourcePane.id, destinationPane.id]); result.resolve(); }); @@ -859,7 +858,6 @@ define(function (require, exports, module) { }); } - /** * moves a working set item from one index to another shifting the items * after in the working set up and reinserting it at the desired location diff --git a/src/view/Pane.js b/src/view/Pane.js index 94f7b5ca38c..4959b803f94 100644 --- a/src/view/Pane.js +++ b/src/view/Pane.js @@ -401,6 +401,9 @@ define(function (require, exports, module) { openNextPromise = new $.Deferred(), result = new $.Deferred(); + // if we're moving the currently viewed file we + // need to open another file so wait for that operation + // to finish before we move the view if ((this.getCurrentlyViewedPath() === file.fullPath)) { var nextFile = this.traverseViewListByMRU(1, file.fullPath); if (nextFile) { @@ -420,7 +423,9 @@ define(function (require, exports, module) { openNextPromise.resolve(); } - + // Once the next file has opened, we can + // move the item in the working set and + // open it in the destination pane openNextPromise.done(function () { // Remove file from all 3 view lists self._viewList.splice(self.findInViewList(file.fullPath), 1); @@ -433,17 +438,25 @@ define(function (require, exports, module) { //move the view, var view = self._views[file.fullPath]; + // if we had a view, it had previously been opened + // otherwise, the file was in the working set unopened if (view) { + // delete it from the source pane's view map and add it to the destination pane's view map delete self._views[file.fullPath]; destinationPane.addView(view, !destinationPane.getCurrentlyViewedFile()); + // we're done result.resolve(); } else if (!destinationPane.getCurrentlyViewedFile()) { // The view has not have been created and the pane was // not showing anything so open the file moved in to the pane destinationPane._execOpenFile(file.fullPath).always(function () { + // wait until the file has been opened before + // we resolve the promise so the working set + // view can sync appropriately result.resolve(); }); } else { + // nothing to do, we're done result.resolve(); } }); @@ -790,7 +803,6 @@ define(function (require, exports, module) { Pane.prototype.sortViewList = function (compareFn) { this._viewList.sort(_.partial(compareFn, this.id)); }; - /** * moves a working set item from one index to another shifting the items From 5a2fc2c23c18b96e6984e11b52363d0fa174bea6 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 30 Sep 2014 10:16:47 -0400 Subject: [PATCH 108/182] Fix integration test failure. --- src/project/ProjectModel.js | 9 +++------ test/spec/ProjectModel-test.js | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index 5d25ab7e5fd..6c0aa157611 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -653,7 +653,8 @@ define(function (require, exports, module) { pathInProject = this.makeProjectRelativeIfPossible(path); if (path && !this._viewModel.isFilePathVisible(pathInProject)) { - return; + path = null; + pathInProject = null; } this.performRename(); @@ -928,10 +929,6 @@ define(function (require, exports, module) { this.createAtPath(newPath).done(function (entry) { viewModel.renameItem(oldProjectPath, newName); - if (!isFolder) { - self.selectInWorkingSet(newPath); - } - renameInfo.deferred.resolve(entry); }).fail(function (error) { self._viewModel.deleteAtPath(self.makeProjectRelativeIfPossible(renameInfo.path)); @@ -969,7 +966,7 @@ define(function (require, exports, module) { return doCreate(path, isFolder).done(function (entry) { if (!isFolder) { - self.setSelected(entry.fullPath); + self.selectInWorkingSet(entry.fullPath); } }).fail(function (error) { $(self).trigger(ERROR_CREATION, { diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index 86efa9fcf35..059e092abaa 100644 --- a/test/spec/ProjectModel-test.js +++ b/test/spec/ProjectModel-test.js @@ -481,14 +481,14 @@ define(function (require, exports, module) { it("won't select a file that is not visible", function () { model.setSelected("/foo/subdir2/bar.js"); expect(changesFired).toBe(0); - expect(model._selections.selected).toBeUndefined(); + expect(model._selections.selected).toBeNull(); }); - it("will maintain the previously selected file when selecting one that's not visible", function () { + it("will clear the selected file when selecting one that's not visible", function () { model.setSelected("/foo/subdir1/afile.js"); model.setSelected("/foo/subdir2/bar.js"); - expect(vm._treeData.getIn(["subdir1", "children", "afile.js", "selected"])).toBe(true); - expect(model._selections.selected).toBe("/foo/subdir1/afile.js"); + expect(vm._treeData.getIn(["subdir1", "children", "afile.js", "selected"])).toBeUndefined(); + expect(model._selections.selected).toBeNull(); }); it("can accept a filesystem object", function () { @@ -792,10 +792,14 @@ define(function (require, exports, module) { expect(vm._treeData.getIn(["subdir1", "children", "newfile.js", "creating"])).toBeUndefined(); expect(vm._treeData.getIn(["subdir1", "children", "newfile.js", "rename"])).toBeUndefined(); expect(model._selections.rename).toBeUndefined(); - expect(selectionEvents).toEqual([{ - path: "/foo/subdir1/newfile.js", - add: true - }]); + + // The selectionEvent now comes from createAtPath which we have mocked out. + // We can restore this check once we have chosen a way to hook into RequireJS + // loading. +// expect(selectionEvents).toEqual([{ +// path: "/foo/subdir1/newfile.js", +// add: true +// }]); }); it("should create a directory but not open it", function () { From 55d1a98acf867542e3b44881d27d25ad472ccb4f Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 30 Sep 2014 10:44:24 -0400 Subject: [PATCH 109/182] Finish file tree renaming on blur Fix for #9364 and #9370. --- src/project/FileTreeView.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 7411ca12958..c9c66c94453 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -113,6 +113,13 @@ define(function (require, exports, module) { */ handleKeyUp: function () { this.props.actions.setRenameValue(this.refs.name.getDOMNode().value.trim()); + }, + + /** + * If we leave the field for any reason, complete the rename. + */ + handleBlur: function () { + this.props.actions.performRename(); } }; @@ -168,6 +175,7 @@ define(function (require, exports, module) { autoFocus: true, onKeyDown: this.handleKeyDown, onKeyUp: this.handleKeyUp, + onBlur: this.handleBlur, style: { width: width }, @@ -521,6 +529,7 @@ define(function (require, exports, module) { autoFocus: true, onKeyDown: this.handleKeyDown, onKeyUp: this.handleKeyUp, + onBlur: this.handleBlur, ref: "name", style: { width: width From 017c4645fdf0f4ad88fbc3d2dce5452e79f6990a Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Tue, 30 Sep 2014 08:07:06 -0700 Subject: [PATCH 110/182] fix typos --- src/styles/brackets_variables.less | 2 +- src/view/MainViewManager.js | 2 +- src/view/Pane.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/brackets_variables.less b/src/styles/brackets_variables.less index a938ca2771f..1ac2ad1ab62 100644 --- a/src/styles/brackets_variables.less +++ b/src/styles/brackets_variables.less @@ -55,7 +55,7 @@ @z-index-brackets-resizer-div: (@z-index-brackets-sidebar-resizer + 1); @z-index-brackets-panel-resizer: (@z-index-brackets-ui + 2); -@z-index-brackets-drag-ghost: 999; +@z-index-brackets-drag-ghost: 999; @z-index-brackets-context-menu-base: 1000; @z-index-brackets-stylesheet-menu: 1000; @z-index-brackets-inline-editor-error: 1000; diff --git a/src/view/MainViewManager.js b/src/view/MainViewManager.js index 3889ded1211..ab45f4870c5 100644 --- a/src/view/MainViewManager.js +++ b/src/view/MainViewManager.js @@ -864,7 +864,7 @@ define(function (require, exports, module) { * @param {!string} paneId - id of the pane to sort * @param {!number} fromIndex - the index of the item to move * @param {!number} toIndex - the index to move to - * @privaate + * @private */ function _moveWorkingSetItem(paneId, fromIndex, toIndex) { var pane = _getPane(paneId); diff --git a/src/view/Pane.js b/src/view/Pane.js index 4959b803f94..60c854cc37a 100644 --- a/src/view/Pane.js +++ b/src/view/Pane.js @@ -809,7 +809,7 @@ define(function (require, exports, module) { * after in the working set up and reinserting it at the desired location * @param {!number} fromIndex - the index of the item to move * @param {!number} toIndex - the index to move to - * @privaate + * @private */ Pane.prototype.moveWorkingSetItem = function (fromIndex, toIndex) { this._viewList.splice(toIndex, 0, this._viewList.splice(fromIndex, 1)[0]); From 3985316ee8c92c439daa51a1d1fd94e560b1f78c Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Mon, 29 Sep 2014 14:29:48 +0200 Subject: [PATCH 111/182] Fix Sidebar Gap --- src/styles/brackets.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 0a32dfeaad3..0796a12e87c 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -773,7 +773,7 @@ a, img { } #sidebar { - position: relative; + position: absolute; white-space: nowrap; } From 5185468ddd9e4018c0799e7a5dec24e340a0f7ba Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 30 Sep 2014 10:03:49 -0700 Subject: [PATCH 112/182] Fix endless horizontal scrolling in the tree. Fix for #9327. --- src/project/FileTreeView.js | 14 +++++++++++--- src/project/FileTreeViewModel.js | 4 +++- src/project/ProjectManager.js | 2 +- src/project/ProjectModel.js | 5 +++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 7411ca12958..5a63f4b0777 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -776,13 +776,21 @@ define(function (require, exports, module) { }, render: function () { - var selectionViewInfo = this.props.selectionViewInfo; + var selectionViewInfo = this.props.selectionViewInfo, + left = selectionViewInfo.get("scrollLeft"), + width = selectionViewInfo.get("width") - this.props.widthAdjustment, + scrollWidth = selectionViewInfo.get("scrollWidth"); + + // Avoid endless horizontal scrolling + if (left + width > scrollWidth) { + left = scrollWidth - width; + } return DOM.div({ style: { overflow: "auto", - left: selectionViewInfo.get("scrollLeft"), - width: selectionViewInfo.get("width") - this.props.widthAdjustment, + left: left, + width: width, display: this.props.visible ? "block" : "none" }, className: this.props.className diff --git a/src/project/FileTreeViewModel.js b/src/project/FileTreeViewModel.js index f426fc99d9c..319f18d954c 100644 --- a/src/project/FileTreeViewModel.js +++ b/src/project/FileTreeViewModel.js @@ -1103,11 +1103,13 @@ define(function (require, exports, module) { * SPECIAL CASE NOTE: this does not trigger a change event because this data is * explicitly set in the rendering process (see ProjectManager._renderTree). * + * @param {int} scrollWidth width of the tree content * @param {int} scrollTop Scroll position * @param {int=} scrollLeft Horizontal scroll position * @param {int=} offsetTop top of the scroller */ - FileTreeViewModel.prototype.setSelectionScrollerInfo = function (scrollTop, scrollLeft, offsetTop) { + FileTreeViewModel.prototype.setSelectionScrollerInfo = function (scrollWidth, scrollTop, scrollLeft, offsetTop) { + this._selectionViewInfo = this._selectionViewInfo.set("scrollWidth", scrollWidth); this._selectionViewInfo = this._selectionViewInfo.set("scrollTop", scrollTop); if (scrollLeft !== undefined) { diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 9cc30f1fe14..2f8b517e475 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -627,7 +627,7 @@ define(function (require, exports, module) { if (!projectRoot) { return; } - model.setScrollerInfo($projectTreeContainer.scrollTop(), $projectTreeContainer.scrollLeft(), $projectTreeContainer.offset().top); + model.setScrollerInfo($projectTreeContainer[0].scrollWidth, $projectTreeContainer.scrollTop(), $projectTreeContainer.scrollLeft(), $projectTreeContainer.offset().top); FileTreeView.render(fileTreeViewContainer, model._viewModel, projectRoot, actionCreator, forceRender, brackets.platform); }; diff --git a/src/project/ProjectModel.js b/src/project/ProjectModel.js index 6c0aa157611..517f35d98ae 100644 --- a/src/project/ProjectModel.js +++ b/src/project/ProjectModel.js @@ -306,12 +306,13 @@ define(function (require, exports, module) { /** * Tracks the scroller position. * + * @param {int} scrollWidth Width of the tree container * @param {int} scrollTop Top of scroll position * @param {int} scrollLeft Left of scroll position * @param {int} offsetTop Top of scroller element */ - ProjectModel.prototype.setScrollerInfo = function (scrollTop, scrollLeft, offsetTop) { - this._viewModel.setSelectionScrollerInfo(scrollTop, scrollLeft, offsetTop); + ProjectModel.prototype.setScrollerInfo = function (scrollWidth, scrollTop, scrollLeft, offsetTop) { + this._viewModel.setSelectionScrollerInfo(scrollWidth, scrollTop, scrollLeft, offsetTop); }; /** From 940f1e166665ce283ee06075b4d8ac228491fa65 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Tue, 30 Sep 2014 11:13:40 -0700 Subject: [PATCH 113/182] better oranization of fallback path checking --- src/project/ProjectManager.js | 54 ++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index d563cf70bd6..533b92fb034 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -682,15 +682,47 @@ define(function (require, exports, module) { } /** - * Get previous project from MRU list, or Getting Started folder if no previous projects. - * @return {string} + * After failing to load a project, this function determines which project path to fallback to. + * @return {$.Promise} Promise that resolves to a project path {string} */ - function _getPreviousProjectPath() { - var recentProjects = PreferencesManager.getViewState("recentProjects"); + function _getFallbackProjectPath() { + var fallbackPaths = [], + recentProjects = PreferencesManager.getViewState("recentProjects"), + deferred = new $.Deferred(); + + // Build ordered fallback path array if (recentProjects && recentProjects.length > 0) { - return recentProjects[0]; + // Start with MRU project + fallbackPaths.push(recentProjects[0]); } - return _getWelcomeProjectPath(); + + // Next is Getting Started project + fallbackPaths.push(_getWelcomeProjectPath()); + + function checkNextPath() { + var nextPath, fileEntry; + + if (fallbackPaths.length === 0) { + // Last resort is Brackets source folder which is guaranteed to exist + deferred.resolve(FileUtils.getNativeBracketsDirectoryPath()); + } else { + // Check next path and resolve if it exists, otherwise continue + nextPath = fallbackPaths.shift(); + fileEntry = FileSystem.getDirectoryForPath(nextPath); + fileEntry.exists(function (err, exists) { + if (!err && exists) { + deferred.resolve(nextPath); + } else { + checkNextPath(); + } + }); + } + } + + // Recursively & asynchronously check paths for existence + checkNextPath(); + + return deferred.promise(); } /** @@ -882,14 +914,8 @@ define(function (require, exports, module) { // project directory. // TODO (issue #267): When Brackets supports having no project directory // defined this code will need to change - var fallbackPath = _getPreviousProjectPath(); - rootEntry = FileSystem.getDirectoryForPath(fallbackPath); - rootEntry.exists(function (err, exists) { - if (!exists) { - // In case user has deleted Getting Started folder - fallbackPath = FileUtils.getNativeBracketsDirectoryPath(); - } - _loadProject(fallbackPath).always(function () { + _getFallbackProjectPath().done(function (path) { + _loadProject(path).always(function () { // Make sure not to reject the original deferred until the fallback // project is loaded, so we don't violate expectations that there is always // a current project before continuing after _loadProject(). From 691aedfa922605f624c7f40d6c8d3151e44c0f8e Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Tue, 30 Sep 2014 12:39:56 -0700 Subject: [PATCH 114/182] use second most recent project --- src/project/ProjectManager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 533b92fb034..bce1519007a 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -691,9 +691,9 @@ define(function (require, exports, module) { deferred = new $.Deferred(); // Build ordered fallback path array - if (recentProjects && recentProjects.length > 0) { - // Start with MRU project - fallbackPaths.push(recentProjects[0]); + if (recentProjects && recentProjects.length > 1) { + // *Most* recent project is the one that just failed to load, so use second most recent + fallbackPaths.push(recentProjects[1]); } // Next is Getting Started project From db383a1f886e3b5d1d0ca9a4d85d9f60e0438df1 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 30 Sep 2014 17:29:45 -0400 Subject: [PATCH 115/182] Change the directory DOM to match what's expected with the current CSS on rename. --- src/project/FileTreeView.js | 4 ++-- src/styles/jsTreeTheme.less | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js index 20b871edb17..08d6550a5fd 100644 --- a/src/project/FileTreeView.js +++ b/src/project/FileTreeView.js @@ -688,9 +688,9 @@ define(function (require, exports, module) { DOM.ins({ className: "jstree-icon" }, " "), + renameInput, nameDisplay, - childNodes, - renameInput); + childNodes); } }); diff --git a/src/styles/jsTreeTheme.less b/src/styles/jsTreeTheme.less index 10fc0507e8a..e6f583b019e 100644 --- a/src/styles/jsTreeTheme.less +++ b/src/styles/jsTreeTheme.less @@ -32,14 +32,6 @@ .jstree > ul > li { margin-left:0px; } .jstree-rtl > ul > li { margin-right:0px; } .jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } -.jstree a { - white-space: nowrap; - text-decoration: none; - padding: 1px 2px; - margin: 0; - line-height: 16px; - height: 16px; -} .jstree a:focus { outline: none; } .jstree a > ins { height:16px; width:16px; } .jstree a > .jstree-icon { margin-right:3px; } From 8c83e6ecd73c4ffe5b133d478775d4bac7ae766f Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Tue, 30 Sep 2014 16:47:27 -0700 Subject: [PATCH 116/182] exclude the header title as a drop target --- src/project/WorkingSetView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 6cc409db545..92453809aff 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -434,6 +434,7 @@ define(function (require, exports, module) { function targetIsNoDrop() { return $hit.is(".working-set-header") || + $hit.is(".working-set-header-title") || $hit.is(".scroller-shadow") || $hit.is(".scroller-shadow"); } From 0657a0494c6c34aa936b28003cc692123b3e45c3 Mon Sep 17 00:00:00 2001 From: Mohammad Yaghobi Date: Wed, 1 Oct 2014 12:30:30 +0330 Subject: [PATCH 117/182] Update Persian string --- src/nls/fa-ir/strings.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index 9ab27b198b0..a3ae8f8f0a8 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -222,6 +222,13 @@ define({ "BOTTOM" : "پایین", "LEFT" : "چپ", "RIGHT" : "راست", + "CMD_SPLITVIEW_NONE" : "بدون دوبخشی سازی", + "CMD_SPLITVIEW_VERTICAL" : "دوبخشی کردن عمودی", + "CMD_SPLITVIEW_HORIZONTAL" : "دوبخشی کردن افقی", + "SPLITVIEW_MENU_TOOLTIP" : "دوبخشی کردن صفحه(تقسیم صفحه به دو قسمت مجزا)", + "GEAR_MENU_TOOLTIP" : "پیکربندی پرونده های کاری", + "SPLITVIEW_INFO_TITLE" : "هم اکنون باز است", + "SPLITVIEW_MULTIPANE_WARNING" : "این پرونده هم اکنون در پنجره ای دیگر باز شده است. {APP_NAME} بزودی باز کردن همان پرونده در سایر پنجره ها را پشتیبانی خواهد نمود. تا آن زمان پرونده ها تنها در پنجره ای که باز شده اند نمایش داده خواند شد.

      (این پیغام تنها یک بار مشاهده خواهد شد.)", /** * Keyboard modifier names @@ -378,7 +385,7 @@ define({ "CMD_NEXT_DOC" : "سند بعدی", "CMD_PREV_DOC" : "سند قبلی", "CMD_SHOW_IN_TREE" : "نمایش پرونده در میان پرونده های کاری", - "CMD_SHOW_IN_EXPLORER" : "نمایش در مرورگر", + "CMD_SHOW_IN_EXPLORER" : "نمایش در پیمایشگر پرونده", "CMD_SHOW_IN_FINDER" : "نمایش در جستجوگر", "CMD_SHOW_IN_OS" : "نمایش در OS", @@ -405,7 +412,7 @@ define({ "RELAUNCH_CHROME" : "اجرای دوباره Chrome", "ABOUT" : "پیرامون", "CLOSE" : "بستن", - "ABOUT_TEXT_LINE1" : "پیش روی {VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_LINE1" : "انتشار {VERSION_MINOR} {BUILD_TYPE} {VERSION}", "ABOUT_TEXT_BUILD_TIMESTAMP" : "build timestamp: ", "ABOUT_TEXT_LINE3" : "
      یادداشتهای ها، شرایط و ضوابط مربوط به نرم افزار و حقوق شخص ثالث در آدرسhttp://www.adobe.com/go/thirdparty/ جهت تلفیق و بعنوان مرجع قرار داده شده.", "ABOUT_TEXT_LINE4" : "اسناد، نکات و منابع نرم افزار در پیوند https://github.com/adobe/brackets/ در دسترس می باشد. می توانید جهت مشاهده سریع بروزرسانی های قبل از انتشار نرم افزار بهمین لینک مراجعه فرمایید.
      ترجمه توسط محمد یعقوبی", @@ -586,7 +593,7 @@ define({ "CMD_SHOW_PARAMETER_HINT" : "نمایش پارامتر", "NO_ARGUMENTS" : "<بدون پارامتر>", "DETECTED_EXCLUSION_TITLE" : "خطای منطقی در پرونده JavaScript", - "DETECTED_EXCLUSION_INFO" : "براکتس در حال انجام یک پردازه خطادار می باشد:

      {0}

      This file will no longer be processed for code hints and jump to definition. To turn this back on, open .brackets.json in your project and remove the file from jscodehints.detectedExclusions.", + "DETECTED_EXCLUSION_INFO" : "براکتس درحال انجام یک پردازش مشکل دار با پرونده {0} است.

      این پرونده اشاره گرهای کدها را بطور کامل نشان نخواهد داد, برای این منظور میتوانید از حالت تعریف یا ویرایش سریع استفاده نمایید. جهت فعال سازی دوباره این پرونده, .brackets.json را در پروژه خود باز کنید و jscodehints.detectedExclusions را ویرایش نمایید.

      این مشکل میتواند یک Bug در براکتس باشد. اگر مشکلی در ارائه این پرونده به ما ندارید, لطفا گزارش پرونده دارای Bug را با یک لینک به پرونده جهت برسی ثبت نمایید.", // extensions/default/JSLint "JSLINT_NAME" : "JSLint", @@ -601,4 +608,4 @@ define({ "DOCS_MORE_LINK" : "بیشتر" }); -/* Last translated for 6d4de6a8e699b63ee40a06f9252c00c44b64eb19 */ +/* Last translated for 91b392bf349ece5058595b26a11c651697ee7ff6 */ From c78541cd7fcb5c70eeabc0fe3ca558e87b4c7274 Mon Sep 17 00:00:00 2001 From: Jackson Cleary Date: Thu, 2 Oct 2014 00:22:30 +1000 Subject: [PATCH 118/182] Issue #8557- fixed to show correct result count --- src/search/FindInFiles.js | 4 +++- src/search/SearchModel.js | 15 +++++++++++++-- src/search/SearchResultsView.js | 11 ++++++----- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js index 7cdb28f894c..f12a7c8c301 100644 --- a/src/search/FindInFiles.js +++ b/src/search/FindInFiles.js @@ -127,7 +127,9 @@ define(function (require, exports, module) { // We have the max hits in just this 1 file. Stop searching this file. // This fixed issue #1829 where code hangs on too many hits. - if (matches.length >= SearchModel.MAX_TOTAL_RESULTS) { + // ** Adds one over MAX_TOTAL_RESULTS in order to know if the search has exceeded + // or is equal to MAX_TOTAL_RESULTS. Additional result removed in SearchModel ** + if (matches.length > SearchModel.MAX_TOTAL_RESULTS) { queryExpr.lastIndex = 0; break; } diff --git a/src/search/SearchModel.js b/src/search/SearchModel.js index bd35ed14bde..617503bac20 100644 --- a/src/search/SearchModel.js +++ b/src/search/SearchModel.js @@ -99,10 +99,13 @@ define(function (require, exports, module) { * @type {boolean} */ SearchModel.prototype.foundMaximum = false; - + /** - * Clears out the model to an empty state. + * Whether or not we exceeded the maximum number of results in the search we did. + * @type {boolean} */ + SearchModel.prototype.exceedsMaximum = false; + SearchModel.prototype.clear = function () { this.results = {}; this.queryInfo = null; @@ -112,6 +115,7 @@ define(function (require, exports, module) { this.scope = null; this.numMatches = 0; this.foundMaximum = false; + this.exceedsMaximum = false; this.fireChanged(); }; @@ -157,6 +161,13 @@ define(function (require, exports, module) { this.numMatches += resultInfo.matches.length; if (this.numMatches >= SearchModel.MAX_TOTAL_RESULTS) { this.foundMaximum = true; + + // Remove final result if there have been over MAX_TOTAL_RESULTS found + if (this.numMatches > SearchModel.MAX_TOTAL_RESULTS) { + this.results[fullpath].matches.pop(); + this.numMatches--; + this.exceedsMaximum = true; + } } }; diff --git a/src/search/SearchResultsView.js b/src/search/SearchResultsView.js index eb306577be4..4c0438f3ecc 100644 --- a/src/search/SearchResultsView.js +++ b/src/search/SearchResultsView.js @@ -28,7 +28,7 @@ */ define(function (require, exports, module) { "use strict"; - + var CommandManager = require("command/CommandManager"), Commands = require("command/Commands"), DocumentManager = require("document/DocumentManager"), @@ -38,15 +38,16 @@ define(function (require, exports, module) { FileUtils = require("file/FileUtils"), FindUtils = require("search/FindUtils"), WorkspaceManager = require("view/WorkspaceManager"), + SearchModel = require("search/SearchModel").SearchModel, StringUtils = require("utils/StringUtils"), Strings = require("strings"), _ = require("thirdparty/lodash"), - + searchPanelTemplate = require("text!htmlContent/search-panel.html"), searchResultsTemplate = require("text!htmlContent/search-results.html"), searchSummaryTemplate = require("text!htmlContent/search-summary.html"); - - + + /** * @const * The maximum results to show per page. @@ -348,7 +349,7 @@ define(function (require, exports, module) { // This text contains some formatting, so all the strings are assumed to be already escaped summary = StringUtils.format( Strings.FIND_TITLE_SUMMARY, - this._model.foundMaximum ? Strings.FIND_IN_FILES_MORE_THAN : "", + this._model.exceedsMaximum ? Strings.FIND_IN_FILES_MORE_THAN : "", String(count.matches), (count.matches > 1) ? Strings.FIND_IN_FILES_MATCHES : Strings.FIND_IN_FILES_MATCH, filesStr From 5eaaee8e966e825c010ddd33ea836825e381bac2 Mon Sep 17 00:00:00 2001 From: Jackson Cleary Date: Thu, 2 Oct 2014 00:32:44 +1000 Subject: [PATCH 119/182] Removed unused reference to SearchModel --- src/search/SearchResultsView.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/search/SearchResultsView.js b/src/search/SearchResultsView.js index 4c0438f3ecc..c938a5be67e 100644 --- a/src/search/SearchResultsView.js +++ b/src/search/SearchResultsView.js @@ -38,7 +38,6 @@ define(function (require, exports, module) { FileUtils = require("file/FileUtils"), FindUtils = require("search/FindUtils"), WorkspaceManager = require("view/WorkspaceManager"), - SearchModel = require("search/SearchModel").SearchModel, StringUtils = require("utils/StringUtils"), Strings = require("strings"), _ = require("thirdparty/lodash"), From ab38884a49e5412bb7dd20ca8d868480e790a691 Mon Sep 17 00:00:00 2001 From: valtlait Date: Wed, 1 Oct 2014 21:44:00 +0300 Subject: [PATCH 120/182] Finnish translation update (release 0.44) [2]* --- src/nls/fi/strings.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/nls/fi/strings.js b/src/nls/fi/strings.js index 40571cb41ef..197bbe12c27 100644 --- a/src/nls/fi/strings.js +++ b/src/nls/fi/strings.js @@ -73,6 +73,7 @@ define({ "ENTRY_WITH_SAME_NAME_EXISTS" : "Tiedosto tai hakemisto nimellä {0} on jo olemassa.", "ERROR_CREATING_FILE_TITLE" : "Virhe luotaessa {0}a", "ERROR_CREATING_FILE" : "Virhe yritettäessä luoda {0}a {1}. {2}", + "ERROR_MIXED_DRAGDROP" : "Kansiota ei voi avata samaan aikaan muiden tiedostojen kanssa.", // Application preferences corrupt error strings "ERROR_PREFS_CORRUPT_TITLE" : "Virhe luettaessa asetuksia", @@ -222,8 +223,8 @@ define({ "WORKING_FILES" : "Työtiedostot", /** - * MainViewManager - */ + * MainViewManager + */ "TOP" : "Ylä", "BOTTOM" : "Ala", "LEFT" : "Vasen", @@ -235,6 +236,9 @@ define({ "SPLITVIEW_MENU_TOOLTIP" : "Jaa muokkain pysty- tai vaakasuuntaisesti", "GEAR_MENU_TOOLTIP" : "Määritä työlista", + "SPLITVIEW_INFO_TITLE" : "Jo avoinna", + "SPLITVIEW_MULTIPANE_WARNING" : "Tiedosto on jo avattuna toisessa ruudussa. {APP_NAME} tukee pian saman tiedoston avaamista useammassa kuin yhdessä ruudussa. Siihen asti tiedosto näytetään ruudussa, jossa se on jo auki.

      (Näet tämän viestin vain kerran.)", + /** * Keyboard modifier names */ @@ -262,7 +266,7 @@ define({ "STATUSBAR_USER_EXTENSIONS_DISABLED" : "Laajennukset poistettu käytöstä", "STATUSBAR_INSERT" : "INS", "STATUSBAR_OVERWRITE" : "OVR", - "STATUSBAR_INSOVR_TOOLTIP" : "Vaihda kohdistimen sijoitus- (INS) ja korvaus (OVR) \u2011tilojen välillä napsauttamalla", + "STATUSBAR_INSOVR_TOOLTIP" : "Vaihda kohdistimen sijoitus (INS)- ja korvaus (OVR) \u2011tilojen välillä napsauttamalla", "STATUSBAR_LANG_TOOLTIP" : "Vaihda tiedostotyyppiä napsauttamalla", "STATUSBAR_CODE_INSPECTION_TOOLTIP" : "{0}. Näytä tai piilota raporttipaneeli napsauttamalla.", "STATUSBAR_DEFAULT_LANG" : "(oletus)", @@ -430,13 +434,13 @@ define({ "GET_IT_NOW" : "Hae nyt!", "PROJECT_SETTINGS_TITLE" : "Projektin asetukset kohteelle: {0}", "PROJECT_SETTING_BASE_URL" : "Esikatselun URL-osoite", - "PROJECT_SETTING_BASE_URL_HINT" : "Käyttääksesi paikallista palvelinta anna url, kuten http://localhost:8000/", + "PROJECT_SETTING_BASE_URL_HINT" : "Käytä paikal. palvelinta antamalla url, kuten http://localhost:8000/", "BASEURL_ERROR_INVALID_PROTOCOL" : "Esikatselu ei tue {0}-protokollaa. Käytä joko http: tai https: .", "BASEURL_ERROR_SEARCH_DISALLOWED" : "URL-osoite ei voi sisältää hakuparametreja, kuten ”{0}”.", "BASEURL_ERROR_HASH_DISALLOWED" : "URL-osoite ei voi sisältää ristikkomerkkejä, kuten ”{0}”.", "BASEURL_ERROR_INVALID_CHAR" : "Erikoismerkkkien, kuten ’{0}’, täytyy olla %-koodattu.", "BASEURL_ERROR_UNKNOWN_ERROR" : "Tuntematon virhe URL-osoitteen jäsentämisessä", - "EMPTY_VIEW_HEADER" : "Valitse tiedosto tämän näkymän ollessa aktiivinen", + "EMPTY_VIEW_HEADER" : "Avaa tiedosto tämän näkymän ollessa valittuna", // Strings for themes-settings.html and themes-general.html "CURRENT_THEME" : "Nykyinen teema", @@ -595,7 +599,7 @@ define({ "CMD_SHOW_PARAMETER_HINT" : "Näytä parametrivihje", "NO_ARGUMENTS" : "", "DETECTED_EXCLUSION_TITLE" : "JavaScript-tiedoston päättelyongelma", - "DETECTED_EXCLUSION_INFO" : "Brackets ajautui vaikeuksiin käsittelyssä:

      {0}

      Tätä tiedostoa ei enää käsitellä koodivihjeet- ja hypää määritelyyn -toimintoja varten. Ottaaksesi tämän takaisin käyttöön avaa .brackets.json projektissasi ja poista tiedosto kohdasta jscodehints.detectedExclusions.", + "DETECTED_EXCLUSION_INFO" : "Brackets kohtasi vaikeuksia tiedoston {0} käsittelyssä.

      Tätä tiedostoa ei enää käsitellä koodivihjeet-, hyppää määrittelyyn- ja pikamuokkaus-toimintoja varten. Ota tämä tiedosto uudelleen käyttöön avaamalla projektisi tiedosto .brackets.json ja muokkaa kohtaa jscodehints.detectedExclusions.

      Tämä on todennäköisesti Bracketsin bugi. Jos voit tarjota kopion tästä tiedostosta, ilmoitathan virheestä tässä nimettyyn tiedostoon osoittavan linkin kanssa.", // extensions/default/JSLint "JSLINT_NAME" : "JSLint", @@ -610,4 +614,4 @@ define({ "DOCS_MORE_LINK" : "Lue lisää" }); -/* Last translated for 69130cde282c13d7fd94759ce756bf8eb654ba1e */ +/* Last translated for 91b392bf349ece5058595b26a11c651697ee7ff6 */ From 09e4ec1b3b10ee8a870f7c50bc90fceb4f95f9de Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 1 Oct 2014 15:52:54 -0400 Subject: [PATCH 121/182] Update NOTICE with licenses for React and Immutable-JS --- NOTICE | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/NOTICE b/NOTICE index 89a411c53fa..c8067c3a2a4 100644 --- a/NOTICE +++ b/NOTICE @@ -458,6 +458,34 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Copyright 2013-2014 Facebook, Inc. +This product includes software licensed under the Apache License, Version 2.0 +http://www.apache.org/licenses/LICENSE-2.0. + +BSD License +For Immutable JS software +Copyright (c) 2014, Facebook, Inc. All rights reserved. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: +* Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. +* Neither the name Facebook nor the names of its contributors may be used to +endorse or promote products derived from this software without specific +prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Timothy Farrell Copyright (c) 2010 Timothy Farrell Permission is hereby granted, free of charge, to any person obtaining a copy of this From 24bc8d461919c7b25bae4a6ea48dbfec7be9c293 Mon Sep 17 00:00:00 2001 From: Jason San Jose Date: Wed, 1 Oct 2014 14:50:33 -0700 Subject: [PATCH 122/182] loosen restrictions on about:blank --- src/brackets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/brackets.js b/src/brackets.js index 62b1c3f1e5e..094e3902f94 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -447,7 +447,7 @@ define(function (require, exports, module) { var real_windowOpen = window.open; window.open = function (url) { // Allow file:// URLs, relative URLs (implicitly file: also), and about:blank - if (!url.match(/^file:\/\//) && url !== "about:blank" && url.indexOf(":") !== -1) { + if (!url.match(/^file:\/\//) && !url.match(/^about:blank/) && url.indexOf(":") !== -1) { throw new Error("Brackets-shell is not a secure general purpose web browser. Use NativeApp.openURLInDefaultBrowser() to open URLs in the user's main browser"); } return real_windowOpen.apply(window, arguments); From 46e901c60730816d6a80daa6f71ca0beb817ec1a Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Wed, 1 Oct 2014 15:39:57 -0700 Subject: [PATCH 123/182] - update to release 0.45 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 25acce13497..78e3b7c32c8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Brackets", - "version": "0.44.0-0", - "apiVersion": "0.44.0", + "version": "0.45.0-0", + "apiVersion": "0.45.0", "homepage": "http://brackets.io", "issues": { "url": "http://github.com/adobe/brackets/issues" From a35ff0654156ee74262a6a682cb927ecf25c27c3 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Wed, 1 Oct 2014 17:27:23 -0700 Subject: [PATCH 124/182] lint and deprecation fix --- src/document/DocumentManager.js | 38 ++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index af108ccab92..b44361af66f 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -223,34 +223,37 @@ define(function (require, exports, module) { /** + * closes a list of files + * @deprecated Use CommandManager.execute(Commands.FILE_CLOSE_LIST) instead + * @param {!Array.} list - list of File objectgs to close */ function removeListFromWorkingSet(list) { - throw new Error("removeListFromWorkingSet() has been deprecated. Use Command.FILE_CLOSE_LIST instead."); + DeprecationWarning.deprecationWarning("Use CommandManager.execute(Commands.FILE_CLOSE_LIST, {PaneId: MainViewManager.ALL_PANES, fileList: list}) instead of DocumentManager.removeListFromWorkingSet()", true); + CommandManager.execute(Commands.FILE_CLOSE_LIST, {PaneId: MainViewManager.ALL_PANES, fileList: list}); } /** * closes all open files - * @deprecated Use MainViewManager._closeAll() instead - * Calling this discards any unsaved changes, so the UI should confirm with the user before calling this. + * @deprecated CommandManager.execute(Commands.FILE_CLOSE_ALL) instead */ function closeAll() { - DeprecationWarning.deprecationWarning("Use MainViewManager._closeAll() instead of DocumentManager.closeAll()", true); + DeprecationWarning.deprecationWarning("Use CommandManager.execute(Commands.FILE_CLOSE_ALL,{PaneId: MainViewManager.ALL_PANES}) instead of DocumentManager.closeAll()", true); CommandManager.execute(Commands.FILE_CLOSE_ALL, {PaneId: MainViewManager.ALL_PANES}); } /** * closes the specified file file - * @deprecated use MainViewManager._close() instead - * @param {!File} file + * @deprecated use CommandManager.execute(Commands.FILE_CLOSE, {File: file}) instead + * @param {!File} file - the file to close */ function closeFullEditor(file) { - DeprecationWarning.deprecationWarning("Use MainViewManager._close() instead of DocumentManager.closeFullEditor()", true); + DeprecationWarning.deprecationWarning("Use CommandManager.execute(Commands.FILE_CLOSE, {File: file} instead of DocumentManager.closeFullEditor()", true); CommandManager.execute(Commands.FILE_CLOSE, {File: file}); } /** * opens the specified document for editing in the currently active pane - * @deprecated use MainViewManager._edit() instead + * @deprecated use CommandManager.execute(Commands.CMD_OPEN, {fullPath: doc.file.fullPath}) instead * @param {!Document} document The Document to make current. */ function setCurrentDocument(doc) { @@ -464,10 +467,12 @@ define(function (require, exports, module) { * FUTURE: Instead of an explicit notify, we should eventually listen for deletion events on some * sort of "project file model," making this just a private event handler. * + * NOTE: This function is not for general consumption, is considered private and may be deprecated + * without warning in a future release. + * * @param {!File} file - * @param {boolean} skipAutoSelect - if true, don't automatically open/select the next document */ - function notifyFileDeleted(file, skipAutoSelect) { + function notifyFileDeleted(file) { // Notify all editors to close as well $(exports).triggerHandler("pathDeleted", file.fullPath); @@ -502,11 +507,10 @@ define(function (require, exports, module) { * * @param {string} oldName The old name of the file/folder * @param {string} newName The new name of the file/folder - * @param {boolean} isFolder True if path is a folder; False if it is a file. */ - function notifyPathNameChanged(oldName, newName, isFolder) { + function notifyPathNameChanged(oldName, newName) { // Notify all open documents - _.forEach(_openDocuments, function (doc, id) { + _.forEach(_openDocuments, function (doc) { // TODO: Only notify affected documents? For now _notifyFilePathChange // just updates the language if the extension changed, so it's fine // to call for all open docs. @@ -522,8 +526,8 @@ define(function (require, exports, module) { * @private * Update document */ - function _handleLanguageAdded(event, language) { - _.forEach(_openDocuments, function (doc, key) { + function _handleLanguageAdded() { + _.forEach(_openDocuments, function (doc) { // No need to look at the new language if this document has one already if (doc.getLanguage().isFallbackLanguage()) { doc._updateLanguage(); @@ -536,7 +540,7 @@ define(function (require, exports, module) { * Update document */ function _handleLanguageModified(event, language) { - _.forEach(_openDocuments, function (doc, key) { + _.forEach(_openDocuments, function (doc) { var docLanguage = doc.getLanguage(); // A modified language can affect a document // - if its language was modified @@ -642,7 +646,7 @@ define(function (require, exports, module) { PreferencesManager.fileChanged(doc.file.fullPath); }); - $(MainViewManager).on("currentFileChange", function (e, newFile, newPaneId, oldFile, oldPaneId) { + $(MainViewManager).on("currentFileChange", function (e, newFile, newPaneId, oldFile) { var newDoc = null, oldDoc = null; From f38506c0a72914e79e8f4e303305b6a6623642a7 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Wed, 1 Oct 2014 21:32:02 -0700 Subject: [PATCH 125/182] create firstSequentially --- src/project/ProjectManager.js | 47 ++++++++++++++++++---------------- src/utils/Async.js | 48 +++++++++++++++++++++++++++++------ 2 files changed, 65 insertions(+), 30 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index bce1519007a..2d9df6443d2 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -50,6 +50,7 @@ define(function (require, exports, module) { // Load dependent modules var AppInit = require("utils/AppInit"), + Async = require("utils/Async"), PreferencesDialogs = require("preferences/PreferencesDialogs"), PreferencesManager = require("preferences/PreferencesManager"), DocumentManager = require("document/DocumentManager"), @@ -687,11 +688,11 @@ define(function (require, exports, module) { */ function _getFallbackProjectPath() { var fallbackPaths = [], - recentProjects = PreferencesManager.getViewState("recentProjects"), + recentProjects = PreferencesManager.getViewState("recentProjects") || [], deferred = new $.Deferred(); // Build ordered fallback path array - if (recentProjects && recentProjects.length > 1) { + if (recentProjects.length > 1) { // *Most* recent project is the one that just failed to load, so use second most recent fallbackPaths.push(recentProjects[1]); } @@ -699,29 +700,31 @@ define(function (require, exports, module) { // Next is Getting Started project fallbackPaths.push(_getWelcomeProjectPath()); - function checkNextPath() { - var nextPath, fileEntry; + function processItem(path) { + var deferred = new $.Deferred(), + fileEntry = FileSystem.getDirectoryForPath(path); - if (fallbackPaths.length === 0) { - // Last resort is Brackets source folder which is guaranteed to exist - deferred.resolve(FileUtils.getNativeBracketsDirectoryPath()); - } else { - // Check next path and resolve if it exists, otherwise continue - nextPath = fallbackPaths.shift(); - fileEntry = FileSystem.getDirectoryForPath(nextPath); - fileEntry.exists(function (err, exists) { - if (!err && exists) { - deferred.resolve(nextPath); - } else { - checkNextPath(); - } - }); - } + fileEntry.exists(function (err, exists) { + if (!err && exists) { + deferred.resolve(path); + } else { + deferred.reject(); + } + }); + + return deferred.promise(); } - // Recursively & asynchronously check paths for existence - checkNextPath(); - + // Find first path that exists + Async.firstSequentially(fallbackPaths, processItem) + .done(function (fallbackPath) { + deferred.resolve(fallbackPath); + }) + .fail(function () { + // Last resort is Brackets source folder which is guaranteed to exist + deferred.resolve(FileUtils.getNativeBracketsDirectoryPath()); + }); + return deferred.promise(); } diff --git a/src/utils/Async.js b/src/utils/Async.js index 0db44041758..fb410b7a4a2 100644 --- a/src/utils/Async.js +++ b/src/utils/Async.js @@ -238,6 +238,37 @@ define(function (require, exports, module) { }, false); } + /** + * Executes a series of tasks in serial (task N does not begin until task N-1 has completed). + * Returns a "master" Promise that is resolved when the first task has resolved. If all tasks + * fail, the master Promise is rejected. + * + * @param {!Array.<*>} items + * @param {!function(*, number):Promise} beginProcessItem + * @return {$.Promise} + */ + function firstSequentially(items, beginProcessItem) { + + var masterDeferred = new $.Deferred(); + + function doItem(i) { + if (i >= items.length) { + masterDeferred.reject(); + return; + } + + beginProcessItem(items[i], i) + .fail(function () { + doItem(i + 1); + }) + .done(function () { + masterDeferred.resolve(items[i]); + }); + } + + doItem(0); + return masterDeferred.promise(); + } /** * Executes a series of tasks in parallel, saving up error info from any that fail along the way. @@ -557,14 +588,15 @@ define(function (require, exports, module) { }; // Define public API - exports.doInParallel = doInParallel; - exports.doSequentially = doSequentially; + exports.doInParallel = doInParallel; + exports.doSequentially = doSequentially; exports.doSequentiallyInBackground = doSequentiallyInBackground; exports.doInParallel_aggregateErrors = doInParallel_aggregateErrors; - exports.withTimeout = withTimeout; - exports.waitForAll = waitForAll; - exports.ERROR_TIMEOUT = ERROR_TIMEOUT; - exports.chain = chain; - exports.promisify = promisify; - exports.PromiseQueue = PromiseQueue; + exports.firstSequentially = firstSequentially; + exports.withTimeout = withTimeout; + exports.waitForAll = waitForAll; + exports.ERROR_TIMEOUT = ERROR_TIMEOUT; + exports.chain = chain; + exports.promisify = promisify; + exports.PromiseQueue = PromiseQueue; }); From 4d6ed55440dbc5e95c0854c3cd2c2351202865a3 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Wed, 1 Oct 2014 21:56:30 -0700 Subject: [PATCH 126/182] cleanup --- src/project/ProjectManager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 73e40d30889..71a043ec9d7 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -697,13 +697,14 @@ define(function (require, exports, module) { // Next is Getting Started project fallbackPaths.push(_getWelcomeProjectPath()); + // Helper func for Async.firstSequentially() function processItem(path) { var deferred = new $.Deferred(), fileEntry = FileSystem.getDirectoryForPath(path); fileEntry.exists(function (err, exists) { if (!err && exists) { - deferred.resolve(path); + deferred.resolve(); } else { deferred.reject(); } From 549d84750f9e5fd2defa222fa2d26e9f00162d46 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Thu, 2 Oct 2014 01:17:15 -0700 Subject: [PATCH 127/182] Change Debug > Open Brackets Source to open the folder in the OS instead of opening it in Brackets, to avoid opening a symlink path and hitting #6692. --- src/extensions/default/DebugCommands/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index 6d84c4d3431..2beb5b80342 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -256,7 +256,7 @@ define(function (require, exports, module) { function handleOpenBracketsSource() { // Brackets source dir w/o the trailing src/ folder var dir = FileUtils.getNativeBracketsDirectoryPath().replace(/\/[^\/]+$/, "/"); - ProjectManager.openProject(dir); + brackets.app.showOSFolder(dir); } /* Register all the command handlers */ From fede3b50981e8e807d885fbba4c96c9c44322733 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Thu, 2 Oct 2014 04:00:46 -0700 Subject: [PATCH 128/182] Remove unused module (ProjectManager) This was causing a travis build failure --- src/extensions/default/DebugCommands/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index 2beb5b80342..de383138fc3 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -41,7 +41,6 @@ define(function (require, exports, module) { Strings = brackets.getModule("strings"), PreferencesManager = brackets.getModule("preferences/PreferencesManager"), LocalizationUtils = brackets.getModule("utils/LocalizationUtils"), - ProjectManager = brackets.getModule("project/ProjectManager"), ErrorNotification = require("ErrorNotification"), NodeDebugUtils = require("NodeDebugUtils"), PerfDialogTemplate = require("text!htmlContent/perf-dialog.html"), From 41d560c35f45753c5fd329dd4971961236b0d6eb Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Thu, 2 Oct 2014 20:57:15 +0200 Subject: [PATCH 129/182] Change links to use new codemirror organization --- README.md | 2 +- src/editor/InlineTextEditor.js | 2 +- src/view/WorkspaceManager.js | 2 +- test/spec/InlineEditorProviders-test.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9cbad0bf2f2..802ca6e73a9 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Awesome! _There are lots of ways you can help._ First read then learn how to [pull the repo and hack on Brackets](https://github.com/adobe/brackets/wiki/How-to-Hack-on-Brackets). The text editor inside Brackets is based on -[CodeMirror](http://github.com/marijnh/CodeMirror)—thanks to Marijn for +[CodeMirror](http://github.com/codemirror/CodeMirror)—thanks to Marijn for taking our pull requests, implementing feature requests and fixing bugs! See [Notes on CodeMirror](https://github.com/adobe/brackets/wiki/Notes-on-CodeMirror) for info on how we're using CodeMirror. diff --git a/src/editor/InlineTextEditor.js b/src/editor/InlineTextEditor.js index 2d9595ff4dd..66e5f2fa696 100644 --- a/src/editor/InlineTextEditor.js +++ b/src/editor/InlineTextEditor.js @@ -166,7 +166,7 @@ define(function (require, exports, module) { // Update display of inline editors when the hostEditor signals a redraw CodeMirror.on(this.info, "redraw", function () { // At the point where we get the redraw, CodeMirror might not yet have actually - // re-added the widget to the DOM. This is filed as https://github.com/marijnh/CodeMirror/issues/1226. + // re-added the widget to the DOM. This is filed as https://github.com/codemirror/CodeMirror/issues/1226. // For now, we can work around it by doing the refresh on a setTimeout(). window.setTimeout(function () { if (self.editor) { diff --git a/src/view/WorkspaceManager.js b/src/view/WorkspaceManager.js index 184ca0e0e27..f8bf6f29400 100644 --- a/src/view/WorkspaceManager.js +++ b/src/view/WorkspaceManager.js @@ -120,7 +120,7 @@ define(function (require, exports, module) { return; } - // FIXME (issue #4564) Workaround https://github.com/marijnh/CodeMirror/issues/1787 + // FIXME (issue #4564) Workaround https://github.com/codemirror/CodeMirror/issues/1787 triggerUpdateLayout(); if (!windowResizing) { diff --git a/test/spec/InlineEditorProviders-test.js b/test/spec/InlineEditorProviders-test.js index 65522658a7a..7bbf8404ff6 100644 --- a/test/spec/InlineEditorProviders-test.js +++ b/test/spec/InlineEditorProviders-test.js @@ -1373,8 +1373,8 @@ define(function (require, exports, module) { }); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 2)); - // TODO: can't do our usual undo + re-check range test at the end, becuase of - // marijnh/CodeMirror2 bug #487 + // TODO: can't do our usual undo + re-check range test at the end, because of + // codemirror/CodeMirror bug #487 }); From e433c4976b888e66f0fcc24bc92b45e795d5ae56 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Thu, 2 Oct 2014 12:55:46 -0700 Subject: [PATCH 130/182] change file view selection to working set --- src/project/WorkingSetView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 92453809aff..475c1d57fff 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -725,6 +725,7 @@ define(function (require, exports, module) { }); } else { // Normal right and left click - select the item + FileViewController.setFileViewFocus(FileViewController.WORKING_SET_VIEW); CommandManager .execute(Commands.FILE_OPEN, {fullPath: sourceFile.fullPath, paneId: currentView.paneId}) From 5d994eaa8be4ed58e4daf0c74c78c83b602032d5 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Thu, 2 Oct 2014 19:14:50 -0700 Subject: [PATCH 131/182] qualify post-drop reset to things that were turned off during drag and destroy shadow event listener on destroy --- src/project/WorkingSetView.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 475c1d57fff..b9987db51be 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -695,9 +695,11 @@ define(function (require, exports, module) { // Final Cleanup function postDropCleanup(noRefresh) { - // re-enable stuff we turned off - _suppressSortRedrawForAllViews(false); - _suppressScrollShadowsOnAllViews(false); + if (dragged) { + // re-enable stuff we turned off + _suppressSortRedrawForAllViews(false); + _suppressScrollShadowsOnAllViews(false); + } // we don't need to refresh if the // item was not dragged or opened @@ -1361,6 +1363,7 @@ define(function (require, exports, module) { * Destroys the WorkingSetView DOM element and removes all event handlers */ WorkingSetView.prototype.destroy = function () { + ViewUtils.removeScrollerShadow(this.$openFilesContainer[0], null); this.$openFilesContainer.off(".workingSetView"); this.$el.remove(); $(MainViewManager).off(this._makeEventName("")); From 9e637d97c11f890a4316cad5d62c39387d8fc76e Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Thu, 2 Oct 2014 12:01:43 -0700 Subject: [PATCH 132/182] This is for #9400 --- src/document/DocumentManager.js | 26 ++++++++++++++++++-------- src/project/ProjectManager.js | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index b44361af66f..caf776a0f6a 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -475,8 +475,9 @@ define(function (require, exports, module) { function notifyFileDeleted(file) { // Notify all editors to close as well $(exports).triggerHandler("pathDeleted", file.fullPath); - + var doc = getOpenDocumentForPath(file.fullPath); + if (doc) { $(doc).triggerHandler("deleted"); } @@ -491,14 +492,21 @@ define(function (require, exports, module) { * Called after a file or folder has been deleted. This function is responsible * for updating underlying model data and notifying all views of the change. * - * @param {string} path The path of the file/folder that has been deleted + * @param {string} fullPath The path of the file/folder that has been deleted */ - function notifyPathDeleted(path) { - /* FileSyncManager.syncOpenDocuments() does all the work of closing files - in the working set and notifying the user of any unsaved changes. */ + function notifyPathDeleted(fullPath) { + // FileSyncManager.syncOpenDocuments() does all the work prompting + // the user to save any unsaved changes and then calls us back + // via notifyFileDeleted FileSyncManager.syncOpenDocuments(Strings.FILE_DELETED_TITLE); - // Send a "pathDeleted" event. This will trigger the views to update. - $(exports).triggerHandler("pathDeleted", path); + + if (!getOpenDocumentForPath(fullPath) && + !MainViewManager.findInAllWorkingSets(fullPath).length) { + // For images not open in the workingset, + // FileSyncManager.syncOpenDocuments() will + // not tell us to close those views + $(exports).triggerHandler("pathDeleted", fullPath); + } } /** @@ -700,9 +708,11 @@ define(function (require, exports, module) { exports.getDocumentText = getDocumentText; exports.createUntitledDocument = createUntitledDocument; exports.getAllOpenDocuments = getAllOpenDocuments; - exports.notifyFileDeleted = notifyFileDeleted; + + // For internal use only exports.notifyPathNameChanged = notifyPathNameChanged; exports.notifyPathDeleted = notifyPathDeleted; + exports.notifyFileDeleted = notifyFileDeleted; // Performance measurements PerfUtils.createPerfMeasurement("DOCUMENT_MANAGER_GET_DOCUMENT_FOR_PATH", "DocumentManager.getDocumentForPath()"); diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 8481f163bf1..db5ca6a7180 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1088,6 +1088,20 @@ define(function (require, exports, module) { FileSyncManager.syncOpenDocuments(); model.handleFSEvent(entry, added, removed); + + // @TODO: DocumentManager should implement its own fsChange handler + // we can clean up the calls to DocumentManager.notifyPathDeleted + // and privatize DocumentManager.notifyPathDeleted as well + // We can also remove the _fileSystemRename handler below and move + // it to DocumentManager + if (removed) { + removed.forEach(function(file) { + // The call to syncOpenDocuemnts above will not nofify + // document manager about deleted images that are + // not in the working set -- try to clean that up here + DocumentManager.notifyPathDeleted(file.fullPath); + }); + } }; /** From 8aee48c0e1f28968b523d3cd60bab8c52d79928c Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Fri, 3 Oct 2014 09:06:20 -0700 Subject: [PATCH 133/182] it translations re-targetted for release branch --- src/nls/it/strings.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/nls/it/strings.js b/src/nls/it/strings.js index dd6d9caa77f..8cba1480934 100644 --- a/src/nls/it/strings.js +++ b/src/nls/it/strings.js @@ -37,7 +37,6 @@ define({ "NO_MODIFICATION_ALLOWED_ERR_FILE" : "Non hai i permessi necessari per effettuare la modifica.", "CONTENTS_MODIFIED_ERR" : "Il file è stato modificato fuori {APP_NAME}.", "UNSUPPORTED_ENCODING_ERR" : "Il file non è testo codificato in UTF-8", - "UNSUPPORTED_FILE_TYPE_ERR" : "Il file non è un tipo di file supportato.", "FILE_EXISTS_ERR" : "Il file è già presente.", "FILE" : "file", "DIRECTORY" : "cartella", @@ -211,6 +210,16 @@ define({ "BOTTOM" : "Inferiore", "LEFT" : "Sinistra", "RIGHT" : "Destra", + + "CMD_SPLITVIEW_NONE" : "Nessuna Divisione", + "CMD_SPLITVIEW_VERTICAL" : "Dividere Verticalmente", + "CMD_SPLITVIEW_HORIZONTAL" : "Dividere Orrizontalmente", + "SPLITVIEW_MENU_TOOLTIP" : "Dividere l'editor verticalmente o orizzontalmente", + "GEAR_MENU_TOOLTIP" : "Configura le impostazioni di lavoro", + + "SPLITVIEW_INFO_TITLE" : "Già aperto", + "SPLITVIEW_MULTIPANE_WARNING" : "Il file è già aperto in un altro riquadro. {APP_NAME} sarà presto possibile aprire lo stesso file in più di un riquadro. Fino ad allora, il file verrà mostrato nel riquadro che è già aperto.

      (Tu vedrai questo messaggio solo una volta.)", + /** * Keyboard modifier names @@ -572,7 +581,7 @@ define({ "CMD_SHOW_PARAMETER_HINT" : "Mostra suggerimenti sul parametro", "NO_ARGUMENTS" : "", "DETECTED_EXCLUSION_TITLE" : "Problema Conseguente File JavaScript", - "DETECTED_EXCLUSION_INFO" : "Brackets ha dei problemi per elaborare il file:

      {0}

      This file will no longer be processed for code hints and jump to definition. To turn this back on, open .brackets.json nel tuo progetto e rimuovi il file da jscodehints.detectedExclusions.", + "DETECTED_EXCLUSION_INFO" : "Brackets ha dei problemi nel elaborare il processo {0}.

      Questo file non sarà più elaborato per i Suggerimenti sul codice, Vai a definizione o Modifica rapida. Per riattivare questo file , aprire .brackets.json nel progetto e modificare jscodehints.detectedExclusions.

      Questo è probabilmente un bug di Brackets. Se è possibile fornire una copia di questo file, un bug con un collegamento al file denominato qui.", // extensions/default/JSLint "JSLINT_NAME" : "JSLint", @@ -587,5 +596,5 @@ define({ "DOCS_MORE_LINK" : "Leggi tutto" }); -/* Last translation of: 0f21bf6b9740a302609ad0111c5cf0ae1951c3d4*/ +/* Last translation of: 91b392bf349ece5058595b26a11c651697ee7ff6*/ From 7a2b2d8adaa83131eb08e5ad6db1a787b39ba417 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Fri, 3 Oct 2014 09:09:16 -0700 Subject: [PATCH 134/182] fix lint --- src/document/DocumentManager.js | 2 +- src/project/ProjectManager.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index caf776a0f6a..c5409022737 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -501,7 +501,7 @@ define(function (require, exports, module) { FileSyncManager.syncOpenDocuments(Strings.FILE_DELETED_TITLE); if (!getOpenDocumentForPath(fullPath) && - !MainViewManager.findInAllWorkingSets(fullPath).length) { + !MainViewManager.findInAllWorkingSets(fullPath).length) { // For images not open in the workingset, // FileSyncManager.syncOpenDocuments() will // not tell us to close those views diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index db5ca6a7180..f343f5c7b29 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1095,7 +1095,7 @@ define(function (require, exports, module) { // We can also remove the _fileSystemRename handler below and move // it to DocumentManager if (removed) { - removed.forEach(function(file) { + removed.forEach(function (file) { // The call to syncOpenDocuemnts above will not nofify // document manager about deleted images that are // not in the working set -- try to clean that up here From 4ca8aafc7d5cf2b3429e39820463303e364e38d1 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Fri, 3 Oct 2014 09:16:18 -0700 Subject: [PATCH 135/182] remove previous listeners --- src/utils/ViewUtils.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/utils/ViewUtils.js b/src/utils/ViewUtils.js index fc060063930..d338f5ffc70 100644 --- a/src/utils/ViewUtils.js +++ b/src/utils/ViewUtils.js @@ -127,6 +127,11 @@ define(function (require, exports, module) { _updateScrollerShadow($displayElement, $scrollElement, $shadowTop, $shadowBottom, isPositionFixed); }; + // remove any previously installed listeners on this node + $scrollElement.off("scroll.scroller-shadow"); + $displayElement.off("contentChanged.scroller-shadow"); + + // add new ones $scrollElement.on("scroll.scroller-shadow", doUpdate); $displayElement.on("contentChanged.scroller-shadow", doUpdate); From c193cf5729a68f89e4b6cbc46e36f51fd13ab74a Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Fri, 3 Oct 2014 09:39:42 -0700 Subject: [PATCH 136/182] fix #9424 --- src/project/WorkingSetView.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index b9987db51be..5b1c8247273 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -146,6 +146,10 @@ define(function (require, exports, module) { } + function _hasSelectionFocus() { + return FileViewController.getFileSelectionFocus() === FileViewController.WORKING_SET_VIEW; + } + /** * Turns on/off the flag which suppresses rebuilding of the working set * when the "workingSetSort" event is dispatched from MainViewManager. @@ -575,8 +579,8 @@ define(function (require, exports, module) { $("#working-set-list-container").addClass("dragging"); // add a class to the element we're dragging if - // its the currently selected file so that we - // can show it as selected while dragging it + // it's the currently selected file so that we + // can show it as selected while dragging if (!draggingCurrentFile) { $(activeView._findListItemFromFile(currentFile)).addClass("drag-show-as-selected"); } @@ -794,7 +798,7 @@ define(function (require, exports, module) { // setup our ghost element as position absolute // so we can put it wherever we want to while dragging - if (draggingCurrentFile) { + if (draggingCurrentFile && _hasSelectionFocus()) { $ghost.addClass("dragging-current-file"); } @@ -902,7 +906,7 @@ define(function (require, exports, module) { * @private */ WorkingSetView.prototype._scrollSelectedFileIntoView = function () { - if (FileViewController.getFileSelectionFocus() !== FileViewController.WORKING_SET_VIEW) { + if (!_hasSelectionFocus()) { return; } @@ -928,7 +932,7 @@ define(function (require, exports, module) { this._scrollSelectedFileIntoView(); } - if (FileViewController.getFileSelectionFocus() === FileViewController.WORKING_SET_VIEW && this.$el.hasClass("active")) { + if (_hasSelectionFocus() && this.$el.hasClass("active")) { this.$openFilesList.trigger("selectionChanged", reveal); } else { this.$openFilesList.trigger("selectionHide"); @@ -1155,8 +1159,7 @@ define(function (require, exports, module) { */ WorkingSetView.prototype._updateViewState = function () { var paneId = MainViewManager.getActivePaneId(); - if ((FileViewController.getFileSelectionFocus() === FileViewController.WORKING_SET_VIEW) && - (paneId === this.paneId)) { + if (_hasSelectionFocus() && paneId === this.paneId) { this.$el.addClass("active"); this.$openFilesContainer.addClass("active"); } else { From 77c50606465c7201ed847d1e089c713c00ee910f Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Fri, 3 Oct 2014 10:39:32 -0700 Subject: [PATCH 137/182] fix comment --- src/project/WorkingSetView.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 5b1c8247273..9efa3ad041b 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -705,8 +705,9 @@ define(function (require, exports, module) { _suppressScrollShadowsOnAllViews(false); } - // we don't need to refresh if the - // item was not dragged or opened + // we don't need to refresh if the item + // was dragged but not enough to not change + // its order in the working set if (!noRefresh) { // rebuild the view refresh(true); From eeffba1cc0dae9abace0fc45be3a5b81c88ee6b4 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Fri, 3 Oct 2014 10:41:40 -0700 Subject: [PATCH 138/182] update comment --- src/project/WorkingSetView.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index b9987db51be..e5e07fb522d 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -701,8 +701,10 @@ define(function (require, exports, module) { _suppressScrollShadowsOnAllViews(false); } - // we don't need to refresh if the - // item was not dragged or opened + + // we don't need to refresh if the item + // was dragged but not enough to not change + // its order in the working set if (!noRefresh) { // rebuild the view refresh(true); From 70120cfa7e5e9cc06bdd990b1a46a7f7d3869fcb Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Fri, 3 Oct 2014 13:43:41 -0700 Subject: [PATCH 139/182] Fix for #9404 and made dark theme highlight less obnoxious. --- src/extensions/default/InlineColorEditor/css/main.less | 2 +- src/extensions/default/InlineTimingFunctionEditor/main.less | 2 +- src/extensions/default/RecentProjects/styles/styles.less | 2 +- src/styles/brackets_core_ui_variables.less | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/extensions/default/InlineColorEditor/css/main.less b/src/extensions/default/InlineColorEditor/css/main.less index 00f0db775aa..79ce48f601b 100644 --- a/src/extensions/default/InlineColorEditor/css/main.less +++ b/src/extensions/default/InlineColorEditor/css/main.less @@ -334,7 +334,7 @@ // Dark UI theme -@dark-bc-bg-highlight: #005ecc; +@dark-bc-bg-highlight: #2a3b50; @dark-bc-highlight: rgba(255, 255, 255, 0.06); @dark-bc-text: #ccc; @dark-bc-text-alt: #fff; diff --git a/src/extensions/default/InlineTimingFunctionEditor/main.less b/src/extensions/default/InlineTimingFunctionEditor/main.less index a52468299dd..6560c5e6c1e 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/main.less +++ b/src/extensions/default/InlineTimingFunctionEditor/main.less @@ -301,7 +301,7 @@ /* Dark UI theme */ -@dark-bc-bg-highlight: #005ecc; +@dark-bc-bg-highlight: #2a3b50; @dark-bc-highlight: rgba(255, 255, 255, 0.06); @dark-bc-text: #ccc; @dark-bc-text-alt: #fff; diff --git a/src/extensions/default/RecentProjects/styles/styles.less b/src/extensions/default/RecentProjects/styles/styles.less index c6051a43acf..fce2f1f2b88 100644 --- a/src/extensions/default/RecentProjects/styles/styles.less +++ b/src/extensions/default/RecentProjects/styles/styles.less @@ -4,7 +4,7 @@ @bc-text-thin: #000; @bc-text-thin-quiet: #777; -@dark-bc-bg-highlight: #005ecc; +@dark-bc-bg-highlight: #2a3b50; @dark-bc-menu-text: #fff; @dark-bc-text-quiet: #aaa; @dark-bc-text-thin: #fff; diff --git a/src/styles/brackets_core_ui_variables.less b/src/styles/brackets_core_ui_variables.less index 0e524773158..af49a07807c 100644 --- a/src/styles/brackets_core_ui_variables.less +++ b/src/styles/brackets_core_ui_variables.less @@ -126,7 +126,7 @@ /* Dark Core UI variables -----------------------------------------------------------------------------*/ // General -@dark-bc-bg-highlight: #005ecc; +@dark-bc-bg-highlight: #2a3b50; @dark-bc-bg-inline-widget: #1b1b1b; @dark-bc-bg-tool-bar: #5D5F60; @dark-bc-bg-status-bar: #1c1c1e; @@ -180,7 +180,7 @@ // Default Button @dark-bc-btn-bg: #3f3f3f; -@dark-bc-btn-bg-down: #222; +@dark-bc-btn-bg-down: #383838; @dark-bc-btn-bg-down-alt: #404141; @dark-bc-btn-border: #202020; @dark-bc-btn-border-error: #fa689d; From 93e36c5df02313646e960f6fc74d8f4e9f78e8af Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Fri, 3 Oct 2014 13:48:21 -0700 Subject: [PATCH 140/182] Fix for #9359. --- src/styles/brackets_core_ui_variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/brackets_core_ui_variables.less b/src/styles/brackets_core_ui_variables.less index af49a07807c..3ca6cb17feb 100644 --- a/src/styles/brackets_core_ui_variables.less +++ b/src/styles/brackets_core_ui_variables.less @@ -172,7 +172,7 @@ @dark-bc-panel-bg-alt: #313131; @dark-bc-panel-bg-promoted: #222; @dark-bc-panel-bg-hover: rgba(255, 255, 255, 0.12); -@dark-bc-panel-bg-hover-alt: rgba(0, 0, 0, 0.04); +@dark-bc-panel-bg-hover-alt: rgba(0, 0, 0, 0.1); @dark-bc-panel-bg-selected: #3d3e40; @dark-bc-panel-bg-text-highlight: #000; @dark-bc-panel-border: #000; From 1d4343b211a6d13d6387a3c5d127884013f9f3a4 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Fri, 3 Oct 2014 14:03:19 -0700 Subject: [PATCH 141/182] Prevent working set from taking focus on every mousedown - fixes bug #9429 and half of #9414. This is basically just restoring what we were doing before the drag & drop rewrite. --- src/project/WorkingSetView.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index e5e07fb522d..2613804925c 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -765,6 +765,9 @@ define(function (require, exports, module) { } } + // prevent working set from grabbing focus no matter what type of click/drag occurs + e.preventDefault(); + // initialization $(window).on("mouseup.wsvdragging", function () { drop(); From f65dc23b2e9a6a861c2d1497895702d251df1146 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Fri, 3 Oct 2014 15:15:12 -0700 Subject: [PATCH 142/182] Tweak. --- src/styles/brackets_core_ui_variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/brackets_core_ui_variables.less b/src/styles/brackets_core_ui_variables.less index 3ca6cb17feb..973ec3ab36d 100644 --- a/src/styles/brackets_core_ui_variables.less +++ b/src/styles/brackets_core_ui_variables.less @@ -126,7 +126,7 @@ /* Dark Core UI variables -----------------------------------------------------------------------------*/ // General -@dark-bc-bg-highlight: #2a3b50; +@dark-bc-bg-highlight: #284160; @dark-bc-bg-inline-widget: #1b1b1b; @dark-bc-bg-tool-bar: #5D5F60; @dark-bc-bg-status-bar: #1c1c1e; From 35f7280548ec34a218ccf06c4d2090c0cbdfb3e1 Mon Sep 17 00:00:00 2001 From: Jackson Cleary Date: Sat, 4 Oct 2014 09:44:02 +1000 Subject: [PATCH 143/182] Add comment back to clear() function --- src/search/SearchModel.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/search/SearchModel.js b/src/search/SearchModel.js index 617503bac20..ba9b097b98d 100644 --- a/src/search/SearchModel.js +++ b/src/search/SearchModel.js @@ -106,6 +106,9 @@ define(function (require, exports, module) { */ SearchModel.prototype.exceedsMaximum = false; + /** + * Clears out the model to an empty state. + */ SearchModel.prototype.clear = function () { this.results = {}; this.queryInfo = null; From d63a1248ab8ab9f43017b454b79db7004a3aaaf1 Mon Sep 17 00:00:00 2001 From: Jackson Cleary Date: Sat, 4 Oct 2014 09:57:30 +1000 Subject: [PATCH 144/182] Changed -- to conform to JSLint --- src/search/SearchModel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/search/SearchModel.js b/src/search/SearchModel.js index ba9b097b98d..dfb008038ac 100644 --- a/src/search/SearchModel.js +++ b/src/search/SearchModel.js @@ -168,9 +168,9 @@ define(function (require, exports, module) { // Remove final result if there have been over MAX_TOTAL_RESULTS found if (this.numMatches > SearchModel.MAX_TOTAL_RESULTS) { this.results[fullpath].matches.pop(); - this.numMatches--; + this.numMatches -= 1; this.exceedsMaximum = true; - } + } } }; From 35fb2433f7d0cf46e3484aad911f3e5c6a415650 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 4 Oct 2014 21:28:35 +0200 Subject: [PATCH 145/182] Refactored CSS --- src/styles/brackets.less | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 0796a12e87c..7131a7c98f8 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -98,23 +98,24 @@ a, img { height: 100%; .dark & { - background: @dark-bc-menu-bg; + background: @dark-bc-menu-bg; } - .sidebar { + .sidebar, .content { height: 100%; - .vbox; - width: @sidebar-width; // changed dynamically via Resizer position: absolute; - left: 0; top: 0; } + .sidebar { + .vbox; + left: 0; + width: @sidebar-width; // changed dynamically via Resizer + white-space: nowrap; + } + .content { - height: 100%; - position: absolute; padding: 0; - top: 0; left: @sidebar-width; // changed dynamically via Resizer right: @main-toolbar-width; } @@ -772,11 +773,6 @@ a, img { } } -#sidebar { - position: absolute; - white-space: nowrap; -} - #sidebar-resizer { position: absolute; width: 6px; From 80eba903f2113db4f536cad80d896b1e1b5e5fca Mon Sep 17 00:00:00 2001 From: Denis R Date: Sun, 5 Oct 2014 15:10:28 +0200 Subject: [PATCH 146/182] Update README.md Fix a small error! --- src/extensions/samples/LocalizationExample/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/samples/LocalizationExample/README.md b/src/extensions/samples/LocalizationExample/README.md index 001e35d0a3d..44a4c8e77b6 100644 --- a/src/extensions/samples/LocalizationExample/README.md +++ b/src/extensions/samples/LocalizationExample/README.md @@ -48,7 +48,7 @@ Move this plugin to the extensions\user\ folder to run the plugin. It will add a * main.js – loads the Strings module for the plugin and uses mustache to localize html content -* package.json - add the translation languages as in the example: `"i18n: ["en", "fr" ]`. Also, add any localized metadata for displayed metadata in the Extension Manager, as in the example: `"fr": { "title": "localized title" }`. +* package.json - add the translation languages as in the example: `"i18n": ["en", "fr" ]`. Also, add any localized metadata for displayed metadata in the Extension Manager, as in the example: `"fr": { "title": "localized title" }`. * strings.js – uses i18n to load a strings.js file in the nls folder From c6bc9260a1915ae60ca470c1f4ca9d0fb8b3942b Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sun, 5 Oct 2014 18:35:14 +0200 Subject: [PATCH 147/182] Fix failing QuickOpen test on Linux --- test/spec/QuickOpen-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/spec/QuickOpen-test.js b/test/spec/QuickOpen-test.js index 7c1d6356456..d71fd63e03b 100644 --- a/test/spec/QuickOpen-test.js +++ b/test/spec/QuickOpen-test.js @@ -178,8 +178,8 @@ define(function (require, exports, module) { var editorHeight = $scroller.height(); var cursorPos = editor._codeMirror.cursorCoords(null, "page").bottom; - expect(cursorPos).toBeGreaterThan(editorHeight * 0.4 - offset); - expect(cursorPos).toBeLessThan(editorHeight * 0.6 - offset); + expect(cursorPos).toBeGreaterThan(editorHeight * 0.4 + offset); + expect(cursorPos).toBeLessThan(editorHeight * 0.6 + offset); }); }; } From 4d3ed09b4422663862ff30d5aa9646c756ed92d4 Mon Sep 17 00:00:00 2001 From: Peter Thiess Date: Mon, 6 Oct 2014 10:52:52 -0700 Subject: [PATCH 148/182] Added license information for React --- NOTICE | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/NOTICE b/NOTICE index c8067c3a2a4..c5f14b18974 100644 --- a/NOTICE +++ b/NOTICE @@ -486,6 +486,25 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Copyright (c) 2014, Facebook, Inc. All rights reserved. + +React JavaScript library + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +See also: https://github.com/facebook/react/blob/master/LICENSE + + Timothy Farrell Copyright (c) 2010 Timothy Farrell Permission is hereby granted, free of charge, to any person obtaining a copy of this From 3016e2b3f9c031ac5758a45ce675c160e471e850 Mon Sep 17 00:00:00 2001 From: Peter Thiess Date: Mon, 6 Oct 2014 12:25:05 -0700 Subject: [PATCH 149/182] Fixed a copy / paste bug. --- NOTICE | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index c5f14b18974..ec184192491 100644 --- a/NOTICE +++ b/NOTICE @@ -490,9 +490,7 @@ Copyright (c) 2014, Facebook, Inc. All rights reserved. React JavaScript library -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +Licensed under the Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 From ea17aa0fb1197a37dfbb3e17e06aeeea44bc4636 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Mon, 6 Oct 2014 21:45:38 +0200 Subject: [PATCH 150/182] Remove dependency between tests --- src/extensions/default/UrlCodeHints/unittests.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/extensions/default/UrlCodeHints/unittests.js b/src/extensions/default/UrlCodeHints/unittests.js index 8aeebffe32e..c43592a5132 100644 --- a/src/extensions/default/UrlCodeHints/unittests.js +++ b/src/extensions/default/UrlCodeHints/unittests.js @@ -270,15 +270,13 @@ define(function (require, exports, module) { describe("Url Code Hints in a subfolder", function () { - beforeFirst(function () { - setupTests(testCssPath); - }); - - afterLast(function () { + afterEach(function () { tearDownTests(); }); it("should hint for background-image: url() in CSS", function () { + setupTests(testCssPath); + runs(function () { testEditor.setCursorPos({ line: 3, ch: 26 }); hintsObj = null; @@ -288,14 +286,11 @@ define(function (require, exports, module) { runs(function () { verifyUrlHints(hintsObj.hints, subfolderDirHints); }); - - runs(function () { - tearDownTests(); - setupTests(testScssPath); - }); }); it("should hint for background-image: url() in SCSS", function () { + setupTests(testScssPath); + runs(function () { testEditor.setCursorPos({ line: 4, ch: 34 }); hintsObj = null; From 2c99ecab050e5fcb36b97d955218a1fc130818c8 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Mon, 6 Oct 2014 22:01:40 +0200 Subject: [PATCH 151/182] Wrap setupTests() in runs() --- src/extensions/default/UrlCodeHints/unittests.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/extensions/default/UrlCodeHints/unittests.js b/src/extensions/default/UrlCodeHints/unittests.js index c43592a5132..6cc690005cf 100644 --- a/src/extensions/default/UrlCodeHints/unittests.js +++ b/src/extensions/default/UrlCodeHints/unittests.js @@ -275,7 +275,9 @@ define(function (require, exports, module) { }); it("should hint for background-image: url() in CSS", function () { - setupTests(testCssPath); + runs(function () { + setupTests(testCssPath); + }); runs(function () { testEditor.setCursorPos({ line: 3, ch: 26 }); @@ -289,7 +291,9 @@ define(function (require, exports, module) { }); it("should hint for background-image: url() in SCSS", function () { - setupTests(testScssPath); + runs(function () { + setupTests(testScssPath); + }); runs(function () { testEditor.setCursorPos({ line: 4, ch: 34 }); From 73267a0ec3a5e101757b418e612a638322503b5c Mon Sep 17 00:00:00 2001 From: Triangle717 Date: Tue, 7 Oct 2014 15:52:53 -0400 Subject: [PATCH 152/182] Finish updating Brackets version to 0.45 --- src/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.json b/src/config.json index a2e0210641a..04f71689b8a 100644 --- a/src/config.json +++ b/src/config.json @@ -22,8 +22,8 @@ "build_timestamp": "" }, "name": "Brackets", - "version": "0.44.0-0", - "apiVersion": "0.44.0", + "version": "0.45.0-0", + "apiVersion": "0.45.0", "homepage": "http://brackets.io", "issues": { "url": "http://github.com/adobe/brackets/issues" From 96986ce5911c4dc0b264707f7a8c7467b503b876 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Tue, 7 Oct 2014 13:22:57 -0700 Subject: [PATCH 153/182] Update CM for release 45 --- src/thirdparty/CodeMirror2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2 index 17c992e979d..dcab2496a39 160000 --- a/src/thirdparty/CodeMirror2 +++ b/src/thirdparty/CodeMirror2 @@ -1 +1 @@ -Subproject commit 17c992e979daf3a3aa75926d38144e3c9d4dc064 +Subproject commit dcab2496a3994b17a4b38208a34202c758de4e1a From e5743121d9f68e9cd961b57d2fb8558044e4dc8e Mon Sep 17 00:00:00 2001 From: Triangle717 Date: Fri, 3 Oct 2014 17:10:29 -0400 Subject: [PATCH 154/182] Remove main.js requirement for themes adobe/brackets#8626 --- src/extensibility/node/package-validator.js | 7 +++++-- src/extensibility/node/package.json | 2 +- .../node/spec/Installation.spec.js | 2 +- .../node/spec/Validation.spec.js | 10 +++++++++ .../basic-valid-theme-1.0.zip | Bin 0 -> 543 bytes .../basic-valid-theme-1.0/package.json | 19 ++++++++++++++++++ .../basic-valid-theme-1.0/theme.less | 0 7 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 test/spec/extension-test-files/basic-valid-theme-1.0.zip create mode 100644 test/spec/extension-test-files/basic-valid-theme-1.0/package.json create mode 100644 test/spec/extension-test-files/basic-valid-theme-1.0/theme.less diff --git a/src/extensibility/node/package-validator.js b/src/extensibility/node/package-validator.js index a44d172e0da..9cf5f98afcc 100644 --- a/src/extensibility/node/package-validator.js +++ b/src/extensibility/node/package-validator.js @@ -287,8 +287,11 @@ function extractAndValidateFiles(zipPath, extractDir, options, callback) { callback(err, null); return; } - var mainJS = path.join(extractDir, commonPrefix, "main.js"); - if (!fs.existsSync(mainJS)) { + var mainJS = path.join(extractDir, commonPrefix, "main.js"), + isTheme = metadata && metadata.theme; + + // Throw missing main.js file only for non-theme extensions + if (!isTheme && !fs.existsSync(mainJS)) { errors.push([Errors.MISSING_MAIN, zipPath, mainJS]); } callback(null, { diff --git a/src/extensibility/node/package.json b/src/extensibility/node/package.json index e83a1edc617..87d31de2a9f 100644 --- a/src/extensibility/node/package.json +++ b/src/extensibility/node/package.json @@ -1,7 +1,7 @@ { "name": "brackets-extensibility", "description": "Used in the management of Brackets extensions", - "version": "0.32.0", + "version": "0.45.0", "dependencies": { "decompress-zip": "0.0.2", "semver": "2.x", diff --git a/src/extensibility/node/spec/Installation.spec.js b/src/extensibility/node/spec/Installation.spec.js index 9d24ba435cf..e65d7bef828 100644 --- a/src/extensibility/node/spec/Installation.spec.js +++ b/src/extensibility/node/spec/Installation.spec.js @@ -56,7 +56,7 @@ var basicValidExtension = path.join(testFilesDirectory, "basic-valid-exten missingPackageJSON = path.join(testFilesDirectory, "missing-package-json.zip"), missingPackageJSONUpdate = path.join(testFilesDirectory, "missing-package-json-update.zip"), missingPackageJSONRenamed = path.join(testFilesDirectory, "added-package-json-test", "missing-package-json.zip"), - withSymlink = path.join(testFilesDirectory, "with-symlink.zip"); + withSymlink = path.join(testFilesDirectory, "with-symlink.zip"); describe("Package Installation", function () { diff --git a/src/extensibility/node/spec/Validation.spec.js b/src/extensibility/node/spec/Validation.spec.js index 81cd35f7612..eb996e04086 100644 --- a/src/extensibility/node/spec/Validation.spec.js +++ b/src/extensibility/node/spec/Validation.spec.js @@ -44,6 +44,7 @@ var testFilesDirectory = path.join(path.dirname(module.filename), var basicValidExtension = path.join(testFilesDirectory, "basic-valid-extension.zip"), basicValidExtension2 = path.join(testFilesDirectory, "basic-valid-extension-2.0.zip"), + basicValidTheme = path.join(testFilesDirectory, "basic-valid-theme-1.0.zip"), missingPackageJSON = path.join(testFilesDirectory, "missing-package-json.zip"), invalidJSON = path.join(testFilesDirectory, "invalid-json.zip"), invalidZip = path.join(testFilesDirectory, "invalid-zip-file.zip"), @@ -167,6 +168,15 @@ describe("Package Validation", function () { }); }); + it("should NOT require a main.js in the zip file for a theme", function (done) { + packageValidator.validate(basicValidTheme, {}, function (err, result) { + expect(err).toBeNull(); + expect(result.errors.length).toEqual(0); + expect(result.metadata.theme).toBeDefined(); + done(); + }); + }); + it("should determine the common prefix if there is one", function (done) { packageValidator.validate(oneLevelDown, {}, function (err, result) { expect(err).toBeNull(); diff --git a/test/spec/extension-test-files/basic-valid-theme-1.0.zip b/test/spec/extension-test-files/basic-valid-theme-1.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..fe1ab3625e3ac6b479e2104d1a244c74b50ca540 GIT binary patch literal 543 zcmWIWW@Zs#U|`^25UFx?727M2{ujs-WMW|80n!DD$=QkNsd`z(`FXVy5BeQ8;Awkb z+ohpCVOv>@c8i42^tpoKCcf`pP1>O2xY4|2*^QFo53*+QD}T8_|10nU#yoF7Ak+`lZD+k3`$?+S5oS-v%M`afObk*of= zLf0@$J5P~Q`gH~KGUxN(8C8$)1ibz8dhU*(Gw*XR|LHS*%zk}(P;~mu*Y6IT3)c8C z>553CC2QF#nV&U&m){y>70jKD3bUMJBl?~)9CLr7er2T;=FfafB D (http://thoseeinsteins.org/alfred)", + "contributors": [ + "Johan Einstein", + { + "name": "Albert Einstein Jr.", + "email": "not_that_albert@thoseeinsteins.org" + }, + "Jens Einstein " + ], + "theme": { + "file": "theme.less", + "dark": false + }, + "keywords": ["theme"] +} diff --git a/test/spec/extension-test-files/basic-valid-theme-1.0/theme.less b/test/spec/extension-test-files/basic-valid-theme-1.0/theme.less new file mode 100644 index 00000000000..e69de29bb2d From 0ea77d7fdd325fd5ae1308dd86be56d25b2452e4 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Tue, 7 Oct 2014 15:06:43 -0700 Subject: [PATCH 155/182] Prevent text wrapping in pane headers. --- src/styles/brackets.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 7131a7c98f8..61015e8978a 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -493,6 +493,7 @@ a, img { padding: 5px 10px; color: @bc-text-thin-quiet; background-color: @background; + white-space: nowrap; .dark & { color: @dark-bc-text-quiet; From d1266cc7d335614d06c7b8126a2a2a0f115a3006 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Tue, 7 Oct 2014 15:18:39 -0700 Subject: [PATCH 156/182] Add two more properties as Tom suggested. --- src/styles/brackets.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 61015e8978a..5e2a1f962a7 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -494,6 +494,8 @@ a, img { color: @bc-text-thin-quiet; background-color: @background; white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; .dark & { color: @dark-bc-text-quiet; From 0c83a927f850abced2c12a1d896530bfbeb89b02 Mon Sep 17 00:00:00 2001 From: Jackson Cleary Date: Wed, 8 Oct 2014 19:06:35 +1100 Subject: [PATCH 157/182] Conform code to conventions --- src/search/FindInFiles.js | 4 ++-- src/search/SearchModel.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js index f12a7c8c301..62e608e787b 100644 --- a/src/search/FindInFiles.js +++ b/src/search/FindInFiles.js @@ -127,8 +127,8 @@ define(function (require, exports, module) { // We have the max hits in just this 1 file. Stop searching this file. // This fixed issue #1829 where code hangs on too many hits. - // ** Adds one over MAX_TOTAL_RESULTS in order to know if the search has exceeded - // or is equal to MAX_TOTAL_RESULTS. Additional result removed in SearchModel ** + // Adds one over MAX_TOTAL_RESULTS in order to know if the search has exceeded + // or is equal to MAX_TOTAL_RESULTS. Additional result removed in SearchModel if (matches.length > SearchModel.MAX_TOTAL_RESULTS) { queryExpr.lastIndex = 0; break; diff --git a/src/search/SearchModel.js b/src/search/SearchModel.js index dfb008038ac..dac66a2f17e 100644 --- a/src/search/SearchModel.js +++ b/src/search/SearchModel.js @@ -168,7 +168,7 @@ define(function (require, exports, module) { // Remove final result if there have been over MAX_TOTAL_RESULTS found if (this.numMatches > SearchModel.MAX_TOTAL_RESULTS) { this.results[fullpath].matches.pop(); - this.numMatches -= 1; + this.numMatches--; this.exceedsMaximum = true; } } From c255c8f5303f2cf1a13058cec344dc00c4c6aef9 Mon Sep 17 00:00:00 2001 From: Tuur Dutoit Date: Wed, 8 Oct 2014 16:58:42 +0200 Subject: [PATCH 158/182] dependencies.js rewrite --- src/dependencies.js | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/dependencies.js b/src/dependencies.js index e0a9a432204..a6d4565667b 100644 --- a/src/dependencies.js +++ b/src/dependencies.js @@ -29,26 +29,25 @@ */ window.setTimeout(function () { "use strict"; + + var key, missingDeps = ""; var deps = { "Mustache": window.Mustache, "jQuery": window.$, "RequireJS": window.require }; - var key, missingDeps = []; + for (key in deps) { if (deps.hasOwnProperty(key) && !deps[key]) { - missingDeps.push(key); + missingDeps += "
    • " + key + "
      • "; } } - if (missingDeps.length === 0) { - return; + + if (missingDeps.length > 0) { + var str = "

      Missing libraries

      " + + "

      Oops! One or more required libraries could not be found.

      " + + "
        " + missingDeps + "
      " + + "

      If you're running from a local copy of the Brackets source, please make sure submodules are updated by running:

      " + + "
      git submodule update --init
      " + + "

      If you're still having problems, please contact us via one of the channels mentioned at the bottom of the README.

      " + + "

      Reload Brackets

      "; + + document.write(str); } - document.write("

      Missing libraries

      "); - document.write("

      Oops! One or more required libraries could not be found.

      "); - document.write("
        "); - missingDeps.forEach(function (key) { - document.write("
      • " + key + "
        • "); - }); - - document.write("
      "); - document.write("

      If you're running from a local copy of the Brackets source, please make sure submodules are updated by running:

      "); - document.write("
      git submodule update --init
      "); - document.write("

      If you're still having problems, please contact us via one of the channels mentioned at the bottom of the README.

      "); - document.write("

      Reload Brackets

      "); -}, 1000); +}, 1000); \ No newline at end of file From d99cdaff5fab3612b441ef230e7c9d4c459a5697 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Wed, 8 Oct 2014 11:56:49 -0700 Subject: [PATCH 159/182] fix showing current file when selection is in the tree --- src/project/WorkingSetView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 9efa3ad041b..8d416aca674 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -581,7 +581,7 @@ define(function (require, exports, module) { // add a class to the element we're dragging if // it's the currently selected file so that we // can show it as selected while dragging - if (!draggingCurrentFile) { + if (!draggingCurrentFile && FileViewController.getFileSelectionFocus() === FileViewController.WORKING_SET_VIEW) { $(activeView._findListItemFromFile(currentFile)).addClass("drag-show-as-selected"); } From 510a05ee9ddbfc04bdd1e80262466c4ab0d9a01e Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Thu, 9 Oct 2014 14:31:27 -0700 Subject: [PATCH 160/182] - fix failing tests --- test/spec/InlineEditorProviders-test.js | 508 ++++++++++++------------ 1 file changed, 258 insertions(+), 250 deletions(-) diff --git a/test/spec/InlineEditorProviders-test.js b/test/spec/InlineEditorProviders-test.js index 7bbf8404ff6..26bce99a4a9 100644 --- a/test/spec/InlineEditorProviders-test.js +++ b/test/spec/InlineEditorProviders-test.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -27,7 +27,7 @@ define(function (require, exports, module) { 'use strict'; - + var CommandManager, // loaded from brackets.test Commands, // loaded from brackets.test EditorManager, // loaded from brackets.test @@ -43,18 +43,18 @@ define(function (require, exports, module) { Strings = require("strings"); describe("InlineEditorProviders", function () { - + this.category = "integration"; var testPath = SpecRunnerUtils.getTestPath("/spec/InlineEditorProviders-test-files"), tempPath = SpecRunnerUtils.getTempDirectory(), testWindow, infos = {}; - + function toRange(startLine, endLine) { return {startLine: startLine, endLine: endLine}; } - + function rewriteProject() { var result = new $.Deferred(), options = { @@ -68,17 +68,17 @@ define(function (require, exports, module) { }).fail(function () { result.reject(); }); - + return result.promise(); } - + /** * Performs setup for an inline editor test. Parses offsets (saved to infos) for all files in * the test project (testPath) and saves files back to disk without offset markup. * When finished, open an editor for the specified project relative file path * then attempts opens an inline editor at the given offset. Installs an after() * function restore all file content back to original state with offset markup. - * + * * @param {string} openFile Project relative file path to open in a main editor. * @param {number} openOffset The offset index location within openFile to open an inline editor. * @param {boolean=} expectInline Use false to verify that an inline editor should not be opened. Omit otherwise. @@ -86,25 +86,25 @@ define(function (require, exports, module) { */ function initInlineTest(openFile, openOffset, expectInline, documentList) { var editor; - + documentList = documentList || []; - + expectInline = (expectInline !== undefined) ? expectInline : true; - + runs(function () { documentList.push(openFile); waitsForDone(SpecRunnerUtils.openProjectFiles(documentList), "FILE_OPEN timeout", 1000); }); - + runs(function () { editor = EditorManager.getCurrentFullEditor(); - + // open inline editor at specified offset index var inlineEditorResult = SpecRunnerUtils.toggleQuickEditAtOffset( editor, infos[openFile].offsets[openOffset] ); - + if (expectInline) { waitsForDone(inlineEditorResult, "inline editor opened", 1000); } else { @@ -116,7 +116,7 @@ define(function (require, exports, module) { if (expectInline) { var inlineWidgets = editor.getInlineWidgets(); expect(inlineWidgets.length).toBe(1); - + // By the time we're called, the content of the widget should be in the DOM and have a nontrivial height. expect($.contains(testWindow.document.documentElement, inlineWidgets[0].htmlContent)).toBe(true); expect(inlineWidgets[0].$htmlContent.height()).toBeGreaterThan(50); @@ -125,16 +125,16 @@ define(function (require, exports, module) { editor = null; }); } - + // Utilities for testing Editor state function expectText(editor) { return expect(editor._codeMirror.getValue()); } - + function expectTextToBeEqual(editor1, editor2) { expect(editor1._codeMirror.getValue()).toBe(editor2._codeMirror.getValue()); } - + function isLineHidden(cm, lineNum) { var markers = cm.findMarksAt({line: lineNum, pos: 0}), i; @@ -147,13 +147,21 @@ define(function (require, exports, module) { } function expectPopoverMessageWithText(text) { - var $popover = testWindow.$(".popover-message"); - expect($popover.length).toEqual(1); + var $popover; + + runs(function () { + waitsFor(function () { + $popover = testWindow.$(".popover-message"); + return $popover.length === 1; + }, "Expect popover window"); + }); - var popoverText = $(".text", $popover).html(); - expect(popoverText).toEqual(text); + runs(function () { + var popoverText = testWindow.$(".text", $popover).html(); + expect(popoverText).toEqual(text); + }); } - + function getBounds(object, useOffset) { var left = (useOffset ? object.offset().left : parseInt(object.css("left"), 10)), top = (useOffset ? object.offset().top : parseInt(object.css("top"), 10)); @@ -190,7 +198,7 @@ define(function (require, exports, module) { * These tests are primarily focused on the InlineEditorProvider module. */ describe("htmlToCSSProvider", function () { - + beforeFirst(function () { SpecRunnerUtils.createTempDirectory(); @@ -198,11 +206,11 @@ define(function (require, exports, module) { runs(function () { waitsForDone(rewriteProject(), "rewriteProject timeout", 1000); }); - + // Create a new window that will be shared by ALL tests in this spec. SpecRunnerUtils.createTestWindowAndRun(this, function (w) { testWindow = w; - + // Load module instances from brackets.test CommandManager = testWindow.brackets.test.CommandManager; Commands = testWindow.brackets.test.Commands; @@ -213,7 +221,7 @@ define(function (require, exports, module) { FileViewController = testWindow.brackets.test.FileViewController; }); }); - + afterLast(function () { testWindow = null; Commands = null; @@ -226,7 +234,7 @@ define(function (require, exports, module) { SpecRunnerUtils.removeTempDirectory(); }); - + beforeEach(function () { this.addMatchers({ toHaveInlineEditorRange: function (range) { @@ -239,10 +247,10 @@ define(function (require, exports, module) { startLine = range.startLine, endLine = range.endLine, visibleRangeCheck; - + for (i = 0; i < lineCount; i++) { hidden = isLineHidden(editor._codeMirror, i); - + if (i < startLine) { if (!hidden) { shouldHide.push(i); // lines above start line should be hidden @@ -257,44 +265,44 @@ define(function (require, exports, module) { } } } - + visibleRangeCheck = (editor._visibleRange.startLine === startLine) && (editor._visibleRange.endLine === endLine); - + this.message = function () { var msg = ""; - + if (shouldHide.length > 0) { msg += "Expected inline editor to hide [" + shouldHide.toString() + "].\n"; } - + if (shouldShow.length > 0) { msg += "Expected inline editor to show [" + shouldShow.toString() + "].\n"; } - + if (!visibleRangeCheck) { msg += "Editor._visibleRange [" + editor._visibleRange.startLine + "," + editor._visibleRange.endLine + "] should be [" + startLine + "," + endLine + "]."; } - + return msg; }; - + return (shouldHide.length === 0) && (shouldShow.length === 0) && visibleRangeCheck; } }); - + SpecRunnerUtils.loadProjectInTestWindow(tempPath); }); - + afterEach(function () { //debug visual confirmation of inline editor //waits(1000); - + // revert files to original content with offset markup testWindow.closeAllFiles(); }); @@ -302,40 +310,40 @@ define(function (require, exports, module) { it("should open a type selector and show correct range including the embedded php", function () { initInlineTest("test1.php", 1); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position and displayed range in inline editor expect(inlinePos).toEqual(infos["test1.php"].offsets[0]); expect(inlineWidget.editor).toHaveInlineEditorRange(toRange(4, 8)); - + inlineWidget = null; }); }); - + it("should open a type selector on opening tag", function () { initInlineTest("test1.html", 0); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[0]); inlineWidget = null; }); }); - + it("should open a type selector on closing tag", function () { initInlineTest("test1.html", 9); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[0]); @@ -345,11 +353,11 @@ define(function (require, exports, module) { it("should open a class selector", function () { initInlineTest("test1.html", 1); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[1]); @@ -359,11 +367,11 @@ define(function (require, exports, module) { it("should also open a class selector", function () { initInlineTest("test1.html", 7); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[1]); @@ -373,11 +381,11 @@ define(function (require, exports, module) { it("should open an embedded class selector", function () { initInlineTest("test1.html", 10); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.html"].offsets[11]); @@ -387,11 +395,11 @@ define(function (require, exports, module) { it("should open an id selector", function () { initInlineTest("test1.html", 2); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[2]); @@ -443,36 +451,36 @@ define(function (require, exports, module) { inlineWidget = null; }); }); - - + + it("should close, then remove the inline widget and restore focus", function () { initInlineTest("test1.html", 0); - + var hostEditor, inlineWidget, inlinePos, savedPos; - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); savedPos = hostEditor.getCursorPos(); inlineWidget = hostEditor.getInlineWidgets()[0]; inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position & focus in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[0]); expect(inlineWidget.hasFocus()).toEqual(true); expect(hostEditor.hasFocus()).toEqual(false); - + // close the editor waitsForDone(EditorManager.closeInlineWidget(hostEditor, inlineWidget), "closing inline widget"); - + }); - + runs(function () { // verify no inline widgets in list expect(hostEditor.getInlineWidgets().length).toBe(0); - + // verify that the inline widget's content has been removed from the DOM expect($.contains(testWindow.document.documentElement, inlineWidget.htmlContent)).toBe(false); - + // verify full editor cursor & focus restored expect(savedPos).toEqual(hostEditor.getCursorPos()); expect(hostEditor.hasFocus()).toEqual(true); @@ -506,7 +514,7 @@ define(function (require, exports, module) { it("should not open an inline editor when positioned on textContent", function () { initInlineTest("test1.html", 3, false); - + runs(function () { // verify no inline editor open expect(EditorManager.getCurrentFullEditor().getInlineWidgets().length).toBe(0); @@ -521,7 +529,7 @@ define(function (require, exports, module) { // The call to `waits(4000)` in this test seems to dismiss the popover xit("should not open an inline editor when positioned on title attribute", function () { initInlineTest("test1.html", 12, false); - + runs(function () { // verify no inline editor open expect(EditorManager.getCurrentFullEditor().getInlineWidgets().length).toBe(0); @@ -538,7 +546,7 @@ define(function (require, exports, module) { var $popover = testWindow.$(".popover-message"); expect($popover.length).toEqual(1); }); - + runs(function () { // verify popover message is automatically dismissed after 2 more seconds // total delay is 5 sec + 0.5 sec fade-out transition @@ -554,16 +562,16 @@ define(function (require, exports, module) { it("should not open an inline editor when positioned on a tag in a comment", function () { initInlineTest("test1.html", 4, false); - + runs(function () { // verify no inline editor open expect(EditorManager.getCurrentFullEditor().getInlineWidgets().length).toBe(0); }); }); - + it("should open an inline editor when positioned on the non standard html tag , but no content from @keyframes", function () { initInlineTest("test1.html", 18); - + runs(function () { // verify inline editor is open for adding a new rule expect(EditorManager.getCurrentFullEditor().getInlineWidgets().length).toBe(1); @@ -609,8 +617,8 @@ define(function (require, exports, module) { expect($popover.length).toEqual(1); }); }); - - + + it("should close popover message on selection change", function () { var editor, openFile = "test1.html"; @@ -641,7 +649,7 @@ define(function (require, exports, module) { expect($popover.length).toEqual(0); }); }); - + it("should position message popover inside left edge of window", function () { var $popover; initInlineTest("test1.html", 11, false); @@ -712,49 +720,49 @@ define(function (require, exports, module) { toggleOption(Commands.TOGGLE_WORD_WRAP, "Toggle word-wrap"); }); }); - + it("should increase size based on content", function () { initInlineTest("test1.html", 1); - + var inlineEditor, widgetHeight; - + runs(function () { inlineEditor = EditorManager.getCurrentFullEditor().getInlineWidgets()[0].editor; widgetHeight = inlineEditor.totalHeight(); - + // verify original line count expect(inlineEditor.lineCount()).toBe(25); - + // change inline editor content var newLines = ".bar {\ncolor: #f00;\n}\n.cat {\ncolor: #f00;\n}"; - + // insert new lines at current cursor position // can't mutate document directly at this point inlineEditor._codeMirror.replaceRange( newLines, inlineEditor.getCursorPos() ); - + // verify widget resizes when contents is changed expect(inlineEditor.lineCount()).toBe(30); expect(inlineEditor.totalHeight()).toBeGreaterThan(widgetHeight); - + inlineEditor = null; }); }); - + it("should decrease size based on content", function () { initInlineTest("test1.html", 1); - + var inlineEditor, widgetHeight; - + runs(function () { inlineEditor = EditorManager.getCurrentFullEditor().getInlineWidgets()[0].editor; widgetHeight = inlineEditor.totalHeight(); - + // verify original line count expect(inlineEditor.lineCount()).toBe(25); - + // replace the entire .foo rule with an empty string // set text on the editor, can't mutate document directly at this point inlineEditor._codeMirror.replaceRange( @@ -762,7 +770,7 @@ define(function (require, exports, module) { inlineEditor.getCursorPos(), infos["test1.css"].offsets[3] ); - + // verify widget resizes when contents is changed expect(inlineEditor.lineCount()).toBe(23); expect(inlineEditor.totalHeight()).toBeLessThan(widgetHeight); @@ -770,52 +778,52 @@ define(function (require, exports, module) { inlineEditor = null; }); }); - + it("should save changes in the inline editor", function () { initInlineTest("test1.html", 1); - + var err = false, hostEditor, inlineEditor, newText = "\n/* jasmine was here */", savedText; - + this.after(function () { // rewrite the project after saving changes runs(function () { waitsForDone(rewriteProject(), "rewriteProject timeout", 1000); }); }); - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // insert text at the inline editor's cursor position // can't mutate document directly at this point inlineEditor._codeMirror.replaceRange(newText, inlineEditor.getCursorPos()); - + // we're going to compare this to disk later, so pass true to get non-normalized line endings newText = inlineEditor.document.getText(true); - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBeTruthy(); expect(hostEditor.document.isDirty).toBeFalsy(); - + // verify that the dirty dot is visible in the UI expect(testWindow.$(".dirty-indicator", hostEditor.getInlineWidgets()[0].$htmlContent).width()).not.toEqual(0); - + // verify focus is in inline editor expect(inlineEditor.hasFocus()).toBeTruthy(); - + // execute file save command waitsForDone(testWindow.executeCommand(Commands.FILE_SAVE), "save timeout", 1000); }); - + runs(function () { // verify focus is still in inline editor expect(inlineEditor.hasFocus()).toBeTruthy(); - + // read saved file contents FileUtils.readAsText(inlineEditor.document.file).done(function (text) { savedText = text; @@ -823,26 +831,26 @@ define(function (require, exports, module) { err = true; }); }); - + waitsFor(function () { return savedText !== undefined; }, "readAsText timeout", 1000); - + runs(function () { expect(savedText).toEqual(newText); - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBeFalsy(); expect(hostEditor.document.isDirty).toBeFalsy(); // verify that the dirty dot is hidden in the UI expect(testWindow.$(".dirty-indicator", hostEditor.getInlineWidgets()[0].$htmlContent).width()).toEqual(0); - + inlineEditor = hostEditor = null; }); }); - + it("should not save changes in the host editor", function () { initInlineTest("test1.html", 1); - + var err = false, hostEditor, inlineEditor, @@ -850,39 +858,39 @@ define(function (require, exports, module) { newHostText = "/* jasmine was here */\n", savedInlineText, savedHostText; - + this.after(function () { // rewrite the project after saving changes runs(function () { waitsForDone(rewriteProject(), "rewriteProject timeout", 1000); }); }); - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // insert text at the host editor's cursor position hostEditor._codeMirror.replaceRange(newHostText, hostEditor.getCursorPos()); - + // insert text at the inline editor's cursor position // can't mutate document directly at this point inlineEditor._codeMirror.replaceRange(newInlineText, inlineEditor.getCursorPos()); - + // we're going to compare this to disk later, so pass true to get non-normalized line endings newInlineText = inlineEditor.document.getText(true); - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBeTruthy(); expect(hostEditor.document.isDirty).toBeTruthy(); - + // verify focus is in inline editor expect(inlineEditor.hasFocus()).toBeTruthy(); - + // execute file save command waitsForDone(testWindow.executeCommand(Commands.FILE_SAVE), "save timeout", 1000); }); - + runs(function () { // read saved inline file contents FileUtils.readAsText(inlineEditor.document.file).done(function (text) { @@ -890,7 +898,7 @@ define(function (require, exports, module) { }).fail(function () { err = true; }); - + // read saved host editor file contents FileUtils.readAsText(hostEditor.document.file).done(function (text) { savedHostText = text; @@ -898,13 +906,13 @@ define(function (require, exports, module) { err = true; }); }); - + waitsFor(function () { return savedInlineText !== undefined && savedHostText !== undefined; }, "readAsText timeout", 1000); - + runs(function () { expect(savedInlineText).toEqual(newInlineText); expect(savedHostText).toEqual(infos["test1.html"].text); // i.e, should be unchanged - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBeFalsy(); expect(hostEditor.document.isDirty).toBeTruthy(); @@ -912,9 +920,9 @@ define(function (require, exports, module) { inlineEditor = hostEditor = null; }); }); - + describe("Inline Editor syncing from disk", function () { - + it("should close inline editor when file deleted on disk", function () { // Create an expendable CSS file var fileToWrite; @@ -928,37 +936,37 @@ define(function (require, exports, module) { .fail(function (err) { console.log(err); }); - + waitsForDone(promise, "writeText tempCSS.css", 1000); }); - + // Open inline editor for that file runs(function () { initInlineTest("test1.html", 6, true); }); // initInlineTest() inserts a waitsFor() automatically, so must end runs() block here - + runs(function () { var hostEditor = EditorManager.getCurrentFullEditor(); expect(hostEditor.getInlineWidgets().length).toBe(1); }); - + // Delete the file runs(function () { waitsForDone(SpecRunnerUtils.deletePath(fileToWrite.fullPath)); }); - + // Ping FileSyncManager to recognize the deletion runs(function () { FileSyncManager.syncOpenDocuments(); }); - + // Verify inline is now closed waitsFor(function () { var hostEditor = EditorManager.getCurrentFullEditor(); return (hostEditor.getInlineWidgets().length === 0); }, 1000); - + // Cleanup: initInlineTest() saves contents of all files in the project and rewrites // them back to disk at the end (to restore any stripped offset markers). But in this // case we really want the temp file to stay gone. @@ -966,36 +974,36 @@ define(function (require, exports, module) { delete infos["tempCSS.css"]; }); }); - + // FUTURE: Eventually we'll instead want it to stay open and revert to the content on disk. // Editor's syncing code can't yet handle blowing away the whole Document like that, though. it("should close inline when file is closed without saving changes", function () { initInlineTest("test1.html", 1); - + var newText = "\n/* jasmine was here */", hostEditor, inlineEditor, promise; - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // verify inline is open expect(hostEditor.getInlineWidgets().length).toBe(1); - + // insert text at the inline editor's cursor position inlineEditor._codeMirror.replaceRange(newText, inlineEditor.getCursorPos()); - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBe(true); - + // close the main editor / working set entry for the inline's file promise = testWindow.executeCommand(Commands.FILE_CLOSE, {file: inlineEditor.document.file}); - + // synchronously click the don't save button, // asynchronously wait for the dialog to close and the Dialog's - // promise to resolve. + // promise to resolve. SpecRunnerUtils.clickDialogButton(Dialogs.DIALOG_BTN_DONTSAVE); }); @@ -1005,7 +1013,7 @@ define(function (require, exports, module) { runs(function () { waitsForDone(promise); }); - + runs(function () { // verify inline is closed expect(hostEditor.getInlineWidgets().length).toBe(0); @@ -1014,78 +1022,78 @@ define(function (require, exports, module) { }); }); }); - - + + describe("Bi-directional Editor Synchronizing", function () { // For these tests we *deliberately* use Editor._codeMirror instead of Document to make edits, // in order to test Editor->Document syncing (instead of Document->Editor). - + it("should not add an inline document to the working set without being edited", function () { initInlineTest("test1.html", 0); - + runs(function () { var i = MainViewManager.findInWorkingSet(MainViewManager.ACTIVE_PANE, infos["test1.css"].fileEntry.fullPath); expect(i).toEqual(-1); }); }); - + it("should add dirty documents to the working set", function () { initInlineTest("test1.html", 1); - + var inlineEditor, widgetHeight; - + runs(function () { inlineEditor = EditorManager.getCurrentFullEditor().getInlineWidgets()[0].editor; widgetHeight = inlineEditor.totalHeight(); - + // change inline editor content var newLines = ".bar {\ncolor: #f00;\n}\n.cat {\ncolor: #f00;\n}"; - + // insert new lines at current cursor position inlineEditor._codeMirror.replaceRange( newLines, inlineEditor.getCursorPos() ); - + var i = MainViewManager.findInWorkingSet(MainViewManager.ACTIVE_PANE, infos["test1.css"].fileEntry.fullPath); expect(i).toEqual(1); inlineEditor = null; }); }); - + it("should sync edits between full and inline editors", function () { var fullEditor, inlineEditor, newInlineText = "/* jasmine was inline */\n"; - + initInlineTest("test1.html", 1, true, ["test1.css"]); - + runs(function () { var cssPath = infos["test1.css"].fileEntry.fullPath; var cssDoc = DocumentManager.getOpenDocumentForPath(cssPath); - + // edit the inline editor inlineEditor = EditorManager.getCurrentFullEditor().getInlineWidgets()[0].editor; inlineEditor._codeMirror.replaceRange( newInlineText, inlineEditor.getCursorPos() ); - + // activate the full editor MainViewManager._edit(MainViewManager.ACTIVE_PANE, cssDoc); fullEditor = EditorManager.getCurrentFullEditor(); - + // sanity check expect(fullEditor).not.toBe(inlineEditor); expect(fullEditor._codeMirror).not.toBe(inlineEditor._codeMirror); - + // compare inline editor to full editor expectTextToBeEqual(inlineEditor, fullEditor); - + // make sure the text was inserted expect(fullEditor._codeMirror.getValue().indexOf(newInlineText)).toBeGreaterThan(0); - + // edit in the full editor and compare fullEditor._codeMirror.replaceRange( newInlineText, @@ -1097,9 +1105,9 @@ define(function (require, exports, module) { }); }); }); - + describe("Inline Editor range updating", function () { - + var fullEditor, hostEditor, inlineEditor, @@ -1112,20 +1120,20 @@ define(function (require, exports, module) { endOfEnd, after, wayafter; - + beforeEach(function () { initInlineTest("test1.html", 1, true, ["test1.css"]); - + runs(function () { var cssPath = infos["test1.css"].fileEntry.fullPath; var cssDoc = DocumentManager.getOpenDocumentForPath(cssPath); hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // activate the full editor MainViewManager._edit(MainViewManager.ACTIVE_PANE, cssDoc); fullEditor = EditorManager.getCurrentFullEditor(); - + // alias offsets to nice names before = infos["test1.css"].offsets[4]; start = infos["test1.css"].offsets[1]; @@ -1143,22 +1151,22 @@ define(function (require, exports, module) { hostEditor = null; inlineEditor = null; }); - + it("should insert new line at start of range, and stay open on undo", function () { - // insert new line at start of inline range--the new line should be included in + // insert new line at start of inline range--the new line should be included in // the inline fullEditor._codeMirror.replaceRange( newInlineText, start ); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 1)); - + // undo is equivalent to deleting the first line in the range: shouldn't close the editor fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); }); - + it("should insert new line within first line of range, and stay open on undo", function () { // insert new line in middle of first line of inline range--the new line should // be included @@ -1167,18 +1175,18 @@ define(function (require, exports, module) { {line: start.line, ch: start.ch + 1} ); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 1)); - + // Even though the edit didn't start at the beginning of the line, the undo touches // the whole line; but deleting the first line still shouldn't close the editor fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); }); - + it("should not close inline when undoing changes to first line in range that did not include newlines", function () { // undo is NOT deleting the entire first line in these cases, so the inline should be able to stay open - - // insert new text at start of inline range, without newlines--the new text should be included in + + // insert new text at start of inline range, without newlines--the new text should be included in // the inline fullEditor._codeMirror.replaceRange( ".bar, ", @@ -1188,7 +1196,7 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // replace text at start of inline range with text without newlines fullEditor._codeMirror.replaceRange( ".bar", @@ -1199,7 +1207,7 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert new text in middle of first line in range, without newlines fullEditor._codeMirror.replaceRange( "ABCD", @@ -1210,10 +1218,10 @@ define(function (require, exports, module) { expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); }); - + it("should sync deletions (and their undos) on last line in range, with or without newlines", function () { // undo is NOT deleting the entire last line in these cases, so the inline should be able to stay open - + // insert new line in middle of last line of inline range--the new line should // be included fullEditor._codeMirror.replaceRange( @@ -1224,7 +1232,7 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert new line at end of last line of inline range--the new line should // be included fullEditor._codeMirror.replaceRange( @@ -1235,7 +1243,7 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // replace all text on last line (without replacing trailing newline) fullEditor._codeMirror.replaceRange( "ABCD", @@ -1257,7 +1265,7 @@ define(function (require, exports, module) { expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line + 1, end.line + 1)); fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert line within inline range fullEditor._codeMirror.replaceRange( newInlineText, @@ -1266,7 +1274,7 @@ define(function (require, exports, module) { expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 1)); fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert line at end of inline range fullEditor._codeMirror.replaceRange( newInlineText, @@ -1275,7 +1283,7 @@ define(function (require, exports, module) { expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 1)); fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert line below inline range fullEditor._codeMirror.replaceRange( newInlineText, @@ -1285,14 +1293,14 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); }); - + it("should sync deletions from the full editor and update the visual range of the inline editor", function () { // delete line within inline range fullEditor._codeMirror.replaceRange("", middle, end); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line - 1)); fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // delete line below inline range fullEditor._codeMirror.replaceRange("", after, wayafter); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); @@ -1352,8 +1360,8 @@ define(function (require, exports, module) { fullEditor._codeMirror.replaceRange("", middleOfMiddle, wayafter); expect(hostEditor.getInlineWidgets().length).toBe(0); }); - - + + it("should sync insertions with multiple change objects in one event", function () { // Insert two new lines: one at start of inline range, the other at the (newly // updated) end of range. The edits are batched into just one event (so the @@ -1372,19 +1380,19 @@ define(function (require, exports, module) { ); }); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 2)); - + // TODO: can't do our usual undo + re-check range test at the end, because of // codemirror/CodeMirror bug #487 }); - - + + it("should sync multiple edits between full and inline editors", function () { var i, editor, text, newInlineText = "/* jasmine was inline */\n", newFullText = "/* full editor edit */\n"; - + // alternate editors while inserting new text for (i = 0; i < 10; i++) { editor = (i % 2 === 0) ? fullEditor : inlineEditor; @@ -1396,25 +1404,25 @@ define(function (require, exports, module) { expectTextToBeEqual(inlineEditor, fullEditor); } }); - + it("should close inline if the contents of the full editor are all deleted", function () { // verify inline is open expect(hostEditor.getInlineWidgets().length).toBe(1); - + // delete all text via full editor fullEditor._codeMirror.setValue(""); - + // verify inline is closed expect(hostEditor.getInlineWidgets().length).toBe(0); }); - + it("should sync after undoing and redoing an edit", function () { var originalText, editedText, newInlineText = "/* jasmine was inline */\n"; - + originalText = inlineEditor._codeMirror.getValue(); - + // edit the inline editor in the middle of the text so it doesn't // run into one of the collapsing cases inlineEditor._codeMirror.replaceRange( @@ -1422,44 +1430,44 @@ define(function (require, exports, module) { middle ); editedText = inlineEditor._codeMirror.getValue(); - + // compare inline editor to full editor expectTextToBeEqual(inlineEditor, fullEditor); - + // undo the inline editor inlineEditor._codeMirror.undo(); expectTextToBeEqual(inlineEditor, fullEditor); expectText(inlineEditor).toBe(originalText); - + // redo the inline editor inlineEditor._codeMirror.redo(); expectTextToBeEqual(inlineEditor, fullEditor); expectText(inlineEditor).toBe(editedText); - + // undo the full editor fullEditor._codeMirror.undo(); expectTextToBeEqual(inlineEditor, fullEditor); expectText(fullEditor).toBe(originalText); - + // redo the full editor fullEditor._codeMirror.redo(); expectTextToBeEqual(inlineEditor, fullEditor); expectText(fullEditor).toBe(editedText); }); - + }); - + describe("Multiple inline editor interaction", function () { var hostEditor, inlineEditor; beforeEach(function () { initInlineTest("test1.html", 1, true, ["test1.css"]); - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; }); }); - + afterEach(function () { hostEditor = null; inlineEditor = null; @@ -1467,7 +1475,7 @@ define(function (require, exports, module) { it("should keep range consistent after undo/redo (bug #1031)", function () { var secondInlineOpen = false, secondInlineEditor; - + // open inline editor at specified offset index runs(function () { hostEditor.focus(); @@ -1478,9 +1486,9 @@ define(function (require, exports, module) { secondInlineOpen = isOpen; }); }); - + waitsFor(function () { return secondInlineOpen; }, "second inline open timeout", 1000); - + // Not sure why we have to wait in between these for the bug to occur, but we do. runs(function () { secondInlineEditor = hostEditor.getInlineWidgets()[1].editor; @@ -1499,37 +1507,37 @@ define(function (require, exports, module) { }); }); }); - - + + describe("Inline Editor range equal to file range", function () { var fullEditor, hostEditor, inlineEditor; - + beforeEach(function () { initInlineTest("test1.html", 5, true, ["testOneRuleFile.css"]); - + runs(function () { var cssPath = infos["testOneRuleFile.css"].fileEntry.fullPath; var cssDoc = DocumentManager.getOpenDocumentForPath(cssPath); hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // activate the full editor MainViewManager._edit(MainViewManager.ACTIVE_PANE, cssDoc); fullEditor = EditorManager.getCurrentFullEditor(); }); }); - + afterEach(function () { fullEditor = null; hostEditor = null; inlineEditor = null; }); - + it("should delete line at bottom and not close on undo", function () { expect(inlineEditor).toHaveInlineEditorRange(toRange(0, 2)); - + // delete all of last line in range fullEditor._codeMirror.replaceRange("", {line: 1, ch: 16}, {line: 2, ch: 1}); expect(hostEditor.getInlineWidgets().length).toBe(1); @@ -1538,10 +1546,10 @@ define(function (require, exports, module) { expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(0, 2)); }); - + it("should insert new line at bottom and not close on undo", function () { expect(inlineEditor).toHaveInlineEditorRange(toRange(0, 2)); - + // delete all of last line in range fullEditor._codeMirror.replaceRange("\n/* New last line */", {line: 2, ch: 1}); expect(hostEditor.getInlineWidgets().length).toBe(1); @@ -1552,25 +1560,25 @@ define(function (require, exports, module) { }); }); }); - + describe("InlineEditor provider prioritization", function () { var testWindow, testDocumentManager, testEditorManager, testMainViewManager, testDoc; - + function getPositiveProviderCallback(widget) { return function () { widget.called = true; return $.Deferred().resolve(widget).promise(); }; } - + function negativeProviderCallback() { return null; } - + beforeEach(function () { SpecRunnerUtils.createTestWindowAndRun(this, function (w) { var mock = SpecRunnerUtils.createMockEditor(""); @@ -1579,17 +1587,17 @@ define(function (require, exports, module) { testEditorManager = testWindow.brackets.test.EditorManager; testMainViewManager = testWindow.brackets.test.MainViewManager; testDocumentManager = testWindow.brackets.test.DocumentManager; - + testDoc = mock.doc; - + testDocumentManager.getOpenDocumentForPath = function (fullPath) { return testDoc; }; - + testMainViewManager._edit(testMainViewManager.ACTIVE_PANE, testDoc); }); }); - + afterEach(function () { SpecRunnerUtils.destroyMockEditor(testDoc); SpecRunnerUtils.closeTestWindow(); @@ -1600,41 +1608,41 @@ define(function (require, exports, module) { testMainViewManager = null; testDocumentManager = null; }); - - + + it("should prefer positive higher priority providers (1)", function () { var widget0 = new InlineWidget(), widget1 = new InlineWidget(), widget2 = new InlineWidget(); - + testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget0)); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget1), 1); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget2), 2); - + runs(function () { testWindow.executeCommand(Commands.TOGGLE_QUICK_EDIT); }); - + runs(function () { expect(widget0.called).toBeFalsy(); expect(widget1.called).toBeFalsy(); expect(widget2.called).toBe(true); }); }); - + it("should prefer positive higher priority providers (2)", function () { var widget0 = new InlineWidget(), widget1 = new InlineWidget(), widget2 = new InlineWidget(); - + testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget2), 2); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget1), 1); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget0)); - + runs(function () { testWindow.executeCommand(Commands.TOGGLE_QUICK_EDIT); }); - + runs(function () { expect(widget0.called).toBeFalsy(); expect(widget1.called).toBeFalsy(); @@ -1647,17 +1655,17 @@ define(function (require, exports, module) { var widget0 = new InlineWidget(), widget1 = new InlineWidget(), widget2 = new InlineWidget(); - + testEditorManager.registerInlineEditProvider(negativeProviderCallback, 2); testEditorManager.registerInlineEditProvider(negativeProviderCallback, 1); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget0)); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget1), -1); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget2), -2); - + runs(function () { testWindow.executeCommand(Commands.TOGGLE_QUICK_EDIT); }); - + runs(function () { expect(widget0.called).toBe(true); expect(widget1.called).toBeFalsy(); @@ -1665,7 +1673,7 @@ define(function (require, exports, module) { }); }); - + }); }); }); From e82d09c66c548adde22c2287e39df6ee1050be32 Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Thu, 9 Oct 2014 15:20:13 -0700 Subject: [PATCH 161/182] - add all missing whitespace --- test/spec/InlineEditorProviders-test.js | 492 ++++++++++++------------ 1 file changed, 246 insertions(+), 246 deletions(-) diff --git a/test/spec/InlineEditorProviders-test.js b/test/spec/InlineEditorProviders-test.js index 26bce99a4a9..9f5a059cedc 100644 --- a/test/spec/InlineEditorProviders-test.js +++ b/test/spec/InlineEditorProviders-test.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -27,7 +27,7 @@ define(function (require, exports, module) { 'use strict'; - + var CommandManager, // loaded from brackets.test Commands, // loaded from brackets.test EditorManager, // loaded from brackets.test @@ -43,18 +43,18 @@ define(function (require, exports, module) { Strings = require("strings"); describe("InlineEditorProviders", function () { - + this.category = "integration"; var testPath = SpecRunnerUtils.getTestPath("/spec/InlineEditorProviders-test-files"), tempPath = SpecRunnerUtils.getTempDirectory(), testWindow, infos = {}; - + function toRange(startLine, endLine) { return {startLine: startLine, endLine: endLine}; } - + function rewriteProject() { var result = new $.Deferred(), options = { @@ -68,17 +68,17 @@ define(function (require, exports, module) { }).fail(function () { result.reject(); }); - + return result.promise(); } - + /** * Performs setup for an inline editor test. Parses offsets (saved to infos) for all files in * the test project (testPath) and saves files back to disk without offset markup. * When finished, open an editor for the specified project relative file path * then attempts opens an inline editor at the given offset. Installs an after() * function restore all file content back to original state with offset markup. - * + * * @param {string} openFile Project relative file path to open in a main editor. * @param {number} openOffset The offset index location within openFile to open an inline editor. * @param {boolean=} expectInline Use false to verify that an inline editor should not be opened. Omit otherwise. @@ -86,25 +86,25 @@ define(function (require, exports, module) { */ function initInlineTest(openFile, openOffset, expectInline, documentList) { var editor; - + documentList = documentList || []; - + expectInline = (expectInline !== undefined) ? expectInline : true; - + runs(function () { documentList.push(openFile); waitsForDone(SpecRunnerUtils.openProjectFiles(documentList), "FILE_OPEN timeout", 1000); }); - + runs(function () { editor = EditorManager.getCurrentFullEditor(); - + // open inline editor at specified offset index var inlineEditorResult = SpecRunnerUtils.toggleQuickEditAtOffset( editor, infos[openFile].offsets[openOffset] ); - + if (expectInline) { waitsForDone(inlineEditorResult, "inline editor opened", 1000); } else { @@ -116,7 +116,7 @@ define(function (require, exports, module) { if (expectInline) { var inlineWidgets = editor.getInlineWidgets(); expect(inlineWidgets.length).toBe(1); - + // By the time we're called, the content of the widget should be in the DOM and have a nontrivial height. expect($.contains(testWindow.document.documentElement, inlineWidgets[0].htmlContent)).toBe(true); expect(inlineWidgets[0].$htmlContent.height()).toBeGreaterThan(50); @@ -125,16 +125,16 @@ define(function (require, exports, module) { editor = null; }); } - + // Utilities for testing Editor state function expectText(editor) { return expect(editor._codeMirror.getValue()); } - + function expectTextToBeEqual(editor1, editor2) { expect(editor1._codeMirror.getValue()).toBe(editor2._codeMirror.getValue()); } - + function isLineHidden(cm, lineNum) { var markers = cm.findMarksAt({line: lineNum, pos: 0}), i; @@ -161,7 +161,7 @@ define(function (require, exports, module) { expect(popoverText).toEqual(text); }); } - + function getBounds(object, useOffset) { var left = (useOffset ? object.offset().left : parseInt(object.css("left"), 10)), top = (useOffset ? object.offset().top : parseInt(object.css("top"), 10)); @@ -198,7 +198,7 @@ define(function (require, exports, module) { * These tests are primarily focused on the InlineEditorProvider module. */ describe("htmlToCSSProvider", function () { - + beforeFirst(function () { SpecRunnerUtils.createTempDirectory(); @@ -206,11 +206,11 @@ define(function (require, exports, module) { runs(function () { waitsForDone(rewriteProject(), "rewriteProject timeout", 1000); }); - + // Create a new window that will be shared by ALL tests in this spec. SpecRunnerUtils.createTestWindowAndRun(this, function (w) { testWindow = w; - + // Load module instances from brackets.test CommandManager = testWindow.brackets.test.CommandManager; Commands = testWindow.brackets.test.Commands; @@ -221,7 +221,7 @@ define(function (require, exports, module) { FileViewController = testWindow.brackets.test.FileViewController; }); }); - + afterLast(function () { testWindow = null; Commands = null; @@ -234,7 +234,7 @@ define(function (require, exports, module) { SpecRunnerUtils.removeTempDirectory(); }); - + beforeEach(function () { this.addMatchers({ toHaveInlineEditorRange: function (range) { @@ -247,10 +247,10 @@ define(function (require, exports, module) { startLine = range.startLine, endLine = range.endLine, visibleRangeCheck; - + for (i = 0; i < lineCount; i++) { hidden = isLineHidden(editor._codeMirror, i); - + if (i < startLine) { if (!hidden) { shouldHide.push(i); // lines above start line should be hidden @@ -265,44 +265,44 @@ define(function (require, exports, module) { } } } - + visibleRangeCheck = (editor._visibleRange.startLine === startLine) && (editor._visibleRange.endLine === endLine); - + this.message = function () { var msg = ""; - + if (shouldHide.length > 0) { msg += "Expected inline editor to hide [" + shouldHide.toString() + "].\n"; } - + if (shouldShow.length > 0) { msg += "Expected inline editor to show [" + shouldShow.toString() + "].\n"; } - + if (!visibleRangeCheck) { msg += "Editor._visibleRange [" + editor._visibleRange.startLine + "," + editor._visibleRange.endLine + "] should be [" + startLine + "," + endLine + "]."; } - + return msg; }; - + return (shouldHide.length === 0) && (shouldShow.length === 0) && visibleRangeCheck; } }); - + SpecRunnerUtils.loadProjectInTestWindow(tempPath); }); - + afterEach(function () { //debug visual confirmation of inline editor //waits(1000); - + // revert files to original content with offset markup testWindow.closeAllFiles(); }); @@ -310,40 +310,40 @@ define(function (require, exports, module) { it("should open a type selector and show correct range including the embedded php", function () { initInlineTest("test1.php", 1); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position and displayed range in inline editor expect(inlinePos).toEqual(infos["test1.php"].offsets[0]); expect(inlineWidget.editor).toHaveInlineEditorRange(toRange(4, 8)); - + inlineWidget = null; }); }); - + it("should open a type selector on opening tag", function () { initInlineTest("test1.html", 0); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[0]); inlineWidget = null; }); }); - + it("should open a type selector on closing tag", function () { initInlineTest("test1.html", 9); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[0]); @@ -353,11 +353,11 @@ define(function (require, exports, module) { it("should open a class selector", function () { initInlineTest("test1.html", 1); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[1]); @@ -367,11 +367,11 @@ define(function (require, exports, module) { it("should also open a class selector", function () { initInlineTest("test1.html", 7); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[1]); @@ -381,11 +381,11 @@ define(function (require, exports, module) { it("should open an embedded class selector", function () { initInlineTest("test1.html", 10); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.html"].offsets[11]); @@ -395,11 +395,11 @@ define(function (require, exports, module) { it("should open an id selector", function () { initInlineTest("test1.html", 2); - + runs(function () { var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0]; var inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[2]); @@ -451,36 +451,36 @@ define(function (require, exports, module) { inlineWidget = null; }); }); - - + + it("should close, then remove the inline widget and restore focus", function () { initInlineTest("test1.html", 0); - + var hostEditor, inlineWidget, inlinePos, savedPos; - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); savedPos = hostEditor.getCursorPos(); inlineWidget = hostEditor.getInlineWidgets()[0]; inlinePos = inlineWidget.editor.getCursorPos(); - + // verify cursor position & focus in inline editor expect(inlinePos).toEqual(infos["test1.css"].offsets[0]); expect(inlineWidget.hasFocus()).toEqual(true); expect(hostEditor.hasFocus()).toEqual(false); - + // close the editor waitsForDone(EditorManager.closeInlineWidget(hostEditor, inlineWidget), "closing inline widget"); - + }); - + runs(function () { // verify no inline widgets in list expect(hostEditor.getInlineWidgets().length).toBe(0); - + // verify that the inline widget's content has been removed from the DOM expect($.contains(testWindow.document.documentElement, inlineWidget.htmlContent)).toBe(false); - + // verify full editor cursor & focus restored expect(savedPos).toEqual(hostEditor.getCursorPos()); expect(hostEditor.hasFocus()).toEqual(true); @@ -514,7 +514,7 @@ define(function (require, exports, module) { it("should not open an inline editor when positioned on textContent", function () { initInlineTest("test1.html", 3, false); - + runs(function () { // verify no inline editor open expect(EditorManager.getCurrentFullEditor().getInlineWidgets().length).toBe(0); @@ -529,7 +529,7 @@ define(function (require, exports, module) { // The call to `waits(4000)` in this test seems to dismiss the popover xit("should not open an inline editor when positioned on title attribute", function () { initInlineTest("test1.html", 12, false); - + runs(function () { // verify no inline editor open expect(EditorManager.getCurrentFullEditor().getInlineWidgets().length).toBe(0); @@ -546,7 +546,7 @@ define(function (require, exports, module) { var $popover = testWindow.$(".popover-message"); expect($popover.length).toEqual(1); }); - + runs(function () { // verify popover message is automatically dismissed after 2 more seconds // total delay is 5 sec + 0.5 sec fade-out transition @@ -562,16 +562,16 @@ define(function (require, exports, module) { it("should not open an inline editor when positioned on a tag in a comment", function () { initInlineTest("test1.html", 4, false); - + runs(function () { // verify no inline editor open expect(EditorManager.getCurrentFullEditor().getInlineWidgets().length).toBe(0); }); }); - + it("should open an inline editor when positioned on the non standard html tag , but no content from @keyframes", function () { initInlineTest("test1.html", 18); - + runs(function () { // verify inline editor is open for adding a new rule expect(EditorManager.getCurrentFullEditor().getInlineWidgets().length).toBe(1); @@ -617,8 +617,8 @@ define(function (require, exports, module) { expect($popover.length).toEqual(1); }); }); - - + + it("should close popover message on selection change", function () { var editor, openFile = "test1.html"; @@ -649,7 +649,7 @@ define(function (require, exports, module) { expect($popover.length).toEqual(0); }); }); - + it("should position message popover inside left edge of window", function () { var $popover; initInlineTest("test1.html", 11, false); @@ -720,49 +720,49 @@ define(function (require, exports, module) { toggleOption(Commands.TOGGLE_WORD_WRAP, "Toggle word-wrap"); }); }); - + it("should increase size based on content", function () { initInlineTest("test1.html", 1); - + var inlineEditor, widgetHeight; - + runs(function () { inlineEditor = EditorManager.getCurrentFullEditor().getInlineWidgets()[0].editor; widgetHeight = inlineEditor.totalHeight(); - + // verify original line count expect(inlineEditor.lineCount()).toBe(25); - + // change inline editor content var newLines = ".bar {\ncolor: #f00;\n}\n.cat {\ncolor: #f00;\n}"; - + // insert new lines at current cursor position // can't mutate document directly at this point inlineEditor._codeMirror.replaceRange( newLines, inlineEditor.getCursorPos() ); - + // verify widget resizes when contents is changed expect(inlineEditor.lineCount()).toBe(30); expect(inlineEditor.totalHeight()).toBeGreaterThan(widgetHeight); - + inlineEditor = null; }); }); - + it("should decrease size based on content", function () { initInlineTest("test1.html", 1); - + var inlineEditor, widgetHeight; - + runs(function () { inlineEditor = EditorManager.getCurrentFullEditor().getInlineWidgets()[0].editor; widgetHeight = inlineEditor.totalHeight(); - + // verify original line count expect(inlineEditor.lineCount()).toBe(25); - + // replace the entire .foo rule with an empty string // set text on the editor, can't mutate document directly at this point inlineEditor._codeMirror.replaceRange( @@ -770,7 +770,7 @@ define(function (require, exports, module) { inlineEditor.getCursorPos(), infos["test1.css"].offsets[3] ); - + // verify widget resizes when contents is changed expect(inlineEditor.lineCount()).toBe(23); expect(inlineEditor.totalHeight()).toBeLessThan(widgetHeight); @@ -778,52 +778,52 @@ define(function (require, exports, module) { inlineEditor = null; }); }); - + it("should save changes in the inline editor", function () { initInlineTest("test1.html", 1); - + var err = false, hostEditor, inlineEditor, newText = "\n/* jasmine was here */", savedText; - + this.after(function () { // rewrite the project after saving changes runs(function () { waitsForDone(rewriteProject(), "rewriteProject timeout", 1000); }); }); - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // insert text at the inline editor's cursor position // can't mutate document directly at this point inlineEditor._codeMirror.replaceRange(newText, inlineEditor.getCursorPos()); - + // we're going to compare this to disk later, so pass true to get non-normalized line endings newText = inlineEditor.document.getText(true); - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBeTruthy(); expect(hostEditor.document.isDirty).toBeFalsy(); - + // verify that the dirty dot is visible in the UI expect(testWindow.$(".dirty-indicator", hostEditor.getInlineWidgets()[0].$htmlContent).width()).not.toEqual(0); - + // verify focus is in inline editor expect(inlineEditor.hasFocus()).toBeTruthy(); - + // execute file save command waitsForDone(testWindow.executeCommand(Commands.FILE_SAVE), "save timeout", 1000); }); - + runs(function () { // verify focus is still in inline editor expect(inlineEditor.hasFocus()).toBeTruthy(); - + // read saved file contents FileUtils.readAsText(inlineEditor.document.file).done(function (text) { savedText = text; @@ -831,26 +831,26 @@ define(function (require, exports, module) { err = true; }); }); - + waitsFor(function () { return savedText !== undefined; }, "readAsText timeout", 1000); - + runs(function () { expect(savedText).toEqual(newText); - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBeFalsy(); expect(hostEditor.document.isDirty).toBeFalsy(); // verify that the dirty dot is hidden in the UI expect(testWindow.$(".dirty-indicator", hostEditor.getInlineWidgets()[0].$htmlContent).width()).toEqual(0); - + inlineEditor = hostEditor = null; }); }); - + it("should not save changes in the host editor", function () { initInlineTest("test1.html", 1); - + var err = false, hostEditor, inlineEditor, @@ -858,39 +858,39 @@ define(function (require, exports, module) { newHostText = "/* jasmine was here */\n", savedInlineText, savedHostText; - + this.after(function () { // rewrite the project after saving changes runs(function () { waitsForDone(rewriteProject(), "rewriteProject timeout", 1000); }); }); - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // insert text at the host editor's cursor position hostEditor._codeMirror.replaceRange(newHostText, hostEditor.getCursorPos()); - + // insert text at the inline editor's cursor position // can't mutate document directly at this point inlineEditor._codeMirror.replaceRange(newInlineText, inlineEditor.getCursorPos()); - + // we're going to compare this to disk later, so pass true to get non-normalized line endings newInlineText = inlineEditor.document.getText(true); - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBeTruthy(); expect(hostEditor.document.isDirty).toBeTruthy(); - + // verify focus is in inline editor expect(inlineEditor.hasFocus()).toBeTruthy(); - + // execute file save command waitsForDone(testWindow.executeCommand(Commands.FILE_SAVE), "save timeout", 1000); }); - + runs(function () { // read saved inline file contents FileUtils.readAsText(inlineEditor.document.file).done(function (text) { @@ -898,7 +898,7 @@ define(function (require, exports, module) { }).fail(function () { err = true; }); - + // read saved host editor file contents FileUtils.readAsText(hostEditor.document.file).done(function (text) { savedHostText = text; @@ -906,13 +906,13 @@ define(function (require, exports, module) { err = true; }); }); - + waitsFor(function () { return savedInlineText !== undefined && savedHostText !== undefined; }, "readAsText timeout", 1000); - + runs(function () { expect(savedInlineText).toEqual(newInlineText); expect(savedHostText).toEqual(infos["test1.html"].text); // i.e, should be unchanged - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBeFalsy(); expect(hostEditor.document.isDirty).toBeTruthy(); @@ -920,9 +920,9 @@ define(function (require, exports, module) { inlineEditor = hostEditor = null; }); }); - + describe("Inline Editor syncing from disk", function () { - + it("should close inline editor when file deleted on disk", function () { // Create an expendable CSS file var fileToWrite; @@ -936,37 +936,37 @@ define(function (require, exports, module) { .fail(function (err) { console.log(err); }); - + waitsForDone(promise, "writeText tempCSS.css", 1000); }); - + // Open inline editor for that file runs(function () { initInlineTest("test1.html", 6, true); }); // initInlineTest() inserts a waitsFor() automatically, so must end runs() block here - + runs(function () { var hostEditor = EditorManager.getCurrentFullEditor(); expect(hostEditor.getInlineWidgets().length).toBe(1); }); - + // Delete the file runs(function () { waitsForDone(SpecRunnerUtils.deletePath(fileToWrite.fullPath)); }); - + // Ping FileSyncManager to recognize the deletion runs(function () { FileSyncManager.syncOpenDocuments(); }); - + // Verify inline is now closed waitsFor(function () { var hostEditor = EditorManager.getCurrentFullEditor(); return (hostEditor.getInlineWidgets().length === 0); }, 1000); - + // Cleanup: initInlineTest() saves contents of all files in the project and rewrites // them back to disk at the end (to restore any stripped offset markers). But in this // case we really want the temp file to stay gone. @@ -974,36 +974,36 @@ define(function (require, exports, module) { delete infos["tempCSS.css"]; }); }); - + // FUTURE: Eventually we'll instead want it to stay open and revert to the content on disk. // Editor's syncing code can't yet handle blowing away the whole Document like that, though. it("should close inline when file is closed without saving changes", function () { initInlineTest("test1.html", 1); - + var newText = "\n/* jasmine was here */", hostEditor, inlineEditor, promise; - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // verify inline is open expect(hostEditor.getInlineWidgets().length).toBe(1); - + // insert text at the inline editor's cursor position inlineEditor._codeMirror.replaceRange(newText, inlineEditor.getCursorPos()); - + // verify isDirty flag expect(inlineEditor.document.isDirty).toBe(true); - + // close the main editor / working set entry for the inline's file promise = testWindow.executeCommand(Commands.FILE_CLOSE, {file: inlineEditor.document.file}); - + // synchronously click the don't save button, // asynchronously wait for the dialog to close and the Dialog's - // promise to resolve. + // promise to resolve. SpecRunnerUtils.clickDialogButton(Dialogs.DIALOG_BTN_DONTSAVE); }); @@ -1013,7 +1013,7 @@ define(function (require, exports, module) { runs(function () { waitsForDone(promise); }); - + runs(function () { // verify inline is closed expect(hostEditor.getInlineWidgets().length).toBe(0); @@ -1022,78 +1022,78 @@ define(function (require, exports, module) { }); }); }); - - + + describe("Bi-directional Editor Synchronizing", function () { // For these tests we *deliberately* use Editor._codeMirror instead of Document to make edits, // in order to test Editor->Document syncing (instead of Document->Editor). - + it("should not add an inline document to the working set without being edited", function () { initInlineTest("test1.html", 0); - + runs(function () { var i = MainViewManager.findInWorkingSet(MainViewManager.ACTIVE_PANE, infos["test1.css"].fileEntry.fullPath); expect(i).toEqual(-1); }); }); - + it("should add dirty documents to the working set", function () { initInlineTest("test1.html", 1); - + var inlineEditor, widgetHeight; - + runs(function () { inlineEditor = EditorManager.getCurrentFullEditor().getInlineWidgets()[0].editor; widgetHeight = inlineEditor.totalHeight(); - + // change inline editor content var newLines = ".bar {\ncolor: #f00;\n}\n.cat {\ncolor: #f00;\n}"; - + // insert new lines at current cursor position inlineEditor._codeMirror.replaceRange( newLines, inlineEditor.getCursorPos() ); - + var i = MainViewManager.findInWorkingSet(MainViewManager.ACTIVE_PANE, infos["test1.css"].fileEntry.fullPath); expect(i).toEqual(1); inlineEditor = null; }); }); - + it("should sync edits between full and inline editors", function () { var fullEditor, inlineEditor, newInlineText = "/* jasmine was inline */\n"; - + initInlineTest("test1.html", 1, true, ["test1.css"]); - + runs(function () { var cssPath = infos["test1.css"].fileEntry.fullPath; var cssDoc = DocumentManager.getOpenDocumentForPath(cssPath); - + // edit the inline editor inlineEditor = EditorManager.getCurrentFullEditor().getInlineWidgets()[0].editor; inlineEditor._codeMirror.replaceRange( newInlineText, inlineEditor.getCursorPos() ); - + // activate the full editor MainViewManager._edit(MainViewManager.ACTIVE_PANE, cssDoc); fullEditor = EditorManager.getCurrentFullEditor(); - + // sanity check expect(fullEditor).not.toBe(inlineEditor); expect(fullEditor._codeMirror).not.toBe(inlineEditor._codeMirror); - + // compare inline editor to full editor expectTextToBeEqual(inlineEditor, fullEditor); - + // make sure the text was inserted expect(fullEditor._codeMirror.getValue().indexOf(newInlineText)).toBeGreaterThan(0); - + // edit in the full editor and compare fullEditor._codeMirror.replaceRange( newInlineText, @@ -1105,9 +1105,9 @@ define(function (require, exports, module) { }); }); }); - + describe("Inline Editor range updating", function () { - + var fullEditor, hostEditor, inlineEditor, @@ -1120,20 +1120,20 @@ define(function (require, exports, module) { endOfEnd, after, wayafter; - + beforeEach(function () { initInlineTest("test1.html", 1, true, ["test1.css"]); - + runs(function () { var cssPath = infos["test1.css"].fileEntry.fullPath; var cssDoc = DocumentManager.getOpenDocumentForPath(cssPath); hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // activate the full editor MainViewManager._edit(MainViewManager.ACTIVE_PANE, cssDoc); fullEditor = EditorManager.getCurrentFullEditor(); - + // alias offsets to nice names before = infos["test1.css"].offsets[4]; start = infos["test1.css"].offsets[1]; @@ -1151,22 +1151,22 @@ define(function (require, exports, module) { hostEditor = null; inlineEditor = null; }); - + it("should insert new line at start of range, and stay open on undo", function () { - // insert new line at start of inline range--the new line should be included in + // insert new line at start of inline range--the new line should be included in // the inline fullEditor._codeMirror.replaceRange( newInlineText, start ); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 1)); - + // undo is equivalent to deleting the first line in the range: shouldn't close the editor fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); }); - + it("should insert new line within first line of range, and stay open on undo", function () { // insert new line in middle of first line of inline range--the new line should // be included @@ -1175,18 +1175,18 @@ define(function (require, exports, module) { {line: start.line, ch: start.ch + 1} ); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 1)); - + // Even though the edit didn't start at the beginning of the line, the undo touches // the whole line; but deleting the first line still shouldn't close the editor fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); }); - + it("should not close inline when undoing changes to first line in range that did not include newlines", function () { // undo is NOT deleting the entire first line in these cases, so the inline should be able to stay open - - // insert new text at start of inline range, without newlines--the new text should be included in + + // insert new text at start of inline range, without newlines--the new text should be included in // the inline fullEditor._codeMirror.replaceRange( ".bar, ", @@ -1196,7 +1196,7 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // replace text at start of inline range with text without newlines fullEditor._codeMirror.replaceRange( ".bar", @@ -1207,7 +1207,7 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert new text in middle of first line in range, without newlines fullEditor._codeMirror.replaceRange( "ABCD", @@ -1218,10 +1218,10 @@ define(function (require, exports, module) { expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); }); - + it("should sync deletions (and their undos) on last line in range, with or without newlines", function () { // undo is NOT deleting the entire last line in these cases, so the inline should be able to stay open - + // insert new line in middle of last line of inline range--the new line should // be included fullEditor._codeMirror.replaceRange( @@ -1232,7 +1232,7 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert new line at end of last line of inline range--the new line should // be included fullEditor._codeMirror.replaceRange( @@ -1243,7 +1243,7 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // replace all text on last line (without replacing trailing newline) fullEditor._codeMirror.replaceRange( "ABCD", @@ -1265,7 +1265,7 @@ define(function (require, exports, module) { expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line + 1, end.line + 1)); fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert line within inline range fullEditor._codeMirror.replaceRange( newInlineText, @@ -1274,7 +1274,7 @@ define(function (require, exports, module) { expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 1)); fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert line at end of inline range fullEditor._codeMirror.replaceRange( newInlineText, @@ -1283,7 +1283,7 @@ define(function (require, exports, module) { expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 1)); fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // insert line below inline range fullEditor._codeMirror.replaceRange( newInlineText, @@ -1293,14 +1293,14 @@ define(function (require, exports, module) { fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); }); - + it("should sync deletions from the full editor and update the visual range of the inline editor", function () { // delete line within inline range fullEditor._codeMirror.replaceRange("", middle, end); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line - 1)); fullEditor._codeMirror.undo(); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); - + // delete line below inline range fullEditor._codeMirror.replaceRange("", after, wayafter); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line)); @@ -1360,8 +1360,8 @@ define(function (require, exports, module) { fullEditor._codeMirror.replaceRange("", middleOfMiddle, wayafter); expect(hostEditor.getInlineWidgets().length).toBe(0); }); - - + + it("should sync insertions with multiple change objects in one event", function () { // Insert two new lines: one at start of inline range, the other at the (newly // updated) end of range. The edits are batched into just one event (so the @@ -1380,19 +1380,19 @@ define(function (require, exports, module) { ); }); expect(inlineEditor).toHaveInlineEditorRange(toRange(start.line, end.line + 2)); - + // TODO: can't do our usual undo + re-check range test at the end, because of // codemirror/CodeMirror bug #487 }); - - + + it("should sync multiple edits between full and inline editors", function () { var i, editor, text, newInlineText = "/* jasmine was inline */\n", newFullText = "/* full editor edit */\n"; - + // alternate editors while inserting new text for (i = 0; i < 10; i++) { editor = (i % 2 === 0) ? fullEditor : inlineEditor; @@ -1404,25 +1404,25 @@ define(function (require, exports, module) { expectTextToBeEqual(inlineEditor, fullEditor); } }); - + it("should close inline if the contents of the full editor are all deleted", function () { // verify inline is open expect(hostEditor.getInlineWidgets().length).toBe(1); - + // delete all text via full editor fullEditor._codeMirror.setValue(""); - + // verify inline is closed expect(hostEditor.getInlineWidgets().length).toBe(0); }); - + it("should sync after undoing and redoing an edit", function () { var originalText, editedText, newInlineText = "/* jasmine was inline */\n"; - + originalText = inlineEditor._codeMirror.getValue(); - + // edit the inline editor in the middle of the text so it doesn't // run into one of the collapsing cases inlineEditor._codeMirror.replaceRange( @@ -1430,44 +1430,44 @@ define(function (require, exports, module) { middle ); editedText = inlineEditor._codeMirror.getValue(); - + // compare inline editor to full editor expectTextToBeEqual(inlineEditor, fullEditor); - + // undo the inline editor inlineEditor._codeMirror.undo(); expectTextToBeEqual(inlineEditor, fullEditor); expectText(inlineEditor).toBe(originalText); - + // redo the inline editor inlineEditor._codeMirror.redo(); expectTextToBeEqual(inlineEditor, fullEditor); expectText(inlineEditor).toBe(editedText); - + // undo the full editor fullEditor._codeMirror.undo(); expectTextToBeEqual(inlineEditor, fullEditor); expectText(fullEditor).toBe(originalText); - + // redo the full editor fullEditor._codeMirror.redo(); expectTextToBeEqual(inlineEditor, fullEditor); expectText(fullEditor).toBe(editedText); }); - + }); - + describe("Multiple inline editor interaction", function () { var hostEditor, inlineEditor; beforeEach(function () { initInlineTest("test1.html", 1, true, ["test1.css"]); - + runs(function () { hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; }); }); - + afterEach(function () { hostEditor = null; inlineEditor = null; @@ -1475,7 +1475,7 @@ define(function (require, exports, module) { it("should keep range consistent after undo/redo (bug #1031)", function () { var secondInlineOpen = false, secondInlineEditor; - + // open inline editor at specified offset index runs(function () { hostEditor.focus(); @@ -1486,9 +1486,9 @@ define(function (require, exports, module) { secondInlineOpen = isOpen; }); }); - + waitsFor(function () { return secondInlineOpen; }, "second inline open timeout", 1000); - + // Not sure why we have to wait in between these for the bug to occur, but we do. runs(function () { secondInlineEditor = hostEditor.getInlineWidgets()[1].editor; @@ -1507,37 +1507,37 @@ define(function (require, exports, module) { }); }); }); - - + + describe("Inline Editor range equal to file range", function () { var fullEditor, hostEditor, inlineEditor; - + beforeEach(function () { initInlineTest("test1.html", 5, true, ["testOneRuleFile.css"]); - + runs(function () { var cssPath = infos["testOneRuleFile.css"].fileEntry.fullPath; var cssDoc = DocumentManager.getOpenDocumentForPath(cssPath); hostEditor = EditorManager.getCurrentFullEditor(); inlineEditor = hostEditor.getInlineWidgets()[0].editor; - + // activate the full editor MainViewManager._edit(MainViewManager.ACTIVE_PANE, cssDoc); fullEditor = EditorManager.getCurrentFullEditor(); }); }); - + afterEach(function () { fullEditor = null; hostEditor = null; inlineEditor = null; }); - + it("should delete line at bottom and not close on undo", function () { expect(inlineEditor).toHaveInlineEditorRange(toRange(0, 2)); - + // delete all of last line in range fullEditor._codeMirror.replaceRange("", {line: 1, ch: 16}, {line: 2, ch: 1}); expect(hostEditor.getInlineWidgets().length).toBe(1); @@ -1546,10 +1546,10 @@ define(function (require, exports, module) { expect(hostEditor.getInlineWidgets().length).toBe(1); expect(inlineEditor).toHaveInlineEditorRange(toRange(0, 2)); }); - + it("should insert new line at bottom and not close on undo", function () { expect(inlineEditor).toHaveInlineEditorRange(toRange(0, 2)); - + // delete all of last line in range fullEditor._codeMirror.replaceRange("\n/* New last line */", {line: 2, ch: 1}); expect(hostEditor.getInlineWidgets().length).toBe(1); @@ -1560,25 +1560,25 @@ define(function (require, exports, module) { }); }); }); - + describe("InlineEditor provider prioritization", function () { var testWindow, testDocumentManager, testEditorManager, testMainViewManager, testDoc; - + function getPositiveProviderCallback(widget) { return function () { widget.called = true; return $.Deferred().resolve(widget).promise(); }; } - + function negativeProviderCallback() { return null; } - + beforeEach(function () { SpecRunnerUtils.createTestWindowAndRun(this, function (w) { var mock = SpecRunnerUtils.createMockEditor(""); @@ -1587,17 +1587,17 @@ define(function (require, exports, module) { testEditorManager = testWindow.brackets.test.EditorManager; testMainViewManager = testWindow.brackets.test.MainViewManager; testDocumentManager = testWindow.brackets.test.DocumentManager; - + testDoc = mock.doc; - + testDocumentManager.getOpenDocumentForPath = function (fullPath) { return testDoc; }; - + testMainViewManager._edit(testMainViewManager.ACTIVE_PANE, testDoc); }); }); - + afterEach(function () { SpecRunnerUtils.destroyMockEditor(testDoc); SpecRunnerUtils.closeTestWindow(); @@ -1608,41 +1608,41 @@ define(function (require, exports, module) { testMainViewManager = null; testDocumentManager = null; }); - - + + it("should prefer positive higher priority providers (1)", function () { var widget0 = new InlineWidget(), widget1 = new InlineWidget(), widget2 = new InlineWidget(); - + testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget0)); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget1), 1); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget2), 2); - + runs(function () { testWindow.executeCommand(Commands.TOGGLE_QUICK_EDIT); }); - + runs(function () { expect(widget0.called).toBeFalsy(); expect(widget1.called).toBeFalsy(); expect(widget2.called).toBe(true); }); }); - + it("should prefer positive higher priority providers (2)", function () { var widget0 = new InlineWidget(), widget1 = new InlineWidget(), widget2 = new InlineWidget(); - + testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget2), 2); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget1), 1); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget0)); - + runs(function () { testWindow.executeCommand(Commands.TOGGLE_QUICK_EDIT); }); - + runs(function () { expect(widget0.called).toBeFalsy(); expect(widget1.called).toBeFalsy(); @@ -1655,17 +1655,17 @@ define(function (require, exports, module) { var widget0 = new InlineWidget(), widget1 = new InlineWidget(), widget2 = new InlineWidget(); - + testEditorManager.registerInlineEditProvider(negativeProviderCallback, 2); testEditorManager.registerInlineEditProvider(negativeProviderCallback, 1); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget0)); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget1), -1); testEditorManager.registerInlineEditProvider(getPositiveProviderCallback(widget2), -2); - + runs(function () { testWindow.executeCommand(Commands.TOGGLE_QUICK_EDIT); }); - + runs(function () { expect(widget0.called).toBe(true); expect(widget1.called).toBeFalsy(); @@ -1673,7 +1673,7 @@ define(function (require, exports, module) { }); }); - + }); }); }); From 1cd878e8c3521ce8ce8c5e53647f43bc53c9693b Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Thu, 9 Oct 2014 16:19:17 -0700 Subject: [PATCH 162/182] Update CM again to pick up an infinite loop fix --- src/thirdparty/CodeMirror2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2 index dcab2496a39..8be56518bef 160000 --- a/src/thirdparty/CodeMirror2 +++ b/src/thirdparty/CodeMirror2 @@ -1 +1 @@ -Subproject commit dcab2496a3994b17a4b38208a34202c758de4e1a +Subproject commit 8be56518bef493d2155e4a3bea18a196bc43e1db From bd8bc11db6b5af8b96b9de3b5bdf1c01c65fb146 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Wed, 8 Oct 2014 16:13:23 -0700 Subject: [PATCH 163/182] Working Performance Set Improvements --- src/editor/EditorManager.js | 15 ++-- src/project/FileViewController.js | 6 +- src/project/WorkingSetView.js | 112 +++++++++++++++++++----------- src/view/MainViewManager.js | 56 +++++++++------ src/view/Pane.js | 66 +++++++++++++++--- 5 files changed, 174 insertions(+), 81 deletions(-) diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js index 56bf14bbed6..f1d575cd4a1 100644 --- a/src/editor/EditorManager.js +++ b/src/editor/EditorManager.js @@ -470,6 +470,7 @@ define(function (require, exports, module) { * Semi-private: should only be called within this module or by Document. * @param {!Document} document Document whose main/full Editor to create * @param {!Pane} pane Pane in which the editor will be hosted + * @return {!Editor} */ function _createFullEditorForDocument(document, pane) { // Create editor; make it initially invisible @@ -477,6 +478,7 @@ define(function (require, exports, module) { editor.setVisible(false); pane.addView(editor); $(exports).triggerHandler("_fullEditorCreatedForDocument", [document, editor, pane.id]); + return editor; } @@ -535,8 +537,6 @@ define(function (require, exports, module) { editor = document._masterEditor; if (!editor) { - createdNewEditor = true; - // Performance (see #4757) Chrome wastes time messing with selection // that will just be changed at end, so clear it for now if (window.getSelection && window.getSelection().empty) { // Chrome @@ -544,23 +544,24 @@ define(function (require, exports, module) { } // Editor doesn't exist: populate a new Editor with the text - _createFullEditorForDocument(document, pane); - } else if (editor.$el.parent() !== pane.$el) { + editor = _createFullEditorForDocument(document, pane); + createdNewEditor = true; + } else if (editor.$el.parent()[0] !== pane.$content[0]) { // editor does exist but is not a child of the pane so add it to the // pane (which will switch the view's container as well) pane.addView(editor); } // show the view - pane.showView(document._masterEditor); + pane.showView(editor); if (MainViewManager.getActivePaneId() === pane.id) { // give it focus - document._masterEditor.focus(); + editor.focus(); } if (createdNewEditor) { - _restoreEditorViewState(document._masterEditor); + _restoreEditorViewState(editor); } } diff --git a/src/project/FileViewController.js b/src/project/FileViewController.js index 243cfd79f88..733e4a33092 100644 --- a/src/project/FileViewController.js +++ b/src/project/FileViewController.js @@ -129,8 +129,10 @@ define(function (require, exports, module) { return; } - _fileSelectionFocus = fileSelectionFocus; - $(exports).triggerHandler("fileViewFocusChange"); + if (_fileSelectionFocus !== fileSelectionFocus) { + _fileSelectionFocus = fileSelectionFocus; + $(exports).triggerHandler("fileViewFocusChange"); + } } /** diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index d07211aa764..225923b99ed 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -34,7 +34,8 @@ define(function (require, exports, module) { "use strict"; // Load dependent modules - var DocumentManager = require("document/DocumentManager"), + var AppInit = require("utils/AppInit"), + DocumentManager = require("document/DocumentManager"), MainViewManager = require("view/MainViewManager"), CommandManager = require("command/CommandManager"), Commands = require("command/Commands"), @@ -69,6 +70,12 @@ define(function (require, exports, module) { var _classProviders = []; + /** + * #working-set-list-container + * @type {jQuery} + */ + var $workingFilesContainer; + /** * Constants for event.which values * @enum {number} @@ -97,6 +104,12 @@ define(function (require, exports, module) { BELOWVIEW = "belowview", ABOVEVIEW = "aboveview"; + /** + * Drag an item has to move 3px before dragging starts + * @constant + */ + var _DRAG_MOVE_DETECTION_START = 3; + /** * Refreshes all Pane View List Views */ @@ -129,7 +142,6 @@ define(function (require, exports, module) { */ function _updateListItemSelection(listItem, selectedFile) { var shouldBeSelected = (selectedFile && $(listItem).data(_FILE_KEY).fullPath === selectedFile.fullPath); - ViewUtils.toggleClass($(listItem), "selected", shouldBeSelected); } @@ -263,19 +275,43 @@ define(function (require, exports, module) { dragged = false, startPageY = e.pageY, lastPageY = startPageY, - itemHeight = $el.height(), + lastHit = { where: NOMANSLAND }, tryClosing = $(e.target).hasClass("can-close"), - offset = $el.offset(), - $copy = $el.clone(), - $ghost = $("
      ").append($("
        ").append($copy).css("padding", "0")), - sourceView = _viewFromEl($el), currentFile = MainViewManager.getCurrentlyViewedFile(), activePaneId = MainViewManager.getActivePaneId(), activeView = _views[activePaneId], - draggingCurrentFile = ($el.hasClass("selected") && sourceView.paneId === activePaneId), - startingIndex = MainViewManager.findInWorkingSet(sourceView.paneId, sourceFile.fullPath), + sourceView = _viewFromEl($el), currentView = sourceView, - lastHit = { where: NOMANSLAND }; + startingIndex = $el.index(), + itemHeight, + offset, + $copy, + $ghost, + draggingCurrentFile; + + function initDragging() { + itemHeight = $el.height(); + offset = $el.offset(); + $copy = $el.clone(); + $ghost = $("
        ").append($("
          ").append($copy).css("padding", "0")); + draggingCurrentFile = ($el.hasClass("selected") && sourceView.paneId === activePaneId); + + // setup our ghost element as position absolute + // so we can put it wherever we want to while dragging + if (draggingCurrentFile && _hasSelectionFocus()) { + $ghost.addClass("dragging-current-file"); + } + + $ghost.css({ + top: offset.top, + left: offset.left, + width: $el.width() + 8 + }); + + // this will give the element the appearence that it's ghosted if the user + // drags the element out of the view and goes off into no mans land + $ghost.appendTo($("body")); + } // Switches the view context to match the hit context function updateContext(hit) { @@ -294,7 +330,6 @@ define(function (require, exports, module) { hasScroller = false, onTopScroller = false, onBottomScroller = false, - $workingFilesContainer = $("#working-set-list-container"), $container, $hit, $item, @@ -564,7 +599,7 @@ define(function (require, exports, module) { // The drag function function drag(e) { if (!dragged) { - + initDragging(); // sort redraw and scroll shadows // cause problems during drag so disable them _suppressSortRedrawForAllViews(true); @@ -576,7 +611,7 @@ define(function (require, exports, module) { _deactivateAllViews(true); // add a "dragging" class to the outer container - $("#working-set-list-container").addClass("dragging"); + $workingFilesContainer.addClass("dragging"); // add a class to the element we're dragging if // it's the currently selected file so that we @@ -654,13 +689,15 @@ define(function (require, exports, module) { } } - // move the drag affordance - $ghost.css("top", $ghost.offset().top + (e.pageY - lastPageY)); - + // Reposition the drag affordance if we've started dragging + if ($ghost) { + $ghost.css("top", $ghost.offset().top + (e.pageY - lastPageY)); + } + // if we have't started dragging yet then we wait until // the mouse has moved 3 pixels before we start dragging // to avoid the item moving when clicked or double clicked - if (dragged || Math.abs(e.pageY - startPageY) > 3) { + if (dragged || Math.abs(e.pageY - startPageY) > _DRAG_MOVE_DETECTION_START) { drag(e); } @@ -681,19 +718,21 @@ define(function (require, exports, module) { // Close down the drag operation function preDropCleanup() { - $("#working-set-list-container").removeClass("dragging"); - $("#working-set-list-container .drag-show-as-selected").removeClass("drag-show-as-selected"); - endScroll($el); - // re-activate the views (adds the "active" class to the view that was previously active) - _deactivateAllViews(false); - // turn scroll wheel back on window.onmousewheel = window.document.onmousewheel = null; $(window).off(".wsvdragging"); - $ghost.remove(); - $el.css("opacity", ""); + if (dragged) { + $workingFilesContainer.removeClass("dragging"); + $workingFilesContainer.find(".drag-show-as-selected").removeClass("drag-show-as-selected"); + endScroll($el); + // re-activate the views (adds the "active" class to the view that was previously active) + _deactivateAllViews(false); + // turn scroll wheel back on + $ghost.remove(); + $el.css("opacity", ""); - if (dragged && $el.next().length === 0) { - scrollCurrentViewToBottom(); + if ($el.next().length === 0) { + scrollCurrentViewToBottom(); + } } } @@ -800,21 +839,7 @@ define(function (require, exports, module) { return; } - // setup our ghost element as position absolute - // so we can put it wherever we want to while dragging - if (draggingCurrentFile && _hasSelectionFocus()) { - $ghost.addClass("dragging-current-file"); - } - $ghost.css({ - top: offset.top, - left: offset.left, - width: $el.width() + 8 - }); - - // this will give the element the appearence that it's ghosted if the user - // drags the element out of the view and goes off into no mans land - $ghost.appendTo($("body")); e.stopPropagation(); }); @@ -1435,6 +1460,11 @@ define(function (require, exports, module) { refresh(true); } + AppInit.htmlReady(function () { + $workingFilesContainer = $("#working-set-list-container"); + }); + + // Public API exports.createWorkingSetViewForPane = createWorkingSetViewForPane; exports.refresh = refresh; diff --git a/src/view/MainViewManager.js b/src/view/MainViewManager.js index ab45f4870c5..3b7c287a683 100644 --- a/src/view/MainViewManager.js +++ b/src/view/MainViewManager.js @@ -370,9 +370,8 @@ define(function (require, exports, module) { oldPaneId]); _makePaneMostRecent(_activePaneId); + focusActivePane(); } - - focusActivePane(); } /** @@ -1128,24 +1127,27 @@ define(function (require, exports, module) { * Do not use this API unless you have a document object without a file object * @param {!string} paneId - id of the pane in which to open the document * @param {!Document} doc - document to edit - * @param {{noPaneActivate:boolean}=} optionsIn - options + * @param {{noPaneActivate:boolean=, noPaneRedundancyCheck:boolean=}=} optionsIn - options * @private */ function _edit(paneId, doc, optionsIn) { - var currentPaneId = _getPaneIdForPath(doc.file.fullPath), - options = optionsIn || {}; - - + var options = optionsIn || {}, + currentPaneId; + + if (options.noPaneRedundancyCheck) { + // This flag is for internal use only to improve performance + // Don't check for the file to have been opened in another pane pane which could be time + // consuming. should only be used when passing an actual paneId (not a special paneId) + // and the caller has already done a redundancy check. + currentPaneId = _getPaneIdForPath(doc.file.fullPath); + } + if (currentPaneId) { - // If the doc is open in another pane - // then switch to that pane and call open document - // which will really just show the view as it has always done - // we could just do pane.showView(doc._masterEditor) in that - // case but Editor Manager may do some state syncing + // If the doc is open in another pane then switch to that pane and call open document + // which will really just show the view as it has always done we could just + // do pane.showView(doc._masterEditor) in that case but Editor Manager may do some + // state syncing paneId = currentPaneId; - if (!options.noPaneActivate) { - setActivePaneId(paneId); - } } var pane = _getPane(paneId); @@ -1159,6 +1161,10 @@ define(function (require, exports, module) { // open document will show the editor if there is one already EditorManager.openDocument(doc, pane); _makeFileMostRecent(paneId, doc.file); + + if (!options.noPaneActivate) { + setActivePaneId(paneId); + } } /** @@ -1166,7 +1172,7 @@ define(function (require, exports, module) { * or a document for editing. If it's a document for editing, edit is called on the document * @param {!string} paneId - id of the pane in which to open the document * @param {!File} file - file to open - * @param {{noPaneActivate:boolean}=} optionsIn - options + * @param {{noPaneActivate:boolean=, noPaneRedundancyCheck:boolean=}=} optionsIn - options * @return {jQuery.Promise} promise that resolves to a File object or * rejects with a File error or string */ @@ -1174,6 +1180,12 @@ define(function (require, exports, module) { var result = new $.Deferred(), options = optionsIn || {}; + function doPostOpenActivation() { + if (!options.noPaneActivate) { + setActivePaneId(paneId); + } + } + if (!file || !_getPane(paneId)) { return result.reject("bad argument").promise(); } @@ -1203,9 +1215,6 @@ define(function (require, exports, module) { // we could just do pane.showView(doc._masterEditor) in that // case but Editor Manager may do some state syncing paneId = currentPaneId; - if (!options.noPaneActivate) { - setActivePaneId(paneId); - } } // See if there is already a view for the file @@ -1227,6 +1236,7 @@ define(function (require, exports, module) { if (!ProjectManager.isWithinProject(file.fullPath)) { addToWorkingSet(paneId, file); } + doPostOpenActivation(); result.resolve(file); }) .fail(function (fileError) { @@ -1239,14 +1249,18 @@ define(function (require, exports, module) { } else { DocumentManager.getDocumentForPath(file.fullPath) .done(function (doc) { - _edit(paneId, doc, options); + _edit(paneId, doc, $.extend({}, options, { + noPaneActivate: true, + noPaneRedundancyCheck: true + })); + doPostOpenActivation(); result.resolve(doc.file); }) .fail(function (fileError) { result.reject(fileError); }); } - + return result; } diff --git a/src/view/Pane.js b/src/view/Pane.js index 60c854cc37a..dcbd0c46088 100644 --- a/src/view/Pane.js +++ b/src/view/Pane.js @@ -76,6 +76,7 @@ * adjustScrollPos: function(state:Object=, heightDelta:number)= * notifyContainerChange: function()= * notifyVisibilityChange: function(boolean)= + * focus:function()= * } * * When views are created they can be added to the pane by calling `pane.addView()`. @@ -1214,18 +1215,63 @@ define(function (require, exports, module) { * Gives focus to the last thing that had focus, the current view or the pane in that order */ Pane.prototype.focus = function () { - // Blur the currently focused element which will move focus to the BODY tag - // If the element we want to focus below cannot receive the input focus such as an ImageView - // This will remove focus from the current view which is important if the current view is - // a codemirror view. - document.activeElement.blur(); + var current = window.document.activeElement, + self = this; + + // Helper to focus the current view if it can + function tryFocusingCurrentView() { + if (self._currentView) { + if (self._currentView.focus) { + // Views can implement a focus + // method for focusing a complex + // DOM like codemirror + self._currentView.focus(); + } else { + // Otherwise, no focus method + // just try and give the DOM + // element focus + self._currentView.$el.focus(); + } + } else { + // no view so just focus the pane + self.$el.focus(); + } + } - if (this._lastFocusedElement && $(this._lastFocusedElement).is(":visible")) { - $(this._lastFocusedElement).focus(); - } else if (this._currentView) { - this._currentView.$el.focus(); + // short-circuit for performance + if (this._lastFocusedElement === current) { + return; + } + + // If the focus was in a "textarea" and the currentView is anything other than + // a codeMirror view then we must blur the textarea to force focus to the body tag. + // + // If we don't then the focus will stay in the text-area which directs keyboard input + // to the codemirror document when it shouldn't + // + // Steps: + // 1. Open a js file in the left pane and an image in the right pane and + // 2. Focus the js file using the working-set + // 3. Focus the image view using the working-set. + // + // ==> Focus is still in the text area. Any keyboard input will modify the document + + if (current.tagName === "textarea" && + (!this._currentView || !this._currentView._codeMirror)) { + current.blur(); + } + + var $lfe = $(this._lastFocusedElement); + + if ($lfe.length && !$lfe.is(".view-pane") && $lfe.is(":visible")) { + // if we had a last focused element + // and it wasn't a pane element + // and it's still visible, focus it + $lfe.focus(); } else { - this.$el.focus(); + // otherwise, just try to give focus + // to the currently active view + tryFocusingCurrentView(); } }; From b677ec21b022af2ee40894f2b130215bf43e7eb9 Mon Sep 17 00:00:00 2001 From: rsperberg Date: Fri, 10 Oct 2014 17:11:39 -0400 Subject: [PATCH 164/182] corrected typo in 'bootstrapping' --- src/main.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main.js b/src/main.js index 3250294d869..4acfa5fb99b 100644 --- a/src/main.js +++ b/src/main.js @@ -1,39 +1,39 @@ /* * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ /*global require, define, window, brackets, navigator */ /** - * The boostrapping module for brackets. This module sets up the require + * The bootstrapping module for brackets. This module sets up the require * configuration and loads the brackets module. */ require.config({ paths: { "text" : "thirdparty/text/text", "i18n" : "thirdparty/i18n/i18n", - - // The file system implementation. Change this value to use different + + // The file system implementation. Change this value to use different // implementations (e.g. cloud-based storage). "fileSystemImpl" : "filesystem/impls/appshell/AppshellFileSystem" } From e9a284328098aad20e1c264218ef4176eba308ad Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Fri, 10 Oct 2014 14:30:16 -0700 Subject: [PATCH 165/182] Fix bug #9511 (Can't select text in Extension Manager anymore) - Remove no-focus from dialog root to allow text selection. Change scope of key listener so tabbing continues to work without needing to reintroduce tabIndex on the dialog, since that triggers Bootstrap-modal problems (#9196). Also: add an extra error logging line so that failed updates always log some error details to the console. (I think this case seemed to come up in a bug a while back, but couldn't remember which one). --- src/extensibility/ExtensionManagerDialog.js | 13 +++++++++---- src/htmlContent/extension-manager-dialog.html | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/extensibility/ExtensionManagerDialog.js b/src/extensibility/ExtensionManagerDialog.js index 8008dbc3755..7c322fea5a1 100644 --- a/src/extensibility/ExtensionManagerDialog.js +++ b/src/extensibility/ExtensionManagerDialog.js @@ -124,10 +124,12 @@ define(function (require, exports, module) { errorArray.forEach(function (errorObj) { ids.push(errorObj.item); if (errorObj.error && errorObj.error.forEach) { - console.error("Errors for ", errorObj.item); + console.error("Errors for", errorObj.item); errorObj.error.forEach(function (error) { console.error(Package.formatError(error)); }); + } else { + console.error("Error for", errorObj.item, errorObj); } }); Dialogs.showModalDialog( @@ -292,8 +294,10 @@ define(function (require, exports, module) { // Open the dialog dialog = Dialogs.showModalDialogUsingTemplate(Mustache.render(dialogTemplate, context)); - // When dialog closes, dismiss models and commit changes + // On dialog close: clean up listeners & models, and commit changes dialog.done(function () { + $(document).off(".extensionManager"); + models.forEach(function (model) { model.dispose(); }); @@ -319,8 +323,9 @@ define(function (require, exports, module) { setActiveTab($(this)); }); - // navigate through tabs via Ctrl-(Shift)-Tab - $dlg.on("keyup", function (event) { + // Navigate through tabs via Ctrl-(Shift)-Tab + // (focus may be on document.body if text in extension listing clicked - see #9511) + $(document).on("keyup.extensionManager", function (event) { if (event.keyCode === KeyEvent.DOM_VK_TAB && event.ctrlKey) { var $tabs = $(".nav-tabs a", $dlg), tabIndex = _activeTabIndex; diff --git a/src/htmlContent/extension-manager-dialog.html b/src/htmlContent/extension-manager-dialog.html index 2ea7139d69e..c7528a73a7a 100644 --- a/src/htmlContent/extension-manager-dialog.html +++ b/src/htmlContent/extension-manager-dialog.html @@ -1,4 +1,4 @@ -
          +
            {{#showRegistry}} From f16eb904a50846519b48184a1a193d58b67f0a23 Mon Sep 17 00:00:00 2001 From: Denis R Date: Sat, 11 Oct 2014 15:43:19 +0200 Subject: [PATCH 166/182] Update strings.js --- src/nls/it/strings.js | 121 ++++++++++++++++++++++++------------------ 1 file changed, 69 insertions(+), 52 deletions(-) diff --git a/src/nls/it/strings.js b/src/nls/it/strings.js index 8cba1480934..98783be4250 100644 --- a/src/nls/it/strings.js +++ b/src/nls/it/strings.js @@ -25,6 +25,7 @@ /*global define */ define({ + /** * Errors */ @@ -39,7 +40,14 @@ define({ "UNSUPPORTED_ENCODING_ERR" : "Il file non è testo codificato in UTF-8", "FILE_EXISTS_ERR" : "Il file è già presente.", "FILE" : "file", + "FILE_TITLE" : "File", "DIRECTORY" : "cartella", + "DIRECTORY_TITLE" : "Cartella", + "DIRECTORY_NAMES_LEDE" : "Nomi cartelle", + "FILENAMES_LEDE" : "Nomi dei file", + "FILENAME" : "Nome del file", + "DIRECTORY_NAME" : "Nome cartella", + // Project error strings "ERROR_LOADING_PROJECT" : "Errore durante il caricamento del progetto", @@ -64,6 +72,11 @@ define({ "FILE_ALREADY_EXISTS" : "Il file {0} esiste già.", "ERROR_CREATING_FILE_TITLE" : "Errore durante la creazione del file", "ERROR_CREATING_FILE" : "Errore durante il tentativo di creare il file {0}. {1}", + "ERROR_MIXED_DRAGDROP" : "Impossibile aprire una cartella, contemporaneamente, come l'apertura di altri file.", + + // Application preferences corrupt error strings + "ERROR_PREFS_CORRUPT_TITLE" : "Errore nella lettura delle preferenze", + "ERROR_PREFS_CORRUPT" : "Le tue preferenze non sono in un file JSON valido. Il file verrà aperto in modo da poter correggere il formato. Dovrai riavviare {APP_NAME} così le modifiche avranno effetto.", // Application error strings "ERROR_IN_BROWSER_TITLE" : "Oops! {APP_NAME} non può essere ancora eseguita nel browser.", @@ -73,7 +86,7 @@ define({ "ERROR_MAX_FILES_TITLE" : "Errore durante l’indicizzazione dei file", "ERROR_MAX_FILES" : "È stato raggiunto il massimo numero di file indicizzati. Le azioni che controllano file presenti nell’indice posso funzionare in modo non corretto.", - // Live Development error strings + // Live Preview error strings "ERROR_LAUNCHING_BROWSER_TITLE" : "Errore durante l’avvio del browser", "ERROR_CANT_FIND_CHROME" : "Non è stato possibile trovare il browser Google Chrome. Assicurarsi che sia correttamente installato.", "ERROR_LAUNCHING_BROWSER" : "Errore durante l’avvio del browser. (errore {0})", @@ -130,6 +143,7 @@ define({ "FIND_QUERY_PLACEHOLDER" : "Trova\u2026", "REPLACE_PLACEHOLDER" : "Sostituisci con\u2026", "BUTTON_REPLACE_ALL" : "Tutti\u2026", + "BUTTON_REPLACE_ALL_IN_FILES" : "Sostituire\u2026", "BUTTON_REPLACE" : "Sostituisci", "BUTTON_NEXT" : "\u25B6", "BUTTON_PREV" : "\u25C0", @@ -140,9 +154,7 @@ define({ "REPLACE_WITHOUT_UNDO_WARNING_TITLE": "Sostituire senza Annulla", "REPLACE_WITHOUT_UNDO_WARNING" : "Perché più di {0} file hanno bisogno di essere sostituiti, {APP_NAME} modificherà i file aperti sul disco.
            Non sarai in grado di annullare le sostituzioni in quei file.", "BUTTON_REPLACE_WITHOUT_UNDO" : "Sostituire senza Annulla", - "FIND_REPLACE_TITLE_LABEL" : "Sostituire", - "FIND_REPLACE_TITLE_WITH" : "con", - + "OPEN_FILE" : "Apri File", "SAVE_FILE_AS" : "Salva File", "CHOOSE_FOLDER" : "Scegli una cartella", @@ -151,15 +163,14 @@ define({ "NO_UPDATE_TITLE" : "Sei aggiornato!", "NO_UPDATE_MESSAGE" : "Stai utilizzando l’ultima versione di {APP_NAME}.", - // Replace All (in single file) - "FIND_REPLACE_TITLE_PART1" : "Sostituisci \"", - "FIND_REPLACE_TITLE_PART2" : "\" con \"", - "FIND_REPLACE_TITLE_PART3" : "\" — {2} {0} {1}", + // Find and Replace + "FIND_REPLACE_TITLE_LABEL" : "Sostituire", + "FIND_REPLACE_TITLE_WITH" : "con", + "FIND_TITLE_LABEL" : "Trovato", + "FIND_TITLE_SUMMARY" : "— {0} {1} {2} in {3}", // Find in Files - "FIND_IN_FILES_TITLE_PART1" : "\"", - "FIND_IN_FILES_TITLE_PART2" : "\" trovato", - "FIND_IN_FILES_TITLE_PART3" : "— {0} {1} {2} in {3} {4}", + "FIND_NUM_FILES" : "{0} {1}", "FIND_IN_FILES_SCOPED" : "in {0}", "FIND_IN_FILES_NO_SCOPE" : "nel progetto", "FIND_IN_FILES_ZERO_FILES" : "Filtra esclude tutti i file {0}", @@ -167,35 +178,42 @@ define({ "FIND_IN_FILES_FILES" : "file", "FIND_IN_FILES_MATCH" : "corrispondenza", "FIND_IN_FILES_MATCHES" : "corrispondenze", - "FIND_IN_FILES_MORE_THAN" : "Più ", + "FIND_IN_FILES_MORE_THAN" : "Oltre ", "FIND_IN_FILES_PAGING" : "{0}—{1}", "FIND_IN_FILES_FILE_PATH" : "{0} {2} {1}", // We shoudl use normal dashes on Windows instead of em dash eventually + "FIND_IN_FILES_EXPAND_COLLAPSE" : "Ctrl/Cmd click per Espandere/Chiudere tutto", + "REPLACE_IN_FILES_ERRORS_TITLE" : "Sostituire errori", + "REPLACE_IN_FILES_ERRORS" : "I seguenti file non sono stati modificati perché hanno cambiato dopo la ricerca o non potevano essere scritti.", + "ERROR_FETCHING_UPDATE_INFO_TITLE" : "Si è verificato un errore nel recuperare le informazioni aggiornate", "ERROR_FETCHING_UPDATE_INFO_MSG" : "Si è verificato un errore nel recuperare le informazioni aggiornate dal server. Assicurati di essere connesso a internet e riprova.", - "ERROR_CSSQUICKEDIT_BETWEENCLASSES" : "CSS Quick Edit: posiziona il cursore sul nome di una classe singola.", - "ERROR_CSSQUICKEDIT_CLASSNOTFOUND" : "CSS Quick Edit: attributo classe incompleto", - "ERROR_CSSQUICKEDIT_IDNOTFOUND" : "CSS Quick Edit: attributo id incompleto", - "ERROR_CSSQUICKEDIT_UNSUPPORTEDATTR" : "CSS Quick Edit: posiziona il cursore su etichetta, classe, oppure id", - "ERROR_JSQUICKEDIT_FUNCTIONNOTFOUND" : "JS Quick Edit: posiziona il cursore su nome della funziona", - "EDIT_FILE_FILTER" : "Modifica\u2026", - "ERROR_QUICK_DOCS_PROVIDER_NOT_FOUND" : "Quick Docs non disponibile per posizione attuale del cursore", - "ERROR_QUICK_EDIT_PROVIDER_NOT_FOUND" : "Quick Edit non disponibile per posizione attuale del cursore", - "ERROR_TIMINGQUICKEDIT_INVALIDSYNTAX" : "Funzione CSS Timing Quick Edit: sintassi invalida", - "FILE_FILTER_CLIPPED_SUFFIX" : "e {0} in più ", - "FILE_FILTER_INSTRUCTIONS" : "Esclude i file e cartelle che sono uguali a qualsiasi delle seguente stringhe / sottostringhe o caratteri jolly. Digita ciascun stringa su una nuova riga.", - + // File exclusion filters "NEW_FILE_FILTER" : "Nuova regola di esclusione\u2026", "CLEAR_FILE_FILTER" : "Non escludere file", "NO_FILE_FILTER" : "Nessun file escluso", "EXCLUDE_FILE_FILTER" : "Escludere {0}", + "EDIT_FILE_FILTER" : "Modifica\u2026", "FILE_FILTER_DIALOG" : "Modifica regole di esclusione", + "FILE_FILTER_INSTRUCTIONS" : "Esclusione di file e cartelle corrispondenti delle seguenti stringhe o sottostringhe caratteri jolly. Immettere ogni stringa su una nuova linea.", "FILTER_NAME_PLACEHOLDER" : "Nome delle regole di esclusione (facoltativo)", + "FILE_FILTER_CLIPPED_SUFFIX" : "e {0} più", "FILTER_COUNTING_FILES" : "Contando i file\u2026", "FILTER_FILE_COUNT" : "Consentire {0} di {1} file {2}", "FILTER_FILE_COUNT_ALL" : "Consentire tutti {0} file {1}", - - + + // Quick Edit + "ERROR_QUICK_EDIT_PROVIDER_NOT_FOUND" : "Quick Edit non disponibile per posizione attuale del cursore", + "ERROR_CSSQUICKEDIT_BETWEENCLASSES" : "CSS Quick Edit: posiziona il cursore sul nome di una classe singola.", + "ERROR_CSSQUICKEDIT_CLASSNOTFOUND" : "CSS Quick Edit: attributo classe incompleto", + "ERROR_CSSQUICKEDIT_IDNOTFOUND" : "CSS Quick Edit: attributo id incompleto", + "ERROR_CSSQUICKEDIT_UNSUPPORTEDATTR" : "CSS Quick Edit: posiziona il cursore su etichetta, classe, oppure id", + "ERROR_TIMINGQUICKEDIT_INVALIDSYNTAX" : "Funzione CSS Timing Quick Edit: sintassi invalida", + "ERROR_JSQUICKEDIT_FUNCTIONNOTFOUND" : "JS Quick Edit: posiziona il cursore su nome della Funzione", + + // Quick Docs + "ERROR_QUICK_DOCS_PROVIDER_NOT_FOUND" : "Quick Docs non disponibile per posizione attuale del cursore", + /** * ProjectManager */ @@ -213,14 +231,13 @@ define({ "CMD_SPLITVIEW_NONE" : "Nessuna Divisione", "CMD_SPLITVIEW_VERTICAL" : "Dividere Verticalmente", - "CMD_SPLITVIEW_HORIZONTAL" : "Dividere Orrizontalmente", - "SPLITVIEW_MENU_TOOLTIP" : "Dividere l'editor verticalmente o orizzontalmente", + "CMD_SPLITVIEW_HORIZONTAL" : "Dividere Orizontalmente", + "SPLITVIEW_MENU_TOOLTIP" : "Dividere l'editor verticalmente o orizontalmente", "GEAR_MENU_TOOLTIP" : "Configura le impostazioni di lavoro", "SPLITVIEW_INFO_TITLE" : "Già aperto", "SPLITVIEW_MULTIPANE_WARNING" : "Il file è già aperto in un altro riquadro. {APP_NAME} sarà presto possibile aprire lo stesso file in più di un riquadro. Fino ad allora, il file verrà mostrato nel riquadro che è già aperto.

            (Tu vedrai questo messaggio solo una volta.)", - /** * Keyboard modifier names */ @@ -260,9 +277,9 @@ define({ "MULTIPLE_ERRORS" : "{1} {0} Problemi", "NO_ERRORS" : "Nessun {0} problema trovato - ottimo lavoro!", "NO_ERRORS_MULTIPLE_PROVIDER" : "Nessun problema trovato - ottimo lavoro!", - "LINT_DISABLED" : "Linting disabilitato", - "NO_LINT_AVAILABLE" : "Linter disponibile {0}", - "NOTHING_TO_LINT" : "Niente dal lint", + "LINT_DISABLED" : "Lint disabilitato", + "NO_LINT_AVAILABLE" : "Lint disponibile {0}", + "NOTHING_TO_LINT" : "Niente dal Lint", "LINTER_TIMED_OUT" : "{0} è scaduto dopo aver atteso per {1} ms", "LINTER_FAILED" : "{0} terminato con errore: {1}", @@ -313,7 +330,6 @@ define({ "CMD_SPLIT_SEL_INTO_LINES" : "Dividi selezione dentro alle righe", "CMD_ADD_CUR_TO_NEXT_LINE" : "Aggiungi cursore alla riga successiva", "CMD_ADD_CUR_TO_PREV_LINE" : "Aggiungi il cursore sulla riga precedente", - "CMD_FIND_FIELD_PLACEHOLDER" : "Trova\u2026", "CMD_INDENT" : "Aumenta indentazione", "CMD_UNINDENT" : "Riduci indentazione", "CMD_DUPLICATE" : "Duplica", @@ -368,7 +384,7 @@ define({ "CMD_QUICK_OPEN" : "Apri velocemente", "CMD_GOTO_LINE" : "Vai alla linea", "CMD_GOTO_DEFINITION" : "Vai alla definizione", - "CMD_GOTO_FIRST_PROBLEM" : "Vai al primo errore/avviso", + "CMD_GOTO_FIRST_PROBLEM" : "Vai al primo Errore/Avviso", "CMD_TOGGLE_QUICK_EDIT" : "Modifica veloce", "CMD_TOGGLE_QUICK_DOCS" : "Documentazione veloce", "CMD_QUICK_EDIT_PREV_MATCH" : "Corrispondenza precedente", @@ -377,54 +393,53 @@ define({ "CMD_NEXT_DOC" : "Documento successivo", "CMD_PREV_DOC" : "Documento precedente", "CMD_SHOW_IN_TREE" : "Mostra nell’albero dei file", + "CMD_SHOW_IN_EXPLORER" : "Mostra in Explorer", + "CMD_SHOW_IN_FINDER" : "Mostra in Finder", "CMD_SHOW_IN_OS" : "Mostra in SO", // Help menu commands "HELP_MENU" : "Aiuto", "CMD_CHECK_FOR_UPDATE" : "Controlla aggiornamenti", "CMD_HOW_TO_USE_BRACKETS" : "Come usare {APP_NAME}", - "CMD_FORUM" : "Forum di {APP_NAME}", - "CMD_RELEASE_NOTES" : "Note del rilascio", - "CMD_REPORT_AN_ISSUE" : "Segnala un problema", + "CMD_SUPPORT" : "Supporto per {APP_NAME}", + "CMD_SUGGEST" : "Suggerisci una funzionalità", + "CMD_RELEASE_NOTES" : "Note di rilascio", + "CMD_GET_INVOLVED" : "Far parte", "CMD_SHOW_EXTENSIONS_FOLDER" : "Mostra cartella estensioni", "CMD_HOMEPAGE" : "Sito WEB di {APP_TITLE}", "CMD_TWITTER" : "{TWITTER_NAME} su Twitter", "CMD_ABOUT" : "Informazioni su {APP_TITLE}", - "CMD_SHOW_IN_EXPLORER" : "Mostra in Explorer", - "CMD_SHOW_IN_FINDER" : "Mostra nel Finder", - "CMD_OPEN_PREFERENCES" : "Apri il file delle preferenze", // Strings for main-view.html - "EXPERIMENTAL_BUILD" : "Build sperimentale", - "DEVELOPMENT_BUILD" : "Build di sviluppo", - "CMD_SUGGEST" : "Suggerisci una funzionalità", - "CMD_SUPPORT" : "Supporto per {APP_NAME}", + "EXPERIMENTAL_BUILD" : "build sperimentale", + "DEVELOPMENT_BUILD" : "build di sviluppo", "RELOAD_FROM_DISK" : "Ricarica dal disco", - "CMD_GET_INVOLVED" : "Far parte", "KEEP_CHANGES_IN_EDITOR" : "Conserva le modifiche nell’editor", "CLOSE_DONT_SAVE" : "Chiudi (non salvare)", "RELAUNCH_CHROME" : "Riavvia Google Chrome", "ABOUT" : "Informazioni", "CLOSE" : "Chiudi", - "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_LINE1" : "Release {VERSION_MAJOR}.{VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_BUILD_TIMESTAMP" : "build timestamp: ", "ABOUT_TEXT_LINE3" : "Avvisi, termini e condizioni circa i software di terze parti raggiungibili all’indirizzo {ADOBE_THIRD_PARTY} incorporati come riferimento.", "ABOUT_TEXT_LINE4" : "Documentazione e codice sorgente sono disponibili all’indirizzo https://github.com/adobe/brackets/", "ABOUT_TEXT_LINE5" : "Fatto con \u2764 e JavaScript da:", - "ABOUT_TEXT_LINE6" : "Molta gente (abbiamo qualche difficoltà a caricare questi dati ora).", + "ABOUT_TEXT_LINE6" : "Molte persone (abbiamo qualche difficoltà a caricare questi dati ora).", "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "I loghi di 'Web Platform Docs'e 'Web Platform' sono sotto licenza Creative Common Attribution, CC-BY 3.0 Unported.", "UPDATE_NOTIFICATION_TOOLTIP" : "È disponibile una nuova versione di {APP_NAME}! Clicca qui per i dettagli.", - "UPDATE_AVAILABLE_TITLE" : "Aggiornamento disponibile", + "UPDATE_AVAILABLE_TITLE" : "Aggiornamento Disponibile", "UPDATE_MESSAGE" : "Hey, è disponibile una nuova versione di {APP_NAME}. Nuove caratteristiche:", "GET_IT_NOW" : "Installalo ora!", "PROJECT_SETTINGS_TITLE" : "Impostazioni del progetto per: {0}", "PROJECT_SETTING_BASE_URL" : "URL di base per Anteprima Live", - "PROJECT_SETTING_BASE_URL_HINT" : "(lasciare vuoto per utilizzare l’URL del file)", + "PROJECT_SETTING_BASE_URL_HINT" : "Per utilizzare un server locale, immettere un URL come http://localhost:8000/", "BASEURL_ERROR_INVALID_PROTOCOL" : "Il protocollo {0} non è supportato da Anteprima Live—utilizzare http:// o https:// .", "BASEURL_ERROR_SEARCH_DISALLOWED" : "L’URL di base non può contenere parametri di ricerca come \"{0}\".", "BASEURL_ERROR_HASH_DISALLOWED" : "L’URL di base non può contenere hash come \"{0}\".", "BASEURL_ERROR_INVALID_CHAR" : "I caratteri speciali come '{0}' devono essere %-encodate.", "BASEURL_ERROR_UNKNOWN_ERROR" : "Trovato un carattere sconosciuto durante l'analisi del URL di base", + "EMPTY_VIEW_HEADER" : "Aprire un file mentre questo riquadro è attivo", // Strings for themes-settings.html and themes-general.html "CURRENT_THEME" : "Tema attuale", @@ -433,7 +448,6 @@ define({ "FONT_FAMILY" : "Tipo di carattere", "THEMES_SETTINGS" : "Impostazioni Temi", - // CSS Quick Edit "BUTTON_NEW_RULE" : "Nuova regola", @@ -455,6 +469,8 @@ define({ "CANCELING_INSTALL" : "Cancellazione\u2026", "CANCELING_HUNG" : "L’arresto dell’installazione sta prendendo molto tempo. Potrebbe essersi verificato un errore interno.", "INSTALL_CANCELED" : "Installazione cancellata.", + "VIEW_COMPLETE_DESCRIPTION" : "Visualizza descrizione completa", + "VIEW_TRUNCATED_DESCRIPTION" : "Visualizza descrizione ridotta", // These must match the error codes in ExtensionsDomain.Errors.* : "INVALID_ZIP_FILE" : "Il contenuto scaricato non è un file zip valido.", "INVALID_PACKAGE_JSON" : "Il file package.json non è valido (errore: {0}).", @@ -484,6 +500,7 @@ define({ "INSTALL_EXTENSION_DROP" : "Rilascia .zip per l'installazione", "INSTALL_EXTENSION_DROP_ERROR" : "Installazione/Aggiornamento interrotto a causa dei seguenti errori:", "INSTALL_FROM_URL" : "Installo dall’indirizzo URL\u2026", + "INSTALL_EXTENSION_VALIDATING" : "Convalida\u2026", "EXTENSION_AUTHOR" : "Autore", "EXTENSION_DATE" : "Data", "EXTENSION_INCOMPATIBLE_NEWER" : "Questa estensione richiede una versione di {APP_NAME} più recente.", @@ -554,7 +571,6 @@ define({ "CMD_OPEN_BRACKETS_SOURCE" : "Apri sorgente di Brackets", "ERRORS" : "Errori", - "LANGUAGE_TITLE" : "Cambia la lingua", "LANGUAGE_MESSAGE" : "Lingua:", "LANGUAGE_SUBMIT" : "Riavvia {APP_NAME}", @@ -566,6 +582,7 @@ define({ "INLINE_TIMING_EDITOR_PROGRESSION" : "Progresso", "BEZIER_EDITOR_INFO" : "↑↓←→ Sposta punto selezionato
            Maiuscola Muovi di dieci unità", "STEPS_EDITOR_INFO" : "↑↓ Aumenta o diminuisci
            ←→ 'Inizio' o 'Fine'", + "INLINE_TIMING_EDITOR_INVALID" : "Il vecchio valore {0} non è valido, per cui la funzione visualizzata è stato cambiato in {1}. Il documento sarà aggiornato con la prima modifica.", // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Colore corrente", @@ -587,7 +604,7 @@ define({ "JSLINT_NAME" : "JSLint", // extensions/default/QuickView - "CMD_ENABLE_QUICK_VIEW" : "Vista Veloce al passaggio del mouse", + "CMD_ENABLE_QUICK_VIEW" : "Quick Edit al passaggio del mouse", // extensions/default/RecentProjects "CMD_TOGGLE_RECENT_PROJECTS" : "Progetti recenti", From c61ed9f52f9cf3e68df1c034e4692b4fef5d7a6b Mon Sep 17 00:00:00 2001 From: Denis R Date: Sat, 11 Oct 2014 15:48:54 +0200 Subject: [PATCH 167/182] Update strings.js Fix two errors! --- src/nls/it/strings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls/it/strings.js b/src/nls/it/strings.js index 98783be4250..fc099c2803d 100644 --- a/src/nls/it/strings.js +++ b/src/nls/it/strings.js @@ -231,8 +231,8 @@ define({ "CMD_SPLITVIEW_NONE" : "Nessuna Divisione", "CMD_SPLITVIEW_VERTICAL" : "Dividere Verticalmente", - "CMD_SPLITVIEW_HORIZONTAL" : "Dividere Orizontalmente", - "SPLITVIEW_MENU_TOOLTIP" : "Dividere l'editor verticalmente o orizontalmente", + "CMD_SPLITVIEW_HORIZONTAL" : "Dividere Orizzontalmente", + "SPLITVIEW_MENU_TOOLTIP" : "Dividere l'editor verticalmente oppure orizzontalmente", "GEAR_MENU_TOOLTIP" : "Configura le impostazioni di lavoro", "SPLITVIEW_INFO_TITLE" : "Già aperto", From 590854cfb1318099c934c3b450b13f72da43c59d Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sun, 12 Oct 2014 20:33:19 +0200 Subject: [PATCH 168/182] Replace HTML entity with literal dash in Getting Started --- samples/root/Getting Started/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/root/Getting Started/index.html b/samples/root/Getting Started/index.html index ed87bc33ccc..b8bb45fc4ba 100644 --- a/samples/root/Getting Started/index.html +++ b/samples/root/Getting Started/index.html @@ -47,7 +47,7 @@

            Quick Edit for CSS and JavaScript

            Cmd/Ctrl + E shortcut to open a quick inline editor that displays all the related CSS. Make a tweak to your CSS, hit ESC and you're back to editing HTML, or just leave the CSS rules open and they'll become part of your HTML editor. If you hit ESC outside of - a quick inline editor, they'll all collapse. Quick Edit will also find rules defined in LESS and + a quick inline editor, they'll all collapse. Quick Edit will also find rules defined in LESS and SCSS files, including nested rules.

            @@ -66,8 +66,8 @@

            Quick Edit for CSS and JavaScript

            - You can use the same shortcut to edit other things as well – like functions in JavaScript, - colors, and animation timing functions – and we're adding more and more all the time. + You can use the same shortcut to edit other things as well - like functions in JavaScript, + colors, and animation timing functions - and we're adding more and more all the time.

            For now inline editors cannot be nested, so you can only use Quick Edit while the cursor From f50f8e88f3b0f1fe6c43f22aae1c2b23128dc966 Mon Sep 17 00:00:00 2001 From: al8anp Date: Mon, 13 Oct 2014 10:57:54 +0200 Subject: [PATCH 169/182] Recognize Vagrantfile as ruby --- src/language/languages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/language/languages.json b/src/language/languages.json index 50a48fe82e2..dd097be282b 100644 --- a/src/language/languages.json +++ b/src/language/languages.json @@ -165,7 +165,7 @@ "name": "Ruby", "mode": "ruby", "fileExtensions": ["rb", "ru", "gemspec", "rake"], - "fileNames": ["Gemfile", "Rakefile", "Guardfile"], + "fileNames": ["Gemfile", "Rakefile", "Guardfile", "Vagrantfile"], "lineComment": ["#"] }, From 6a1ea67ba588301c40ede5542012c184bce22ed8 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Mon, 13 Oct 2014 10:20:24 -0700 Subject: [PATCH 170/182] Initial commit. Added necessary properties in order to override bootstrap styles. This branch is for #7887. --- src/styles/brackets_patterns_override.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 2b828e11bda..1b4ab328694 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -43,7 +43,12 @@ a { } a:hover { + color: @bc-text-link; text-decoration: underline; + + .dark & { + color: @dark-bc-text-link; + } } a:focus { From b19cd4d828e636a9ad046d5c09acf00b77441323 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Tue, 14 Oct 2014 21:37:41 -0700 Subject: [PATCH 171/182] Made unfocused pane look unfocused. --- src/styles/brackets.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 5e2a1f962a7..eda68aa345b 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -336,6 +336,7 @@ a, img { } .view-pane { + opacity: 0.7; // quieten inactive pane display: block; margin: 0; overflow: hidden; @@ -491,19 +492,19 @@ a, img { box-sizing: border-box; border-bottom: 1px solid rgba(0, 0, 0, 0.05); padding: 5px 10px; - color: @bc-text-thin-quiet; background-color: @background; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; .dark & { - color: @dark-bc-text-quiet; background-color: #1d1f21; // not using a variable on purpose. border-bottom-color: rgba(255, 255, 255, 0.05); } } .active-pane { + opacity: 1; + .pane-header { color: @bc-menu-text; From bd6196253d51adc59be03a61b02f8f9cfcf57e06 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Wed, 15 Oct 2014 10:52:59 -0700 Subject: [PATCH 172/182] Fix for #9545. --- src/styles/brackets.less | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index eda68aa345b..d4ae3263c58 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -792,6 +792,14 @@ a, img { font-size: 13px; color: @project-panel-text-2; overflow: hidden; + + .btn-alt-quiet { + background-color: #47484b; + + // relative positioning plus z-index make sure that the splitview button flows under the left aligned buttons in the project pane when there are no working set files + position: relative; + z-index: 9; + } } .open-files-container { From fc096cfecff78f7a066f1802e9497705c3c44cfd Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 30 Aug 2014 14:39:49 +0200 Subject: [PATCH 173/182] Fix live dev highlight being out of place in edge cases --- src/LiveDevelopment/Agents/RemoteFunctions.js | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/LiveDevelopment/Agents/RemoteFunctions.js b/src/LiveDevelopment/Agents/RemoteFunctions.js index ddda39f76f3..d09d7a0a736 100644 --- a/src/LiveDevelopment/Agents/RemoteFunctions.js +++ b/src/LiveDevelopment/Agents/RemoteFunctions.js @@ -71,13 +71,21 @@ function RemoteFunctions(experimental) { } // compute the screen offset of an element - function _screenOffset(element, key) { - var bounds = element.getBoundingClientRect(); - if (key === "offsetLeft") { - return bounds.left + window.pageXOffset; + function _screenOffset(element) { + var elemBounds = element.getBoundingClientRect(), + body = window.document.body, + offsetTop, + offsetLeft; + + if (window.getComputedStyle(body).position === "static") { + offsetLeft = elemBounds.left + window.pageXOffset; + offsetTop = elemBounds.top + window.pageYOffset; } else { - return bounds.top + window.pageYOffset; + var bodyBounds = body.getBoundingClientRect(); + offsetLeft = elemBounds.left - bodyBounds.left; + offsetTop = elemBounds.top - bodyBounds.top; } + return { left: offsetLeft, top: offsetTop }; } // set an event on a element @@ -114,8 +122,9 @@ function RemoteFunctions(experimental) { } // compute the position on screen - var x = _screenOffset(this.element, "offsetLeft"); - var y = _screenOffset(this.element, "offsetTop") + this.element.offsetHeight; + var offset = _screenOffset(this.element), + x = offset.left, + y = offset.top + this.element.offsetHeight; // create the container this.body = document.createElement("div"); @@ -239,9 +248,11 @@ function RemoteFunctions(experimental) { highlight.className = HIGHLIGHT_CLASSNAME; + var offset = _screenOffset(element); + var stylesToSet = { - "left": _screenOffset(element, "offsetLeft") + "px", - "top": _screenOffset(element, "offsetTop") + "px", + "left": offset.left + "px", + "top": offset.top + "px", "width": elementBounds.width + "px", "height": elementBounds.height + "px", "z-index": 2000000, From 6e625cac853ca063b19d7df51a34f3710a923c46 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Wed, 15 Oct 2014 13:28:25 -0700 Subject: [PATCH 174/182] Making sure that the anchors in jstree will never show a hover state. --- src/styles/jsTreeTheme.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/jsTreeTheme.less b/src/styles/jsTreeTheme.less index e6f583b019e..e7ef48ef287 100644 --- a/src/styles/jsTreeTheme.less +++ b/src/styles/jsTreeTheme.less @@ -73,7 +73,8 @@ li.jstree-closed > ul { display:none; } .jstree-brackets li { vertical-align: baseline; - a { + a, + a:hover { color: @project-panel-text-1; font-size: 13px; cursor: default; From 632e713f0381c7da4fc1c8dba3894a2626824d6e Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Wed, 15 Oct 2014 13:29:37 -0700 Subject: [PATCH 175/182] Project dropdown toggle needs right margin. --- src/extensions/default/RecentProjects/styles/styles.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/RecentProjects/styles/styles.less b/src/extensions/default/RecentProjects/styles/styles.less index fce2f1f2b88..9d651dcca0c 100644 --- a/src/extensions/default/RecentProjects/styles/styles.less +++ b/src/extensions/default/RecentProjects/styles/styles.less @@ -47,7 +47,7 @@ #project-dropdown-toggle { display: inline-block; /* adjust margins to keep position #project-title position stable after extension is loaded */ - margin: -3px 0px -2px -6px; + margin: -3px 5px -2px -6px; overflow: hidden; padding: 0 5px; white-space: nowrap; From 850ef92a55f13c11485891fcd6ea50967bb3b32e Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Wed, 15 Oct 2014 13:46:44 -0700 Subject: [PATCH 176/182] Pushing sidebar icons to the back of Working Files label when they overlap. --- src/styles/brackets.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index d4ae3263c58..842e52e7583 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -717,6 +717,12 @@ a, img { text-shadow: none; overflow: hidden; + > span { + background: @bc-sidebar-bg; + position: relative; + z-index: 9; + } + > div { background-color: @dark-bc-sidebar-bg; opacity: 1; From 62d3d72abca3ed691983396cd2a4330fa1b37199 Mon Sep 17 00:00:00 2001 From: Larz Date: Wed, 15 Oct 2014 19:05:21 -0700 Subject: [PATCH 177/182] Added subtle border for dark menus. --- src/styles/brackets_patterns_override.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 1b4ab328694..a77a46c478a 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -286,6 +286,10 @@ a:focus { -webkit-transform-origin: 0 0; border: none; border-radius: @bc-border-radius; + + .dark & { + border: 1px solid rgba(255, 255, 255, 0.09) !important; + } } @-webkit-keyframes dropdown { From ad5735a2686d6da8f0cae7903133fe67c6351ecf Mon Sep 17 00:00:00 2001 From: Larz Date: Wed, 15 Oct 2014 19:35:30 -0700 Subject: [PATCH 178/182] Updated .not-editor styling based on @TomMalbran's feedback. --- src/styles/brackets.less | 24 +++++++++++++----------- src/styles/images/no_content_bg.svg | 1 - src/styles/images/no_content_bg_dark.svg | 1 - 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 842e52e7583..094d06a0441 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -323,17 +323,6 @@ a, img { position: relative; /* Placeholder shown when there is no editor open */ - .not-editor { - height: 100%; - .vbox; - .box-pack(center); - .box-align(center); - background: @bc-menu-bg url('images/no_content_bg.svg') no-repeat center 45%; - - .dark & { - background: @dark-bc-menu-bg url('images/no_content_bg_dark.svg') no-repeat center 45%; - } - } .view-pane { opacity: 0.7; // quieten inactive pane @@ -515,6 +504,19 @@ a, img { } } +// moved this out of #editor-holder because we need to lower the specificity so theme authors can override the background color +.not-editor { + height: 100%; + .vbox; + .box-pack(center); + .box-align(center); + background: #f8f8f8 url('images/no_content_bg.svg') no-repeat center 45%; + + .dark & { + background: #1d1f21 url('images/no_content_bg_dark.svg') no-repeat center 45%; + } +} + // Split View Separator Styles .split-vertical #second-pane { border-left: 1px solid rgba(0, 0, 0, 0.17); diff --git a/src/styles/images/no_content_bg.svg b/src/styles/images/no_content_bg.svg index d8a7f0a84f6..51db99f2175 100644 --- a/src/styles/images/no_content_bg.svg +++ b/src/styles/images/no_content_bg.svg @@ -1,4 +1,3 @@ - diff --git a/src/styles/images/no_content_bg_dark.svg b/src/styles/images/no_content_bg_dark.svg index c34a4b140ed..62f8b58d3e0 100644 --- a/src/styles/images/no_content_bg_dark.svg +++ b/src/styles/images/no_content_bg_dark.svg @@ -1,4 +1,3 @@ - From a6c19344d62bba82bf51527bba9cf9c122291ef3 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Thu, 16 Oct 2014 09:39:02 -0700 Subject: [PATCH 179/182] auto-install extensions --- src/extensibility/ExtensionManager.js | 130 ++++++++++++++++++++++++-- 1 file changed, 121 insertions(+), 9 deletions(-) diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js index a679c3a0e38..83f94e2cf57 100644 --- a/src/extensibility/ExtensionManager.js +++ b/src/extensibility/ExtensionManager.js @@ -38,15 +38,18 @@ define(function (require, exports, module) { "use strict"; - var _ = require("thirdparty/lodash"), - Package = require("extensibility/Package"), - Async = require("utils/Async"), - ExtensionLoader = require("utils/ExtensionLoader"), - ExtensionUtils = require("utils/ExtensionUtils"), - FileSystem = require("filesystem/FileSystem"), - Strings = require("strings"), - StringUtils = require("utils/StringUtils"), - ThemeManager = require("view/ThemeManager"); + var _ = require("thirdparty/lodash"), + Package = require("extensibility/Package"), + AppInit = require("utils/AppInit"), + Async = require("utils/Async"), + ExtensionLoader = require("utils/ExtensionLoader"), + ExtensionUtils = require("utils/ExtensionUtils"), + FileSystem = require("filesystem/FileSystem"), + FileUtils = require("file/FileUtils"), + PreferencesManager = require("preferences/PreferencesManager"), + Strings = require("strings"), + StringUtils = require("utils/StringUtils"), + ThemeManager = require("view/ThemeManager"); // semver.browser is an AMD-compatible module var semver = require("extensibility/node/node_modules/semver/semver.browser"); @@ -73,6 +76,11 @@ define(function (require, exports, module) { LOCATION_USER = "user", LOCATION_UNKNOWN = "unknown"; + /** + * Extension auto-install folder. Also used for preferences key. + */ + var FOLDER_AUTOINSTALL = "auto-install-extensions"; + /** * @private * @type {Object.} @@ -97,6 +105,8 @@ define(function (require, exports, module) { var _idsToRemove = [], _idsToUpdate = []; + PreferencesManager.definePreference(FOLDER_AUTOINSTALL, "object", undefined); + /** * @private * Synchronizes the information between the public registry and the installed @@ -600,6 +610,108 @@ define(function (require, exports, module) { }, []); } + function _autoInstallBundles() { + // Get list of extension bundles + var validatePromise, + dirPath = FileUtils.getDirectoryPath(FileUtils.getNativeBracketsDirectoryPath()) + FOLDER_AUTOINSTALL + "/", + bundles = [], + installZips = [], + updateZips = [], + deferred = new $.Deferred(); + + FileSystem.getDirectoryForPath(dirPath).getContents(function (err, contents) { + var autoExtensions = PreferencesManager.getViewState(FOLDER_AUTOINSTALL) || {}, + autoExtDirty = false; + + if (!err) { + bundles = contents.filter(function (dirItem) { + return (dirItem.isFile && FileUtils.getFileExtension(dirItem.fullPath) === "zip"); + }); + } + + // Parse zip files and separate new installs vs. updates + validatePromise = Async.doInParallel(bundles, function (file) { + var result = new $.Deferred(); + + // Call validate() so that we open the local zip file and parse the + // package.json. We need the name to detect if this zip will be a + // new install or an update. + Package.validate(file.fullPath, { requirePackageJSON: true }).done(function (info) { + if (info.errors.length) { + result.reject(Package.formatError(info.errors)); + return; + } + + var extensionInfo, installedVersion, + extensionName = info.metadata.name, + autoExtVersion = autoExtensions && autoExtensions[extensionName]; + + // Verify extension has not already been auto-installed/updated + if (autoExtVersion && semver.lte(info.metadata.version, autoExtVersion)) { + // Have already installed/updated version >= version of this extension + result.reject(); + return; + } + + // Verify extension has not already been installed/updated by some other means + extensionInfo = extensions[extensionName]; + installedVersion = extensionInfo && extensionInfo.installInfo && extensionInfo.installInfo.metadata.version; + if (installedVersion && semver.lte(info.metadata.version, installedVersion)) { + // Have already installed/updated version >= version of this extension + result.reject(); + return; + } + + // Keep track of auto-installed extensions so we only install an extension once + autoExtensions[extensionName] = info.metadata.version; + autoExtDirty = true; + + if (installedVersion) { + updateZips.push(file); + } else { + installZips.push(file); + } + + result.resolve(); + }).fail(function (err) { + result.reject(Package.formatError(err)); + }); + + return result.promise(); + }); + + validatePromise.done(function () { + var installPromise = Async.doSequentially(installZips, function (file) { + return Package.installFromPath(file.fullPath); + }); + + var updatePromise = installPromise.always(function () { + return Async.doSequentially(updateZips, function (file) { + return Package.installUpdate(file.fullPath); + }); + }); + + // Always resolve the outer promise + updatePromise.always(deferred.resolve); + }).fail(function (errorArray) { + deferred.reject(errorArray); + }).always(function () { + if (autoExtDirty) { + // Store info in prefs + PreferencesManager.setViewState(FOLDER_AUTOINSTALL, autoExtensions); + } + }); + }); + + return deferred.promise(); + } + + AppInit.appReady(function () { + Package._getNodeConnectionDeferred().done(function () { + _autoInstallBundles(); + }); + }); + // Listen to extension load and loadFailed events $(ExtensionLoader) .on("load", _handleExtensionLoad) From 0a33b9a24ffce0f8b336fee48d3461a7bf928b31 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Thu, 16 Oct 2014 13:11:27 -0700 Subject: [PATCH 180/182] fix definePreference --- src/extensibility/ExtensionManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js index 83f94e2cf57..dc5c1c6a2ea 100644 --- a/src/extensibility/ExtensionManager.js +++ b/src/extensibility/ExtensionManager.js @@ -105,7 +105,7 @@ define(function (require, exports, module) { var _idsToRemove = [], _idsToUpdate = []; - PreferencesManager.definePreference(FOLDER_AUTOINSTALL, "object", undefined); + PreferencesManager.stateManager.definePreference(FOLDER_AUTOINSTALL, "object", undefined); /** * @private From 7835371a949e17e1071608d26e5a60cfa2972818 Mon Sep 17 00:00:00 2001 From: JeffryBooher Date: Wed, 8 Oct 2014 23:18:15 -0700 Subject: [PATCH 181/182] Limit document file sizes to 16MB on open --- src/file/FileUtils.js | 21 ++++++++ src/filesystem/FileSystemError.js | 3 +- .../impls/appshell/AppshellFileSystem.js | 51 +++++++++---------- src/nls/root/strings.js | 1 + 4 files changed, 48 insertions(+), 28 deletions(-) diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js index 61b516224eb..f86fae69915 100644 --- a/src/file/FileUtils.js +++ b/src/file/FileUtils.js @@ -42,6 +42,24 @@ define(function (require, exports, module) { StringUtils = require("utils/StringUtils"); + /** + * @const {Number} Maximium file size (in megabytes) + * (for display strings) + * This must be a hard-coded value since this value + * tells how low-level APIs should behave which cannot + * have a load order dependency on preferences manager + */ + var MAX_FILE_SIZE_MB = 16; + + /** + * @const {Number} Maximium file size (in bytes) + * This must be a hard-coded value since this value + * tells how low-level APIs should behave which cannot + * have a load order dependency on preferences manager + */ + var MAX_FILE_SIZE = MAX_FILE_SIZE_MB * 1024 * 1024; + + /** * Asynchronously reads a file as UTF-8 encoded text. * @param {!File} file File to read @@ -168,6 +186,8 @@ define(function (require, exports, module) { result = Strings.CONTENTS_MODIFIED_ERR; } else if (name === FileSystemError.UNSUPPORTED_ENCODING) { result = Strings.UNSUPPORTED_ENCODING_ERR; + } else if (name === FileSystemError.EXCEEDS_MAX_FILE_SIZE) { + result = StringUtils.format(Strings.EXCEEDS_MAX_FILE_SIZE, MAX_FILE_SIZE_MB); } else { result = StringUtils.format(Strings.GENERIC_ERROR, name); } @@ -541,4 +561,5 @@ define(function (require, exports, module) { exports.getSmartFileExtension = getSmartFileExtension; exports.compareFilenames = compareFilenames; exports.comparePaths = comparePaths; + exports.MAX_FILE_SIZE = MAX_FILE_SIZE; }); diff --git a/src/filesystem/FileSystemError.js b/src/filesystem/FileSystemError.js index fc3bf61ce0c..c64abc0636a 100644 --- a/src/filesystem/FileSystemError.js +++ b/src/filesystem/FileSystemError.js @@ -50,7 +50,8 @@ define(function (require, exports, module) { TOO_MANY_ENTRIES : "TooManyEntries", ALREADY_EXISTS : "AlreadyExists", CONTENTS_MODIFIED : "ContentsModified", - ROOT_NOT_WATCHED : "RootNotBeingWatched" + ROOT_NOT_WATCHED : "RootNotBeingWatched", + EXCEEDS_MAX_FILE_SIZE : "ExceedsMaxFileSize" // FUTURE: Add remote connection errors: timeout, not logged in, connection err, etc. }; diff --git a/src/filesystem/impls/appshell/AppshellFileSystem.js b/src/filesystem/impls/appshell/AppshellFileSystem.js index 433eeacde6f..521c55459de 100644 --- a/src/filesystem/impls/appshell/AppshellFileSystem.js +++ b/src/filesystem/impls/appshell/AppshellFileSystem.js @@ -33,6 +33,9 @@ define(function (require, exports, module) { FileSystemError = require("filesystem/FileSystemError"), NodeDomain = require("utils/NodeDomain"); + /** + * @const + */ var FILE_WATCHER_BATCH_TIMEOUT = 200; // 200ms - granularity of file watcher changes /** @@ -361,42 +364,35 @@ define(function (require, exports, module) { */ function readFile(path, options, callback) { var encoding = options.encoding || "utf8"; - - // Execute the read and stat calls in parallel. Callback early if the - // read call completes first with an error; otherwise wait for both - // to finish. - var done = false, data, stat, err; + // callback to be executed when the call to stat completes + // or immediately if a stat object was passed as an argument + function doReadFile(stat) { + if (stat.size > (FileUtils.MAX_FILE_SIZE)) { + callback(FileSystemError.EXCEEDS_MAX_FILE_SIZE); + } else { + appshell.fs.readFile(path, encoding, function (_err, _data) { + if (_err) { + callback(_mapError(_err)); + } else { + callback(null, _data, stat); + } + }); + } + } + if (options.stat) { - done = true; - stat = options.stat; + doReadFile(options.stat); } else { exports.stat(path, function (_err, _stat) { - if (done) { - callback(_err, _err ? null : data, _stat); + if (_err) { + callback(_mapError(_err)); } else { - done = true; - stat = _stat; - err = _err; + doReadFile(_stat); } }); } - - appshell.fs.readFile(path, encoding, function (_err, _data) { - if (_err) { - callback(_mapError(_err)); - return; - } - - if (done) { - callback(err, err ? null : _data, stat); - } else { - done = true; - data = _data; - } - }); } - /** * Write data to the file at the given path, calling back asynchronously with * either a FileSystemError string or the FileSystemStats object associated @@ -568,6 +564,7 @@ define(function (require, exports, module) { _nodeDomain.exec("unwatchAll") .then(callback, callback); } + // Export public API exports.showOpenDialog = showOpenDialog; diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 5f7f54b5f95..784e6d97eb0 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -34,6 +34,7 @@ define({ "GENERIC_ERROR" : "(error {0})", "NOT_FOUND_ERR" : "The file could not be found.", "NOT_READABLE_ERR" : "The file could not be read.", + "EXCEEDS_MAX_FILE_SIZE" : "Files larger than {0} MB cannot be opened in {APP_NAME}.", "NO_MODIFICATION_ALLOWED_ERR" : "The target directory cannot be modified.", "NO_MODIFICATION_ALLOWED_ERR_FILE" : "The permissions do not allow you to make modifications.", "CONTENTS_MODIFIED_ERR" : "The file has been modified outside of {APP_NAME}.", From a460c4737e6b4895dedf75d175f2edc3758ef106 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Fri, 17 Oct 2014 14:48:31 -0700 Subject: [PATCH 182/182] Fix unit test failure -- file-read wasn't always passing back correct error codes anymore. If the initial stat() fails (e.g. file doesn't exist or permission denied), we were double-converting the error code from brackets-shell format to FS impl API format, causing it to get mangled and treated as "Unknown." --- src/filesystem/impls/appshell/AppshellFileSystem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filesystem/impls/appshell/AppshellFileSystem.js b/src/filesystem/impls/appshell/AppshellFileSystem.js index 521c55459de..2d8f9129e8a 100644 --- a/src/filesystem/impls/appshell/AppshellFileSystem.js +++ b/src/filesystem/impls/appshell/AppshellFileSystem.js @@ -386,7 +386,7 @@ define(function (require, exports, module) { } else { exports.stat(path, function (_err, _stat) { if (_err) { - callback(_mapError(_err)); + callback(_err); } else { doReadFile(_stat); }