From 4eee5ea8e8d81d7be944c6bf776b62633576af13 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Mon, 27 Jan 2014 14:34:39 -0800 Subject: [PATCH 01/55] Add new apis for view state migration and convert the remaining old preferences to the new apis. --- src/LiveDevelopment/main.js | 22 +++++++++---- src/brackets.js | 7 ++--- src/document/DocumentManager.js | 13 ++------ src/extensions/default/RecentProjects/main.js | 10 +++--- src/preferences/PreferencesManager.js | 11 +++++++ src/project/ProjectManager.js | 31 +++++++------------ src/project/WorkingSetSort.js | 30 +++++++++++------- src/search/FindReplace.js | 26 ++++++++++------ src/utils/Resizer.js | 17 +++------- src/utils/UpdateNotification.js | 19 +++++------- src/view/ViewCommandHandlers.js | 26 +++++----------- 11 files changed, 101 insertions(+), 111 deletions(-) diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index 318f8e7bf0e..0e30d505acf 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -52,7 +52,6 @@ define(function main(require, exports, module) { ExtensionUtils = require("utils/ExtensionUtils"), StringUtils = require("utils/StringUtils"); - var prefs; var params = new UrlParams(); var config = { experimental: false, // enable experimental features @@ -125,8 +124,8 @@ define(function main(require, exports, module) { if (LiveDevelopment.status >= LiveDevelopment.STATUS_CONNECTING) { LiveDevelopment.close(); } else { - if (!params.get("skipLiveDevelopmentInfo") && !prefs.getValue("afterFirstLaunch")) { - prefs.setValue("afterFirstLaunch", "true"); + if (!params.get("skipLiveDevelopmentInfo") && !PreferencesManager.get("afterFirstLaunch")) { + PreferencesManager.setValueAndSave("afterFirstLaunch", "true"); Dialogs.showModalDialog( DefaultDialogs.DIALOG_ID_INFO, Strings.LIVE_DEVELOPMENT_INFO_TITLE, @@ -213,7 +212,7 @@ define(function main(require, exports, module) { } else { LiveDevelopment.hideHighlight(); } - prefs.setValue("highlight", config.highlight); + PreferencesManager.setValueAndSave("highlight", config.highlight); } /** Setup window references to useful LiveDevelopment modules */ @@ -256,9 +255,20 @@ define(function main(require, exports, module) { }); // init prefs - prefs = PreferencesManager.getPreferenceStorage(module, {highlight: true}); + PreferencesManager.definePreference("highlight", "boolean", true); - config.highlight = prefs.getValue("highlight"); + /** + * @private + * + * Manage the conversion from old-style localStorage prefs to the new file-based ones. + */ + function _convertPreferences() { + PreferencesManager.convertPreferences(module, {"highlight": "user"}); + } + + _convertPreferences(); + + config.highlight = PreferencesManager.get("highlight"); // init commands CommandManager.register(Strings.CMD_LIVE_FILE_PREVIEW, Commands.FILE_LIVE_FILE_PREVIEW, _handleGoLiveCommand); diff --git a/src/brackets.js b/src/brackets.js index 48b982414de..8e14ef8e53d 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -214,11 +214,10 @@ define(function (require, exports, module) { // the samples folder on first launch), open it automatically. (We explicitly check for the // samples folder in case this is the first time we're launching Brackets after upgrading from // an old version that might not have set the "afterFirstLaunch" pref.) - var prefs = PreferencesManager.getPreferenceStorage(module), - deferred = new $.Deferred(); + var deferred = new $.Deferred(); - if (!params.get("skipSampleProjectLoad") && !prefs.getValue("afterFirstLaunch")) { - prefs.setValue("afterFirstLaunch", "true"); + if (!params.get("skipSampleProjectLoad") && !PreferencesManager.getViewState("afterFirstLaunch")) { + PreferencesManager.setViewState("afterFirstLaunch", "true"); if (ProjectManager.isWelcomeProjectPath(initialProjectPath)) { FileSystem.resolve(initialProjectPath + "index.html", function (err, file) { if (!err) { diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index bc1467b9822..930349515f4 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -111,12 +111,6 @@ define(function (require, exports, module) { */ var _currentDocument = null; - /** - * @private - * @type {PreferenceStorage} - */ - var _prefs = {}; - /** * Returns the Document that is currently open in the editor UI. May be null. * When this changes, DocumentManager dispatches a "currentDocumentChange" event. The current @@ -844,7 +838,7 @@ define(function (require, exports, module) { }); // append file root to make file list unique for each project - _prefs.setValue("files_" + projectRoot.fullPath, files); + PreferencesManager.setViewState("files_" + projectRoot.fullPath, files); } /** @@ -854,7 +848,7 @@ define(function (require, exports, module) { function _projectOpen(e) { // file root is appended for each project var projectRoot = ProjectManager.getProjectRoot(), - files = _prefs.getValue("files_" + projectRoot.fullPath); + files = PreferencesManager.getViewState("files_" + projectRoot.fullPath); console.assert(Object.keys(_openDocuments).length === 0); // no files leftover from prev proj @@ -1028,9 +1022,6 @@ define(function (require, exports, module) { exports.notifyPathNameChanged = notifyPathNameChanged; exports.notifyPathDeleted = notifyPathDeleted; - // Setup preferences - _prefs = PreferencesManager.getPreferenceStorage(module); - // Performance measurements PerfUtils.createPerfMeasurement("DOCUMENT_MANAGER_GET_DOCUMENT_FOR_PATH", "DocumentManager.getDocumentForPath()"); diff --git a/src/extensions/default/RecentProjects/main.js b/src/extensions/default/RecentProjects/main.js index e204b3c0f3c..54904f28f42 100644 --- a/src/extensions/default/RecentProjects/main.js +++ b/src/extensions/default/RecentProjects/main.js @@ -47,8 +47,6 @@ define(function (require, exports, module) { var KeyboardPrefs = JSON.parse(require("text!keyboard.json")); - var prefs = PreferencesManager.getPreferenceStorage(module); - /** @const {string} Recent Projects commands ID */ var TOGGLE_DROPDOWN = "recentProjects.toggle"; @@ -66,7 +64,7 @@ define(function (require, exports, module) { * Warning: unlike most paths in Brackets, these lack a trailing "/" */ function getRecentProjects() { - var recentProjects = prefs.getValue("recentProjects") || [], + var recentProjects = PreferencesManager.getViewState("recentProjects") || [], i; for (i = 0; i < recentProjects.length; i++) { @@ -91,7 +89,7 @@ define(function (require, exports, module) { if (recentProjects.length > MAX_PROJECTS) { recentProjects = recentProjects.slice(0, MAX_PROJECTS); } - prefs.setValue("recentProjects", recentProjects); + PreferencesManager.setViewState("recentProjects", recentProjects); } /** @@ -131,7 +129,7 @@ define(function (require, exports, module) { newProjects.push(recentProjects[i]); } } - prefs.setValue("recentProjects", newProjects); + PreferencesManager.setViewState("recentProjects", newProjects); $(this).closest("li").remove(); checkHovers(e.pageX, e.pageY); @@ -195,7 +193,7 @@ define(function (require, exports, module) { // remove project recentProjects.splice(index, 1); - prefs.setValue("recentProjects", recentProjects); + PreferencesManager.setViewState("recentProjects", recentProjects); checkHovers(e.pageX, e.pageY); if (recentProjects.length === 1) { diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index b8d9deab61d..1c20f995b3b 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -322,6 +322,15 @@ define(function (require, exports, module) { preferencesManager.save(); } + function getViewState(id) { + return stateManager.get(id); + } + + function setViewState(id, value) { + stateManager.set(id, value); + stateManager.save(); + } + // Private API for unit testing and use elsewhere in Brackets core exports._manager = preferencesManager; exports._setCurrentEditingFile = preferencesManager.setPathScopeContext.bind(preferencesManager); @@ -337,6 +346,8 @@ define(function (require, exports, module) { exports.getPreference = preferencesManager.getPreference.bind(preferencesManager); exports.getExtensionPrefs = getExtensionPrefs; exports.setValueAndSave = setValueAndSave; + exports.getViewState = getViewState; + exports.setViewState = setViewState; exports.addScope = preferencesManager.addScope.bind(preferencesManager); exports.stateManager = stateManager; exports.FileStorage = PreferencesBase.FileStorage; diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 2c5f63f6dd5..6e272d2900a 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -163,12 +163,6 @@ define(function (require, exports, module) { */ var _projectBaseUrl = ""; - /** - * @private - * @type {PreferenceStorage} - */ - var _prefs = null; - /** * @private * Used to initialize jstree state @@ -341,7 +335,7 @@ define(function (require, exports, module) { _projectBaseUrl += "/"; } - _prefs.setValue(_getBaseUrlKey(), _projectBaseUrl); + PreferencesManager.setViewState(_getBaseUrlKey(), _projectBaseUrl); } /** @@ -390,7 +384,7 @@ define(function (require, exports, module) { function _savePreferences() { // save the current project - _prefs.setValue("projectPath", _projectRoot.fullPath); + PreferencesManager.setViewState("projectPath", _projectRoot.fullPath); // save jstree state var openNodes = [], @@ -425,7 +419,7 @@ define(function (require, exports, module) { }); // Store the open nodes by their full path and persist to storage - _prefs.setValue(_getTreeStateKey(_projectRoot.fullPath), openNodes); + PreferencesManager.setViewState(_getTreeStateKey(_projectRoot.fullPath), openNodes); } /** @@ -928,7 +922,7 @@ define(function (require, exports, module) { return true; } var pathNoSlash = FileUtils.stripTrailingSlash(path); // "welcomeProjects" pref has standardized on no trailing "/" - var welcomeProjects = _prefs.getValue("welcomeProjects") || []; + var welcomeProjects = PreferencesManager.getViewState("welcomeProjects") || []; return welcomeProjects.indexOf(pathNoSlash) !== -1; } @@ -938,10 +932,10 @@ define(function (require, exports, module) { function addWelcomeProjectPath(path) { var pathNoSlash = FileUtils.stripTrailingSlash(path); // "welcomeProjects" pref has standardized on no trailing "/" - var welcomeProjects = _prefs.getValue("welcomeProjects") || []; + var welcomeProjects = PreferencesManager.getViewState("welcomeProjects") || []; if (welcomeProjects.indexOf(pathNoSlash) === -1) { welcomeProjects.push(pathNoSlash); - _prefs.setValue("welcomeProjects", welcomeProjects); + PreferencesManager.setViewState("welcomeProjects", welcomeProjects); } } @@ -961,7 +955,7 @@ define(function (require, exports, module) { * first launch. */ function getInitialProjectPath() { - return updateWelcomeProjectPath(_prefs.getValue("projectPath")); + return updateWelcomeProjectPath(PreferencesManager.getViewState("projectPath")); } /** @@ -1075,7 +1069,7 @@ define(function (require, exports, module) { }; // restore project tree state from last time this project was open - _projectInitialLoad.previous = _prefs.getValue(_getTreeStateKey(rootPath)) || []; + _projectInitialLoad.previous = PreferencesManager.getViewState(_getTreeStateKey(rootPath)) || []; // Populate file tree as long as we aren't running in the browser if (!brackets.inBrowser) { @@ -1095,7 +1089,7 @@ define(function (require, exports, module) { var perfTimerName = PerfUtils.markStart("Load Project: " + rootPath); _projectRoot = rootEntry; - _projectBaseUrl = _prefs.getValue(_getBaseUrlKey()) || ""; + _projectBaseUrl = PreferencesManager.getViewState(_getBaseUrlKey()) || ""; // If this is the most current welcome project, record it. In future launches, we want // to substitute the latest welcome project from the current build instead of using an @@ -2139,11 +2133,8 @@ define(function (require, exports, module) { }); }); - // Init PreferenceStorage - var defaults = { - projectPath: _getWelcomeProjectPath() /* initialize to welcome project */ - }; - _prefs = PreferencesManager.getPreferenceStorage(module, defaults); + // Init default project path to welcome project + PreferencesManager.stateManager.definePreference("projectPath", "string", _getWelcomeProjectPath()); // Event Handlers $(FileViewController).on("documentSelectionFocusChange", _documentSelectionFocusChange); diff --git a/src/project/WorkingSetSort.js b/src/project/WorkingSetSort.js index 2f3e0beb240..79baced9fda 100644 --- a/src/project/WorkingSetSort.js +++ b/src/project/WorkingSetSort.js @@ -44,12 +44,6 @@ define(function (require, exports, module) { automaticSort: false }; - /** - * @private - * @type {PreferenceStorage} - */ - var _prefs = {}; - /** * @private * @type {Array.} @@ -116,7 +110,7 @@ define(function (require, exports, module) { */ function setAutomatic(enable) { _automaticSort = enable; - _prefs.setValue("automaticSort", _automaticSort); + PreferencesManager.setValueAndSave("automaticSort", _automaticSort); CommandManager.get(Commands.SORT_WORKINGSET_AUTO).setChecked(_automaticSort); if (enable) { @@ -164,7 +158,7 @@ define(function (require, exports, module) { CommandManager.get(Commands.SORT_WORKINGSET_AUTO).setEnabled(!!newSort.getEvents()); _currentSort = newSort; - _prefs.setValue("currentSort", _currentSort.getCommandID()); + PreferencesManager.setValueAndSave("currentSort", _currentSort.getCommandID()); } } @@ -321,13 +315,25 @@ define(function (require, exports, module) { CommandManager.register(Strings.CMD_SORT_WORKINGSET_AUTO, Commands.SORT_WORKINGSET_AUTO, _handleAutomaticSort); - // Initialize PreferenceStorage - _prefs = PreferencesManager.getPreferenceStorage(module, defaultPrefs); + // Initialize default values for sorting preferences + PreferencesManager.definePreference("currentSort", "string", Commands.SORT_WORKINGSET_BY_ADDED); + PreferencesManager.definePreference("automaticSort", "boolean", false); + + /** + * @private + * + * Manage the conversion from old-style localStorage prefs to the new file-based ones. + */ + function _convertPreferences() { + PreferencesManager.convertPreferences(module, {"currentSort": "user", "automaticSort": "user"}); + } + + _convertPreferences(); // Initialize items dependent on extensions/workingSet AppInit.appReady(function () { - var curSort = get(_prefs.getValue("currentSort")), - autoSort = _prefs.getValue("automaticSort"); + var curSort = get(PreferencesManager.get("currentSort")), + autoSort = PreferencesManager.get("automaticSort"); if (curSort) { _setCurrentSort(curSort); diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js index 6a596608e65..bc0cc7972e4 100644 --- a/src/search/FindReplace.js +++ b/src/search/FindReplace.js @@ -65,11 +65,6 @@ define(function (require, exports, module) { /** @const Maximum number of matches to collect for Replace All; any additional matches are not listed in the panel & are not replaced */ var REPLACE_ALL_MAX = 300; - var _prefs = PreferencesManager.getPreferenceStorage(module, { - caseSensitive: false, - regexp: false - }); - /** @type {!Panel} Panel that shows results of replaceAll action */ var replaceAllPanel = null; @@ -89,6 +84,8 @@ define(function (require, exports, module) { /** @type {!function():void} API from FindInFiles for closing its conflicting search bar, if open */ var closeFindInFilesBar; + PreferencesManager.definePreference("caseSensitive", "boolean", false); + PreferencesManager.definePreference("regexp", "boolean", false); function SearchState() { this.searchStartPos = null; @@ -110,12 +107,12 @@ define(function (require, exports, module) { } function _updateSearchBarFromPrefs() { - $("#find-case-sensitive").toggleClass("active", _prefs.getValue("caseSensitive")); - $("#find-regexp").toggleClass("active", _prefs.getValue("regexp")); + $("#find-case-sensitive").toggleClass("active", PreferencesManager.get("caseSensitive")); + $("#find-regexp").toggleClass("active", PreferencesManager.get("regexp")); } function _updatePrefsFromSearchBar() { - _prefs.setValue("caseSensitive", $("#find-case-sensitive").is(".active")); - _prefs.setValue("regexp", $("#find-regexp").is(".active")); + PreferencesManager.setValueAndSave("caseSensitive", $("#find-case-sensitive").is(".active")); + PreferencesManager.setValueAndSave("regexp", $("#find-regexp").is(".active")); } function parseQuery(query) { @@ -668,6 +665,17 @@ define(function (require, exports, module) { } } + /** + * @private + * + * Manage the conversion from old-style localStorage prefs to the new file-based ones. + */ + function _convertPreferences() { + PreferencesManager.convertPreferences(module, {"caseSensitive": "user", "regexp": "user"}); + } + + _convertPreferences(); + // Initialize items dependent on HTML DOM AppInit.htmlReady(function () { var panelHtml = Mustache.render(searchReplacePanelTemplate, Strings); diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index d4b10f7c28e..a11c5ebdf36 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -62,12 +62,6 @@ define(function (require, exports, module) { var AppInit = require("utils/AppInit"), PreferencesManager = require("preferences/PreferencesManager"); - /** - * @private - * @type {PreferenceStorage} - */ - var _prefs = null; - var $mainView; /** @@ -155,7 +149,7 @@ define(function (require, exports, module) { $resizableElement = $($element.find(".resizable-content:first")[0]), $body = $(window.document.body), elementID = $element.attr("id"), - elementPrefs = _prefs.getValue(elementID) || {}, + elementPrefs = PreferencesManager.getViewState(elementID) || {}, animationRequest = null, directionProperty = direction === DIRECTION_HORIZONTAL ? "clientX" : "clientY", directionIncrement = (position === POSITION_TOP || position === POSITION_LEFT) ? 1 : -1, @@ -220,7 +214,7 @@ define(function (require, exports, module) { adjustSibling(elementSize); $element.trigger("panelExpanded", [elementSize]); - _prefs.setValue(elementID, elementPrefs); + PreferencesManager.setViewState(elementID, elementPrefs); }); $element.data("hide", function () { @@ -242,7 +236,7 @@ define(function (require, exports, module) { adjustSibling(0); $element.trigger("panelCollapsed", [elementSize]); - _prefs.setValue(elementID, elementPrefs); + PreferencesManager.setViewState(elementID, elementPrefs); }); // If the resizer is positioned right or bottom of the panel, we need to listen to @@ -361,7 +355,7 @@ define(function (require, exports, module) { if ($resizableElement.length) { elementPrefs.contentSize = contentSizeFunction.apply($resizableElement); } - _prefs.setValue(elementID, elementPrefs); + PreferencesManager.setViewState(elementID, elementPrefs); repositionResizer(elementSize); } @@ -407,9 +401,6 @@ define(function (require, exports, module) { } } - // Init PreferenceStorage - _prefs = PreferencesManager.getPreferenceStorage(module); - // Scan DOM for horz-resizable and vert-resizable classes and make them resizable AppInit.htmlReady(function () { var minSize = DEFAULT_MIN_SIZE; diff --git a/src/utils/UpdateNotification.js b/src/utils/UpdateNotification.js index be4e7c18d90..d7073c09b43 100644 --- a/src/utils/UpdateNotification.js +++ b/src/utils/UpdateNotification.js @@ -41,22 +41,19 @@ define(function (require, exports, module) { UpdateDialogTemplate = require("text!htmlContent/update-dialog.html"), UpdateListTemplate = require("text!htmlContent/update-list.html"); - var defaultPrefs = {lastNotifiedBuildNumber: 0}; - - // Extract current build number from package.json version field 0.0.0-0 var _buildNumber = Number(/-([0-9]+)/.exec(brackets.metadata.version)[1]); - // PreferenceStorage - var _prefs = PreferencesManager.getPreferenceStorage(module, defaultPrefs); + // Init default last build number + PreferencesManager.stateManager.definePreference("lastNotifiedBuildNumber", "number", 0); // This is the last version we notified the user about. If checkForUpdate() // is called with "false", only show the update notification dialog if there // is an update newer than this one. This value is saved in preferences. - var _lastNotifiedBuildNumber = _prefs.getValue("lastNotifiedBuildNumber"); + var _lastNotifiedBuildNumber = PreferencesManager.getViewState("lastNotifiedBuildNumber"); // Last time the versionInfoURL was fetched - var _lastInfoURLFetchTime = _prefs.getValue("lastInfoURLFetchTime"); + var _lastInfoURLFetchTime = PreferencesManager.getViewState("lastInfoURLFetchTime"); // URL to load version info from. By default this is loaded no more than once a day. If // you force an update check it is always loaded. @@ -106,7 +103,7 @@ define(function (require, exports, module) { } // If we don't have data saved in prefs, fetch - data = _prefs.getValue("updateInfo"); + data = PreferencesManager.getViewState("updateInfo"); if (!data) { fetchData = true; } @@ -126,8 +123,8 @@ define(function (require, exports, module) { data = JSON.parse(jqXHR.responseText); if (!dontCache) { _lastInfoURLFetchTime = (new Date()).getTime(); - _prefs.setValue("lastInfoURLFetchTime", _lastInfoURLFetchTime); - _prefs.setValue("updateInfo", data); + PreferencesManager.setViewState("lastInfoURLFetchTime", _lastInfoURLFetchTime); + PreferencesManager.setViewState("updateInfo", data); } result.resolve(data); } catch (e) { @@ -285,7 +282,7 @@ define(function (require, exports, module) { _lastNotifiedBuildNumber = allUpdates[0].buildNumber; // Don't save prefs is we have overridden values if (!usingOverrides) { - _prefs.setValue("lastNotifiedBuildNumber", _lastNotifiedBuildNumber); + PreferencesManager.setViewState("lastNotifiedBuildNumber", _lastNotifiedBuildNumber); } } } else if (force) { diff --git a/src/view/ViewCommandHandlers.js b/src/view/ViewCommandHandlers.js index 81e16ae8993..533ffc47162 100644 --- a/src/view/ViewCommandHandlers.js +++ b/src/view/ViewCommandHandlers.js @@ -77,18 +77,6 @@ define(function (require, exports, module) { */ var LINE_HEIGHT = 1.25; - /** - * @private - * @type {PreferenceStorage} - */ - var _prefs = {}; - - /** - * @private - * @type {PreferenceStorage} - */ - var _defaultPrefs = { fontSizeAdjustment: 0 }; - /** * @private * @type {boolean} @@ -198,21 +186,21 @@ define(function (require, exports, module) { /** Increases the font size by 1 */ function _handleIncreaseFontSize() { if (_adjustFontSize(1)) { - _prefs.setValue("fontSizeAdjustment", _prefs.getValue("fontSizeAdjustment") + 1); + PreferencesManager.setViewState("fontSizeAdjustment", PreferencesManager.getViewState("fontSizeAdjustment") + 1); } } /** Decreases the font size by 1 */ function _handleDecreaseFontSize() { if (_adjustFontSize(-1)) { - _prefs.setValue("fontSizeAdjustment", _prefs.getValue("fontSizeAdjustment") - 1); + PreferencesManager.setViewState("fontSizeAdjustment", PreferencesManager.getViewState("fontSizeAdjustment") - 1); } } /** Restores the font size to the original size */ function _handleRestoreFontSize() { - _adjustFontSize(-_prefs.getValue("fontSizeAdjustment")); - _prefs.setValue("fontSizeAdjustment", 0); + _adjustFontSize(-PreferencesManager.getViewState("fontSizeAdjustment")); + PreferencesManager.setViewState("fontSizeAdjustment", 0); } @@ -233,7 +221,7 @@ define(function (require, exports, module) { // Font Size preferences only need to be loaded one time if (!_fontSizePrefsLoaded) { _removeDynamicFontSize(); - _adjustFontSize(_prefs.getValue("fontSizeAdjustment")); + _adjustFontSize(PreferencesManager.getViewState("fontSizeAdjustment")); _fontSizePrefsLoaded = true; } @@ -358,8 +346,8 @@ define(function (require, exports, module) { CommandManager.register(Strings.CMD_SCROLL_LINE_UP, Commands.VIEW_SCROLL_LINE_UP, _handleScrollLineUp); CommandManager.register(Strings.CMD_SCROLL_LINE_DOWN, Commands.VIEW_SCROLL_LINE_DOWN, _handleScrollLineDown); - // Initialize the PreferenceStorage - _prefs = PreferencesManager.getPreferenceStorage(module, _defaultPrefs); + // Initialize the default font size + PreferencesManager.stateManager.definePreference("fontSizeAdjustment", "number", 0); // Update UI when opening or closing a document $(DocumentManager).on("currentDocumentChange", _updateUI); From 6d859c87dbb0649b308f16ffa6f3cdd73f2c8666 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Wed, 29 Jan 2014 17:10:37 -0800 Subject: [PATCH 02/55] Fix the hang issue when viewing a search result with state.json file open. --- src/preferences/PreferencesManager.js | 20 ++++++++++++++++++-- src/utils/Resizer.js | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 1c20f995b3b..215d77d38e5 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -322,13 +322,29 @@ define(function (require, exports, module) { preferencesManager.save(); } + /** + * Convenience function that gets a view state + * + * @param {string} id preference to get + */ function getViewState(id) { return stateManager.get(id); } - function setViewState(id, value) { + /** + * Convenience function that sets a view state and then saves the file + * + * @param {string} id preference to set + * @param {*} value new value for the preference + * @param {boolean=} dontSave If it is undefined or false, then save the + * view state immediately. + */ + function setViewState(id, value, dontSave) { stateManager.set(id, value); - stateManager.save(); + + if (!dontSave) { + stateManager.save(); + } } // Private API for unit testing and use elsewhere in Brackets core diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index a11c5ebdf36..a1aecaf996d 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -214,7 +214,7 @@ define(function (require, exports, module) { adjustSibling(elementSize); $element.trigger("panelExpanded", [elementSize]); - PreferencesManager.setViewState(elementID, elementPrefs); + PreferencesManager.setViewState(elementID, elementPrefs, true); }); $element.data("hide", function () { @@ -236,7 +236,7 @@ define(function (require, exports, module) { adjustSibling(0); $element.trigger("panelCollapsed", [elementSize]); - PreferencesManager.setViewState(elementID, elementPrefs); + PreferencesManager.setViewState(elementID, elementPrefs, true); }); // If the resizer is positioned right or bottom of the panel, we need to listen to From 72658eb12551089ae843621d7a74a71c6d490597 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Sun, 2 Feb 2014 22:57:39 -0800 Subject: [PATCH 03/55] Implement view states migration from the old preference model. --- src/LiveDevelopment/main.js | 28 +++++++------ src/brackets.js | 6 +-- src/document/DocumentManager.js | 20 ++++++++++ src/extensions/default/RecentProjects/main.js | 1 + src/preferences/PreferenceStorage.js | 39 ++++++++++++++----- src/preferences/PreferencesManager.js | 33 ++++++++++------ src/project/ProjectManager.js | 24 ++++++++++++ src/project/WorkingSetSort.js | 23 ++++------- src/search/FindReplace.js | 24 ++++-------- src/utils/Resizer.js | 20 ++++++++++ src/utils/UpdateNotification.js | 6 +++ src/view/ViewCommandHandlers.js | 1 + 12 files changed, 154 insertions(+), 71 deletions(-) diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index 0e30d505acf..2ee843c6e67 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -124,8 +124,8 @@ define(function main(require, exports, module) { if (LiveDevelopment.status >= LiveDevelopment.STATUS_CONNECTING) { LiveDevelopment.close(); } else { - if (!params.get("skipLiveDevelopmentInfo") && !PreferencesManager.get("afterFirstLaunch")) { - PreferencesManager.setValueAndSave("afterFirstLaunch", "true"); + if (!params.get("skipLiveDevelopmentInfo") && !PreferencesManager.getViewState("livedev.afterFirstLaunch")) { + PreferencesManager.setViewState("livedev.afterFirstLaunch", "true"); Dialogs.showModalDialog( DefaultDialogs.DIALOG_ID_INFO, Strings.LIVE_DEVELOPMENT_INFO_TITLE, @@ -212,7 +212,7 @@ define(function main(require, exports, module) { } else { LiveDevelopment.hideHighlight(); } - PreferencesManager.setValueAndSave("highlight", config.highlight); + PreferencesManager.setViewState("livedev.highlight", config.highlight); } /** Setup window references to useful LiveDevelopment modules */ @@ -255,20 +255,18 @@ define(function main(require, exports, module) { }); // init prefs - PreferencesManager.definePreference("highlight", "boolean", true); - - /** - * @private - * - * Manage the conversion from old-style localStorage prefs to the new file-based ones. - */ - function _convertPreferences() { - PreferencesManager.convertPreferences(module, {"highlight": "user"}); - } + PreferencesManager.stateManager.definePreference("livedev.highlight", "boolean", true) + .on("change", function () { + config.highlight = PreferencesManager.getViewState("livedev.highlight"); + _updateHighlightCheckmark(); + }); - _convertPreferences(); + PreferencesManager.convertPreferences(module, { + "highlight": "user livedev.highlight", + "afterFirstLaunch": "user livedev.afterFirstLaunch" + }, true); - config.highlight = PreferencesManager.get("highlight"); + config.highlight = PreferencesManager.getViewState("livedev.highlight"); // init commands CommandManager.register(Strings.CMD_LIVE_FILE_PREVIEW, Commands.FILE_LIVE_FILE_PREVIEW, _handleGoLiveCommand); diff --git a/src/brackets.js b/src/brackets.js index 8e14ef8e53d..e70acdf54e0 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -213,11 +213,11 @@ define(function (require, exports, module) { // If this is the first launch, and we have an index.html file in the project folder (which should be // the samples folder on first launch), open it automatically. (We explicitly check for the // samples folder in case this is the first time we're launching Brackets after upgrading from - // an old version that might not have set the "afterFirstLaunch" pref.) + // an old version that might not have set the "livedev.afterFirstLaunch" pref.) var deferred = new $.Deferred(); - if (!params.get("skipSampleProjectLoad") && !PreferencesManager.getViewState("afterFirstLaunch")) { - PreferencesManager.setViewState("afterFirstLaunch", "true"); + if (!params.get("skipSampleProjectLoad") && !PreferencesManager.getViewState("livedev.afterFirstLaunch")) { + PreferencesManager.setViewState("livedev.afterFirstLaunch", "true"); if (ProjectManager.isWelcomeProjectPath(initialProjectPath)) { FileSystem.resolve(initialProjectPath + "index.html", function (err, file) { if (!err) { diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 930349515f4..3acb21b1ccc 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -986,6 +986,26 @@ define(function (require, exports, module) { $(exports).triggerHandler("documentSaved", doc); }); + /** + * @private + * Exemine each preference key for migration of the working set files. + * If the key has a prefix of "files_/", then it is a working set files + * preference from old preference model. + * + * @param {string} key The key of the preference to be exemined + * for migration of working set files. + * @return {?string} - the scope to which the preference is to be migrated + */ + function _checkPreferencePrefix(key) { + if (key.indexOf("files_/") === 0) { + return "user"; + } + + return null; + } + + PreferencesManager.convertPreferences(module, {"files_": "user"}, true, _checkPreferencePrefix); + // Handle file saves that may affect preferences $(exports).on("documentSaved", function (e, doc) { PreferencesManager.fileChanged(doc.file.fullPath); diff --git a/src/extensions/default/RecentProjects/main.js b/src/extensions/default/RecentProjects/main.js index 54904f28f42..4a24055e2ba 100644 --- a/src/extensions/default/RecentProjects/main.js +++ b/src/extensions/default/RecentProjects/main.js @@ -458,6 +458,7 @@ define(function (require, exports, module) { } } + PreferencesManager.convertPreferences(module, {"recentProjects": "user"}, true); // Register command handlers CommandManager.register(Strings.CMD_TOGGLE_RECENT_PROJECTS, TOGGLE_DROPDOWN, handleKeyEvent); diff --git a/src/preferences/PreferenceStorage.js b/src/preferences/PreferenceStorage.js index b292bb1a07c..ae28344eaf2 100644 --- a/src/preferences/PreferenceStorage.js +++ b/src/preferences/PreferenceStorage.js @@ -179,16 +179,21 @@ define(function (require, exports, module) { /** * Converts preferences to the new-style file-based preferences according to the - * rules. (See PreferencesManager.ConvertSettings for information about the rules). + * rules. (See PreferencesManager.ConvertPreferences for information about the rules). * * @param {Object} rules Conversion rules. * @param {Array.} convertedKeys List of keys that were previously converted * (will not be reconverted) + * @param {boolean=} isViewState If it is undefined or false, then the preferences + * listed in 'rules' are those normal user-editable preferences. Otherwise, + * they are view state settings. + * @param {function(string)=} prefCheckCallback Optional callback function that + * exemines each preference key for migration. * @return {Promise} promise that is resolved once the conversion is done. Callbacks are given a * `complete` flag that denotes whether everything from this object * was converted (making it safe to delete entirely). */ - PreferenceStorage.prototype.convert = function (rules, convertedKeys) { + PreferenceStorage.prototype.convert = function (rules, convertedKeys, isViewState, prefCheckCallback) { var prefs = this._json, self = this, complete = true, @@ -204,6 +209,9 @@ define(function (require, exports, module) { } var rule = rules[key]; + if (!rule && prefCheckCallback) { + rule = prefCheckCallback(key); + } if (!rule) { console.warn("Preferences conversion for ", self._clientID, " has no rule for", key); complete = false; @@ -211,7 +219,11 @@ define(function (require, exports, module) { var parts = rule.split(" "); if (parts[0] === "user") { var newKey = parts.length > 1 ? parts[1] : key; - PreferencesManager.set(newKey, prefs[key]); + if (isViewState) { + PreferencesManager.stateManager.set(newKey, prefs[key]); + } else { + PreferencesManager.set(newKey, prefs[key]); + } convertedKeys.push(key); } } else { @@ -220,12 +232,21 @@ define(function (require, exports, module) { }); if (convertedKeys.length > 0) { - PreferencesManager.save().done(function () { - _commit(); - deferred.resolve(complete, convertedKeys); - }).fail(function (error) { - deferred.reject(error); - }); + if (isViewState) { + PreferencesManager.stateManager.save().done(function () { + _commit(); + deferred.resolve(complete, convertedKeys); + }).fail(function (error) { + deferred.reject(error); + }); + } else { + PreferencesManager.save().done(function () { + _commit(); + deferred.resolve(complete, convertedKeys); + }).fail(function (error) { + deferred.reject(error); + }); + } } else { deferred.resolve(complete, convertedKeys); } diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 215d77d38e5..178594e663b 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -224,7 +224,18 @@ define(function (require, exports, module) { function getUserPrefFile() { return userPrefFile; } + + // TODO: In order to migrate all view states I have to move the code that creates stateManager + // (and adds a user scope to it) before the code that creates preferencesManager and all its scopes. + // Need to figure out why ??? + // + // "State" is stored like preferences but it is not generally intended to be user-editable. + // It's for more internal, implicit things like window size, working set, etc. + var stateManager = new PreferencesBase.PreferencesSystem(); + var userStateFile = brackets.app.getApplicationSupportDirectory() + "/" + STATE_FILENAME; + stateManager.addScope("user", new PreferencesBase.FileStorage(userStateFile, true)); + var preferencesManager = new PreferencesBase.PreferencesSystem(); var userScope = preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true)); @@ -278,8 +289,13 @@ define(function (require, exports, module) { * * @param {string|Object} clientID ClientID used in the old preferences * @param {Object} rules Rules for conversion (as defined above) + * @param {boolean=} isViewState If it is undefined or false, then the preferences + * listed in 'rules' are those normal user-editable preferences. Otherwise, + * they are view state settings. + * @param {function(string)=} prefCheckCallback Optional callback function that + * exemines each preference key for migration. */ - function convertPreferences(clientID, rules) { + function convertPreferences(clientID, rules, isViewState, prefCheckCallback) { userScope.done(function () { var prefs = getPreferenceStorage(clientID, null, true); @@ -293,22 +309,17 @@ define(function (require, exports, module) { } var convertedKeysMap = prefStorage.convertedKeysMap; - prefs.convert(rules, convertedKeysMap[prefsID]).done(function (complete, convertedKeys) { - prefStorage.convertedKeysMap[prefsID] = convertedKeys; - savePreferences(); - }); + prefs.convert(rules, convertedKeysMap[prefsID], isViewState, prefCheckCallback) + .done(function (complete, convertedKeys) { + prefStorage.convertedKeysMap[prefsID] = convertedKeys; + savePreferences(); + }); }).fail(function (error) { console.error("Error while converting ", getClientID(clientID)); console.error(error); }); } - // "State" is stored like preferences but it is not generally intended to be user-editable. - // It's for more internal, implicit things like window size, working set, etc. - var stateManager = new PreferencesBase.PreferencesSystem(); - var userStateFile = brackets.app.getApplicationSupportDirectory() + "/" + STATE_FILENAME; - - stateManager.addScope("user", new PreferencesBase.FileStorage(userStateFile, true)); /** * Convenience function that sets a preference and then saves the file, mimicking the diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 6e272d2900a..866c05518ac 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -2133,8 +2133,32 @@ define(function (require, exports, module) { }); }); + /** + * @private + * Exemine each preference key for migration of project tree states. + * If the key has a prefix of "projectTreeState_/", then it is a project tree states + * preference from old preference model. + * + * @param {string} key The key of the preference to be exemined + * for migration of project tree states. + * @return {?string} - the scope to which the preference is to be migrated + */ + function _checkPreferencePrefix(key) { + if (key.indexOf("projectTreeState_/") === 0) { + return "user"; + } + + return null; + } + // Init default project path to welcome project PreferencesManager.stateManager.definePreference("projectPath", "string", _getWelcomeProjectPath()); + + PreferencesManager.convertPreferences(module, { + "projectPath": "user", + "projectTreeState_": "user", + "welcomeProjects": "user" + }, true, _checkPreferencePrefix); // Event Handlers $(FileViewController).on("documentSelectionFocusChange", _documentSelectionFocusChange); diff --git a/src/project/WorkingSetSort.js b/src/project/WorkingSetSort.js index 79baced9fda..6d4738f87d0 100644 --- a/src/project/WorkingSetSort.js +++ b/src/project/WorkingSetSort.js @@ -110,7 +110,7 @@ define(function (require, exports, module) { */ function setAutomatic(enable) { _automaticSort = enable; - PreferencesManager.setValueAndSave("automaticSort", _automaticSort); + PreferencesManager.setViewState("automaticSort", _automaticSort); CommandManager.get(Commands.SORT_WORKINGSET_AUTO).setChecked(_automaticSort); if (enable) { @@ -158,7 +158,7 @@ define(function (require, exports, module) { CommandManager.get(Commands.SORT_WORKINGSET_AUTO).setEnabled(!!newSort.getEvents()); _currentSort = newSort; - PreferencesManager.setValueAndSave("currentSort", _currentSort.getCommandID()); + PreferencesManager.setViewState("currentSort", _currentSort.getCommandID()); } } @@ -316,24 +316,15 @@ define(function (require, exports, module) { // Initialize default values for sorting preferences - PreferencesManager.definePreference("currentSort", "string", Commands.SORT_WORKINGSET_BY_ADDED); - PreferencesManager.definePreference("automaticSort", "boolean", false); + PreferencesManager.stateManager.definePreference("currentSort", "string", Commands.SORT_WORKINGSET_BY_ADDED); + PreferencesManager.stateManager.definePreference("automaticSort", "boolean", false); - /** - * @private - * - * Manage the conversion from old-style localStorage prefs to the new file-based ones. - */ - function _convertPreferences() { - PreferencesManager.convertPreferences(module, {"currentSort": "user", "automaticSort": "user"}); - } - - _convertPreferences(); + PreferencesManager.convertPreferences(module, {"currentSort": "user", "automaticSort": "user"}, true); // Initialize items dependent on extensions/workingSet AppInit.appReady(function () { - var curSort = get(PreferencesManager.get("currentSort")), - autoSort = PreferencesManager.get("automaticSort"); + var curSort = get(PreferencesManager.getViewState("currentSort")), + autoSort = PreferencesManager.getViewState("automaticSort"); if (curSort) { _setCurrentSort(curSort); diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js index bc0cc7972e4..bd3ecebbad2 100644 --- a/src/search/FindReplace.js +++ b/src/search/FindReplace.js @@ -84,9 +84,6 @@ define(function (require, exports, module) { /** @type {!function():void} API from FindInFiles for closing its conflicting search bar, if open */ var closeFindInFilesBar; - PreferencesManager.definePreference("caseSensitive", "boolean", false); - PreferencesManager.definePreference("regexp", "boolean", false); - function SearchState() { this.searchStartPos = null; this.query = null; @@ -107,12 +104,12 @@ define(function (require, exports, module) { } function _updateSearchBarFromPrefs() { - $("#find-case-sensitive").toggleClass("active", PreferencesManager.get("caseSensitive")); - $("#find-regexp").toggleClass("active", PreferencesManager.get("regexp")); + $("#find-case-sensitive").toggleClass("active", PreferencesManager.getViewState("caseSensitive")); + $("#find-regexp").toggleClass("active", PreferencesManager.getViewState("regexp")); } function _updatePrefsFromSearchBar() { - PreferencesManager.setValueAndSave("caseSensitive", $("#find-case-sensitive").is(".active")); - PreferencesManager.setValueAndSave("regexp", $("#find-regexp").is(".active")); + PreferencesManager.setViewState("caseSensitive", $("#find-case-sensitive").is(".active")); + PreferencesManager.setViewState("regexp", $("#find-regexp").is(".active")); } function parseQuery(query) { @@ -665,16 +662,9 @@ define(function (require, exports, module) { } } - /** - * @private - * - * Manage the conversion from old-style localStorage prefs to the new file-based ones. - */ - function _convertPreferences() { - PreferencesManager.convertPreferences(module, {"caseSensitive": "user", "regexp": "user"}); - } - - _convertPreferences(); + PreferencesManager.stateManager.definePreference("caseSensitive", "boolean", false); + PreferencesManager.stateManager.definePreference("regexp", "boolean", false); + PreferencesManager.convertPreferences(module, {"caseSensitive": "user", "regexp": "user"}, true); // Initialize items dependent on HTML DOM AppInit.htmlReady(function () { diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index a1aecaf996d..dc8133c082f 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -438,6 +438,26 @@ define(function (require, exports, module) { }); }); + /** + * @private + * Exemine each preference key for migration of any panel state. + * + * @param {string} key The key of the preference to be exemined + * for migration of panel states. + * @return {?string} - the scope to which the preference is to be migrated + */ + function _isPanelPreferences(key) { + // TODO: Need to update 'panels' array to include all Edge Code panels. + var panels = ["problems-panel", "search-results"]; + if (panels.indexOf(key) > -1) { + return "user"; + } + + return null; + } + + PreferencesManager.convertPreferences(module, {"panelState": "user"}, true, _isPanelPreferences); + exports.makeResizable = makeResizable; exports.toggle = toggle; exports.show = show; diff --git a/src/utils/UpdateNotification.js b/src/utils/UpdateNotification.js index d7073c09b43..714b5ac22ed 100644 --- a/src/utils/UpdateNotification.js +++ b/src/utils/UpdateNotification.js @@ -46,6 +46,12 @@ define(function (require, exports, module) { // Init default last build number PreferencesManager.stateManager.definePreference("lastNotifiedBuildNumber", "number", 0); + + PreferencesManager.convertPreferences(module, { + "lastNotifiedBuildNumber": "user", + "lastInfoURLFetchTime": "user", + "updateInfo": "user" + }, true); // This is the last version we notified the user about. If checkForUpdate() // is called with "false", only show the update notification dialog if there diff --git a/src/view/ViewCommandHandlers.js b/src/view/ViewCommandHandlers.js index 533ffc47162..d163b9fe789 100644 --- a/src/view/ViewCommandHandlers.js +++ b/src/view/ViewCommandHandlers.js @@ -348,6 +348,7 @@ define(function (require, exports, module) { // Initialize the default font size PreferencesManager.stateManager.definePreference("fontSizeAdjustment", "number", 0); + PreferencesManager.convertPreferences(module, {"fontSizeAdjustment": "user"}, true); // Update UI when opening or closing a document $(DocumentManager).on("currentDocumentChange", _updateUI); From 752856d58d2e9dde14e1af6be615bb7080727b7a Mon Sep 17 00:00:00 2001 From: Michael J Hernandez Date: Fri, 31 Jan 2014 13:48:20 -0800 Subject: [PATCH 04/55] Added language self names in strings-app.js that will be used in favor of localized version for switch language menu --- src/nls/cs/strings.js | 26 -------------------------- src/nls/de/strings.js | 26 -------------------------- src/nls/el/strings.js | 25 ------------------------- src/nls/es/strings.js | 26 -------------------------- src/nls/fa-ir/strings.js | 22 ---------------------- src/nls/fi/strings.js | 21 --------------------- src/nls/fr/strings.js | 26 -------------------------- src/nls/hu/strings.js | 21 --------------------- src/nls/it/strings.js | 26 -------------------------- src/nls/ja/strings.js | 26 -------------------------- src/nls/ko/strings.js | 25 ------------------------- src/nls/nl/strings.js | 21 --------------------- src/nls/pt-br/strings.js | 19 ------------------- src/nls/ro/strings.js | 24 ------------------------ src/nls/root/strings-app.js | 28 +++++++++++++++++++++++++++- src/nls/root/strings.js | 26 -------------------------- src/nls/ru/strings.js | 26 -------------------------- src/nls/sk/strings.js | 23 ----------------------- src/nls/sr/strings.js | 21 --------------------- src/nls/sv/strings.js | 26 -------------------------- src/nls/tr/strings.js | 21 --------------------- src/nls/zh-cn/strings.js | 24 ------------------------ 22 files changed, 27 insertions(+), 502 deletions(-) diff --git a/src/nls/cs/strings.js b/src/nls/cs/strings.js index d04a3981323..ac92aa529c2 100644 --- a/src/nls/cs/strings.js +++ b/src/nls/cs/strings.js @@ -447,32 +447,6 @@ define({ "LANGUAGE_CANCEL" : "Zrušit", "LANGUAGE_SYSTEM_DEFAULT" : "Výchozí", - /** - * Jazyky - */ - "LOCALE_CS" : "Česky", - "LOCALE_DE" : "Německy", - "LOCALE_EN" : "Anglicky", - "LOCALE_ES" : "Španělsky", - "LOCALE_FR" : "Francouzsky", - "LOCALE_IT" : "Italsky", - "LOCALE_JA" : "Japonsky", - "LOCALE_NB" : "Norsky", - "LOCALE_NL" : "Holandsky", - "LOCALE_FA_IR" : "Persky-perština", - "LOCALE_PL" : "Polsky", - "LOCALE_PT_BR" : "Portugalsky, Brazílie", - "LOCALE_PT_PT" : "Portugalsky", - "LOCALE_RO" : "Rumunsky", - "LOCALE_RU" : "Rusky", - "LOCALE_SK" : "Slovensky", - "LOCALE_SR" : "Srbština", - "LOCALE_SV" : "Švédsky", - "LOCALE_TR" : "Turecky", - "LOCALE_FI" : "Finsky", - "LOCALE_ZH_CN" : "Čínsky", - "LOCALE_HU" : "Maďarsky", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Doba", "INLINE_TIMING_EDITOR_PROGRESSION" : "Postup", diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 07feaa9acf5..4e86bb818f9 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -459,32 +459,6 @@ define({ "LANGUAGE_CANCEL" : "Abbrechen", "LANGUAGE_SYSTEM_DEFAULT" : "Systemstandard", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Tschechisch", - "LOCALE_DE" : "Deutsch", - "LOCALE_EL" : "Griechisch", - "LOCALE_EN" : "Englisch", - "LOCALE_ES" : "Spanisch", - "LOCALE_FA_IR" : "Persisch (Farsi)", - "LOCALE_FI" : "Finnisch", - "LOCALE_FR" : "Französisch", - "LOCALE_IT" : "Italienisch", - "LOCALE_JA" : "Japanisch", - "LOCALE_NB" : "Norwegisch", - "LOCALE_NL" : "Niederländisch", - "LOCALE_PL" : "Polnisch", - "LOCALE_PT_BR" : "Portugiesisch, Brasilien", - "LOCALE_PT_PT" : "Portugiesisch", - "LOCALE_RO" : "Rumänisch", - "LOCALE_RU" : "Russisch", - "LOCALE_SK" : "Slowakisch", - "LOCALE_SR" : "Serbisch", - "LOCALE_SV" : "Schwedisch", - "LOCALE_TR" : "Türkisch", - "LOCALE_ZH_CN" : "Chinesisch, vereinfacht", - "LOCALE_HU" : "Ungarisch", - "LOCALE_KO" : "Koreanisch", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Zeit", "INLINE_TIMING_EDITOR_PROGRESSION" : "Verlauf", diff --git a/src/nls/el/strings.js b/src/nls/el/strings.js index 77abb381232..b95e1abee32 100644 --- a/src/nls/el/strings.js +++ b/src/nls/el/strings.js @@ -447,31 +447,6 @@ define({ "LANGUAGE_CANCEL" : "Ακύρωση", "LANGUAGE_SYSTEM_DEFAULT" : "Προεπιλογή Συστήματος", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Τσεχικά", - "LOCALE_DE" : "Γερμανικά", - "LOCALE_EN" : "Αγγλικά", - "LOCALE_EL" : "Ελληνικά", - "LOCALE_ES" : "Ισπανικά", - "LOCALE_FI" : "Φινλανδικά", - "LOCALE_FR" : "Γαλλικά", - "LOCALE_IT" : "Ιταλικά", - "LOCALE_JA" : "Ιαπωνικά", - "LOCALE_NB" : "Νορβηγικά", - "LOCALE_NL" : "Ολανδικά", - "LOCALE_FA_IR" : "Περσικά-Φαρσί", - "LOCALE_PL" : "Πολωνικά", - "LOCALE_PT_BR" : "Πορτογαλικά, Βραζιλία", - "LOCALE_PT_PT" : "Πορτογαλικά", - "LOCALE_RO" : "Ρουμανικά", - "LOCALE_RU" : "Ρωσικά", - "LOCALE_SK" : "Σλοβακικά", - "LOCALE_SR" : "Σερβικά", - "LOCALE_SV" : "Σουηδικά", - "LOCALE_TR" : "Τουρκικά", - "LOCALE_ZH_CN" : "Κινεζικά, απλοποιημένα", - "LOCALE_HU" : "Ουγγρικά", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Χρόνος", "INLINE_TIMING_EDITOR_PROGRESSION" : "Πρόοδος", diff --git a/src/nls/es/strings.js b/src/nls/es/strings.js index 6bb419ddb4d..2094e485863 100644 --- a/src/nls/es/strings.js +++ b/src/nls/es/strings.js @@ -459,32 +459,6 @@ define({ "LANGUAGE_CANCEL" : "Cancelar", "LANGUAGE_SYSTEM_DEFAULT" : "Idioma predeterminado", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Checo", - "LOCALE_DE" : "Alemán", - "LOCALE_EL" : "Griego", - "LOCALE_EN" : "Inglés", - "LOCALE_ES" : "Español", - "LOCALE_FI" : "Finlandés", - "LOCALE_FR" : "Francés", - "LOCALE_IT" : "Italiano", - "LOCALE_JA" : "Japonés", - "LOCALE_NB" : "Noruego", - "LOCALE_NL" : "Holandés", - "LOCALE_FA_IR" : "Persa-Farsi", - "LOCALE_PL" : "Polaco", - "LOCALE_PT_BR" : "Portugués, Brasil", - "LOCALE_PT_PT" : "Portugués", - "LOCALE_RO" : "Rumano", - "LOCALE_RU" : "Ruso", - "LOCALE_SK" : "Eslovaco", - "LOCALE_SR" : "Serbio", - "LOCALE_SV" : "Sueco", - "LOCALE_TR" : "Turco", - "LOCALE_ZH_CN" : "Chino, simplificado", - "LOCALE_HU" : "Húngaro", - "LOCALE_KO" : "Coreano", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Tiempo", "INLINE_TIMING_EDITOR_PROGRESSION" : "Progresión", diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index 720d41b7669..50671d46e62 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -422,28 +422,6 @@ define({ "LANGUAGE_CANCEL" : "لغو", "LANGUAGE_SYSTEM_DEFAULT" : "زبان پیش فرض", - /** - * Locales - */ - "LOCALE_CS" : "Czech", - "LOCALE_DE" : "German", - "LOCALE_EN" : "English", - "LOCALE_ES" : "Spanish", - "LOCALE_FI" : "Finnish", - "LOCALE_FR" : "French", - "LOCALE_IT" : "Italian", - "LOCALE_JA" : "Japanese", - "LOCALE_NB" : "Norwegian", - "LOCALE_FA_IR" : "Persian-پارسی", - "LOCALE_PL" : "Polish", - "LOCALE_PT_BR" : "Portuguese, Brazil", - "LOCALE_PT_PT" : "Portuguese", - "LOCALE_RU" : "Russian", - "LOCALE_SV" : "Swedish", - "LOCALE_TR" : "Turkish", - "LOCALE_ZH_CN" : "Chinese, simplified", - "LOCALE_HU" : "Hungarian", - // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "رنگ فعلی", "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "رنگ اصلی", diff --git a/src/nls/fi/strings.js b/src/nls/fi/strings.js index 2342aa1d427..6daff1ca565 100644 --- a/src/nls/fi/strings.js +++ b/src/nls/fi/strings.js @@ -445,27 +445,6 @@ define({ "LANGUAGE_CANCEL" : "Peruuta", "LANGUAGE_SYSTEM_DEFAULT" : "Järjestelmän oletus", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "tšekki", - "LOCALE_DE" : "saksa", - "LOCALE_EN" : "englanti", - "LOCALE_ES" : "espanja", - "LOCALE_FI" : "suomi", - "LOCALE_FR" : "ranska", - "LOCALE_IT" : "italia", - "LOCALE_JA" : "japani", - "LOCALE_NB" : "norja", - "LOCALE_PL" : "puola", - "LOCALE_PT_BR" : "portugali, Brasilia", - "LOCALE_PT_PT" : "portugali", - "LOCALE_RU" : "venäjä", - "LOCALE_SK" : "slovakia", - "LOCALE_SR" : "serbia", - "LOCALE_SV" : "ruotsi", - "LOCALE_TR" : "turkki", - "LOCALE_ZH_CN" : "kiina, yksinkertaistettu", - "LOCALE_HU" : "unkari", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Aika", "INLINE_TIMING_EDITOR_PROGRESSION" : "Edistyminen", diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js index ead11395884..f2ddbaeb2d4 100644 --- a/src/nls/fr/strings.js +++ b/src/nls/fr/strings.js @@ -459,32 +459,6 @@ define({ "LANGUAGE_CANCEL": "Annuler", "LANGUAGE_SYSTEM_DEFAULT": "Langue par défaut du système", - // Locales (used by Debug > Switch Language) - "LOCALE_CS": "Tchèque", - "LOCALE_DE": "Allemand", - "LOCALE_EL": "Grec", - "LOCALE_EN": "Anglais", - "LOCALE_ES": "Espagnol", - "LOCALE_FI": "Finnois", - "LOCALE_FR": "Français", - "LOCALE_IT": "Italien", - "LOCALE_JA": "Japonais", - "LOCALE_NB": "Norvégien", - "LOCALE_NL": "Hollandais", - "LOCALE_FA_IR": "Persan/Farsi", - "LOCALE_PL": "Polonais", - "LOCALE_PT_BR": "Portugais (Brésil)", - "LOCALE_PT_PT": "Portugais", - "LOCALE_RO": "Roumain", - "LOCALE_RU": "Russe", - "LOCALE_SK": "Slovaque", - "LOCALE_SR": "Serbe", - "LOCALE_SV": "Suédois", - "LOCALE_TR": "Turc", - "LOCALE_ZH_CN": "Chinois (simplifié)", - "LOCALE_HU": "Hongrois", - "LOCALE_KO": "Coréen", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME": "Temps", "INLINE_TIMING_EDITOR_PROGRESSION": "Progression", diff --git a/src/nls/hu/strings.js b/src/nls/hu/strings.js index 7115e3e5c81..a7dae863d83 100644 --- a/src/nls/hu/strings.js +++ b/src/nls/hu/strings.js @@ -393,27 +393,6 @@ define({ "LANGUAGE_CANCEL" : "Mégsem", "LANGUAGE_SYSTEM_DEFAULT" : "Rendszer Alapértelmezett", - /** - * Locales - */ - "LOCALE_CS" : "Cseh", - "LOCALE_DE" : "Német", - "LOCALE_EN" : "Angol", - "LOCALE_ES" : "Spanyol", - "LOCALE_FR" : "Francia", - "LOCALE_IT" : "Olasz", - "LOCALE_JA" : "Japán", - "LOCALE_NB" : "Norvég", - "LOCALE_PL" : "Lengyel", - "LOCALE_PT_BR" : "Portugál, Brazil", - "LOCALE_PT_PT" : "Portugál", - "LOCALE_RU" : "Orosz", - "LOCALE_SR" : "Szerb", - "LOCALE_SV" : "Svéd", - "LOCALE_TR" : "Török", - "LOCALE_ZH_CN" : "Kínai, egyszerűsített", - "LOCALE_HU" : "Magyar", - // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Jelenlegi szín", "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "Eredeti szín", diff --git a/src/nls/it/strings.js b/src/nls/it/strings.js index 0d2012d68a3..44a4259cfdd 100644 --- a/src/nls/it/strings.js +++ b/src/nls/it/strings.js @@ -458,32 +458,6 @@ define({ "LANGUAGE_CANCEL" : "Annulla", "LANGUAGE_SYSTEM_DEFAULT" : "Default di sistema", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Ceco", - "LOCALE_DE" : "Tedesco", - "LOCALE_EL" : "Greco", - "LOCALE_EN" : "Inglese", - "LOCALE_ES" : "Spagnolo", - "LOCALE_FI" : "Finlandese", - "LOCALE_FR" : "Francese", - "LOCALE_IT" : "Italiano", - "LOCALE_JA" : "Giapponese", - "LOCALE_NB" : "Norvegese", - "LOCALE_NL" : "Olandese", - "LOCALE_FA_IR" : "Persiano", - "LOCALE_PL" : "Polacco", - "LOCALE_PT_BR" : "Portoghese, Brasiliano", - "LOCALE_PT_PT" : "Portoghese", - "LOCALE_RO" : "Romeno", - "LOCALE_RU" : "Russo", - "LOCALE_SK" : "Slovacco", - "LOCALE_SR" : "Serbo", - "LOCALE_SV" : "Svedese", - "LOCALE_TR" : "Turco", - "LOCALE_ZH_CN" : "Cinese, semplificato", - "LOCALE_HU" : "Ungherese", - "LOCALE_KO" : "Coreano", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Tempo", "INLINE_TIMING_EDITOR_PROGRESSION" : "Progresso", diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js index c7931f71a8a..4a64ae0ccb0 100644 --- a/src/nls/ja/strings.js +++ b/src/nls/ja/strings.js @@ -459,32 +459,6 @@ define({ "LANGUAGE_CANCEL": "キャンセル", "LANGUAGE_SYSTEM_DEFAULT": "システムのデフォルト", - // Locales (used by Debug > Switch Language) - "LOCALE_CS": "チェコ語", - "LOCALE_DE": "ドイツ語", - "LOCALE_EL": "ギリシャ語", - "LOCALE_EN": "英語", - "LOCALE_ES": "スペイン語", - "LOCALE_FI": "フィンランド語", - "LOCALE_FR": "フランス語", - "LOCALE_IT": "イタリア語", - "LOCALE_JA": "日本語", - "LOCALE_NB": "ノルウェー語", - "LOCALE_NL": "オランダ語", - "LOCALE_FA_IR": "ペルシャ語-ファルシ語", - "LOCALE_PL": "ポーランド語", - "LOCALE_PT_BR": "ポルトガル語 (ブラジル)", - "LOCALE_PT_PT": "ポルトガル語", - "LOCALE_RO": "ルーマニア語", - "LOCALE_RU": "ロシア語", - "LOCALE_SK": "スロバキア語", - "LOCALE_SR": "セルビア語", - "LOCALE_SV": "スウェーデン語", - "LOCALE_TR": "トルコ語", - "LOCALE_ZH_CN": "中国語 (簡体字)", - "LOCALE_HU": "ハンガリー語", - "LOCALE_KO": "韓国語", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME": "時間", "INLINE_TIMING_EDITOR_PROGRESSION": "進行", diff --git a/src/nls/ko/strings.js b/src/nls/ko/strings.js index a3af613deb8..fa66d730fad 100644 --- a/src/nls/ko/strings.js +++ b/src/nls/ko/strings.js @@ -449,31 +449,6 @@ define({ "LANGUAGE_SUBMIT": "{APP_NAME} 재시작", "LANGUAGE_CANCEL": "취소", "LANGUAGE_SYSTEM_DEFAULT": "시스템 언어", - - // Locales (used by Debug > Switch Language) - "LOCALE_CS": "체코어", - "LOCALE_DE": "독일어", - "LOCALE_EN": "영어", - "LOCALE_ES": "스페인어", - "LOCALE_FI": "핀란드어", - "LOCALE_FR": "프랑스어", - "LOCALE_IT": "이탈리아어", - "LOCALE_JA": "일본어", - "LOCALE_NB": "노르웨이어", - "LOCALE_NL": "네덜란드어", - "LOCALE_FA_IR": "페르시아어-파르어", - "LOCALE_PL": "폴란드어", - "LOCALE_PT_BR": "포르투갈어(브라질)", - "LOCALE_PT_PT": "포르투갈어", - "LOCALE_RO": "루마니아어", - "LOCALE_RU": "러시아어", - "LOCALE_SK": "슬로바키아어", - "LOCALE_SR": "세르비아어", - "LOCALE_SV": "스웨덴어", - "LOCALE_TR": "터키어", - "LOCALE_ZH_CN": "중국어 (간체)", - "LOCALE_HU": "헝가리어", - "LOCALE_KO": "한국어", // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME": "시간", diff --git a/src/nls/nl/strings.js b/src/nls/nl/strings.js index 540c9b12ac4..9bc174bc6d0 100644 --- a/src/nls/nl/strings.js +++ b/src/nls/nl/strings.js @@ -431,27 +431,6 @@ define({ "LANGUAGE_CANCEL" : "Annuleer", "LANGUAGE_SYSTEM_DEFAULT" : "Systeem Standaard", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Tsjechisch", - "LOCALE_DE" : "Duits", - "LOCALE_EN" : "Engels", - "LOCALE_ES" : "Spaans", - "LOCALE_FI" : "Fins", - "LOCALE_FR" : "Frans", - "LOCALE_IT" : "Italiaans", - "LOCALE_JA" : "Japans", - "LOCALE_NB" : "Noors", - "LOCALE_NL" : "Nederlands", - "LOCALE_PL" : "Pools", - "LOCALE_PT_BR" : "Portugees, Brazilië", - "LOCALE_PT_PT" : "Portugees", - "LOCALE_RU" : "Russisch", - "LOCALE_SK" : "Slovaaks", - "LOCALE_SV" : "Zweeds", - "LOCALE_TR" : "Turks", - "LOCALE_ZH_CN" : "Chinees, simpel", - "LOCALE_HU" : "Hongaars", - // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Huidige Kleur", "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "Originele Kleur", diff --git a/src/nls/pt-br/strings.js b/src/nls/pt-br/strings.js index 4ec6e71e18b..52b0be4d32e 100644 --- a/src/nls/pt-br/strings.js +++ b/src/nls/pt-br/strings.js @@ -438,25 +438,6 @@ define({ "LANGUAGE_CANCEL" : "Cancelar", "LANGUAGE_SYSTEM_DEFAULT" : "Padrão do sistema", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Tcheco", - "LOCALE_DE" : "Alemão", - "LOCALE_EN" : "Inglês", - "LOCALE_ES" : "Espanhol", - "LOCALE_FI" : "Finlandês", - "LOCALE_FR" : "Francês", - "LOCALE_IT" : "Italiano", - "LOCALE_JA" : "Japonês", - "LOCALE_NB" : "Norueguês", - "LOCALE_PL" : "Polonês", - "LOCALE_PT_BR" : "Português do Brasil", - "LOCALE_PT_PT" : "Português", - "LOCALE_RU" : "Russo", - "LOCALE_SV" : "Sueco", - "LOCALE_TR" : "Turco", - "LOCALE_ZH_CN" : "Chinês Simplificado", - "LOCALE_HU" : "Húngaro", - // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Cor atual", "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "Cor original", diff --git a/src/nls/ro/strings.js b/src/nls/ro/strings.js index cbb90f1df18..4118262d71d 100644 --- a/src/nls/ro/strings.js +++ b/src/nls/ro/strings.js @@ -447,30 +447,6 @@ define({ "LANGUAGE_CANCEL" : "Revocare", "LANGUAGE_SYSTEM_DEFAULT" : "Limba implicită a sistemului", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Cehă", - "LOCALE_DE" : "Germană", - "LOCALE_EN" : "Engleză", - "LOCALE_ES" : "Spaniolă", - "LOCALE_FA_IR" : "Persană (Farsi)", - "LOCALE_FI" : "Finlandeză", - "LOCALE_FR" : "Franceză", - "LOCALE_IT" : "Italiană", - "LOCALE_JA" : "Japoneză", - "LOCALE_NB" : "Norvegiană", - "LOCALE_NL" : "Olandeză", - "LOCALE_PL" : "Poloneză", - "LOCALE_PT_BR" : "Portugheza braziliană", - "LOCALE_PT_PT" : "Portugheză", - "LOCALE_RO" : "Română", - "LOCALE_RU" : "Rusă", - "LOCALE_SK" : "Slovacă", - "LOCALE_SR" : "Sârbă", - "LOCALE_SV" : "Suedeză", - "LOCALE_TR" : "Turcă", - "LOCALE_ZH_CN" : "Chineza simplificată", - "LOCALE_HU" : "Ungară", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Timp", "INLINE_TIMING_EDITOR_PROGRESSION" : "Progres", diff --git a/src/nls/root/strings-app.js b/src/nls/root/strings-app.js index a47fbe8808c..51e1c0c9944 100644 --- a/src/nls/root/strings-app.js +++ b/src/nls/root/strings-app.js @@ -26,5 +26,31 @@ define({ // product-specific strings - "APP_NAME" : "Brackets" + "APP_NAME" : "Brackets", + + // Self locales (used by Debug > Switch Language) + "LOCALE_CS" : "Česky", + "LOCALE_DE" : "Deutsch", + "LOCALE_EL" : "Ελληνικά", + "LOCALE_EN" : "English", + "LOCALE_ES" : "Español", + "LOCALE_FI" : "suomi", + "LOCALE_FR" : "Français", + "LOCALE_IT" : "italiano", + "LOCALE_JA" : "日本語", + "LOCALE_NB" : "norsk", + "LOCALE_NL" : "Nederlands", + "LOCALE_FA_IR" : "Persian-پارسی", + "LOCALE_PL" : "polski", + "LOCALE_PT_BR" : "Português do Brasil", + "LOCALE_PT_PT" : "Português", + "LOCALE_RO" : "Română", + "LOCALE_RU" : "русский", + "LOCALE_SK" : "Slovenský", + "LOCALE_SR" : "српски", + "LOCALE_SV" : "Svenska", + "LOCALE_TR" : "Türkçe", + "LOCALE_ZH_CN" : "简体中文", + "LOCALE_HU" : "Magyar", + "LOCALE_KO" : "한국어", }); diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 4c83484c04a..b74994755a1 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -460,32 +460,6 @@ define({ "LANGUAGE_CANCEL" : "Cancel", "LANGUAGE_SYSTEM_DEFAULT" : "System Default", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Czech", - "LOCALE_DE" : "German", - "LOCALE_EL" : "Greek", - "LOCALE_EN" : "English", - "LOCALE_ES" : "Spanish", - "LOCALE_FI" : "Finnish", - "LOCALE_FR" : "French", - "LOCALE_IT" : "Italian", - "LOCALE_JA" : "Japanese", - "LOCALE_NB" : "Norwegian", - "LOCALE_NL" : "Dutch", - "LOCALE_FA_IR" : "Persian-Farsi", - "LOCALE_PL" : "Polish", - "LOCALE_PT_BR" : "Portuguese, Brazil", - "LOCALE_PT_PT" : "Portuguese", - "LOCALE_RO" : "Romanian", - "LOCALE_RU" : "Russian", - "LOCALE_SK" : "Slovak", - "LOCALE_SR" : "Serbian", - "LOCALE_SV" : "Swedish", - "LOCALE_TR" : "Turkish", - "LOCALE_ZH_CN" : "Chinese, simplified", - "LOCALE_HU" : "Hungarian", - "LOCALE_KO" : "Korean", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Time", "INLINE_TIMING_EDITOR_PROGRESSION" : "Progression", diff --git a/src/nls/ru/strings.js b/src/nls/ru/strings.js index c3147cd12d1..75cf518b98b 100644 --- a/src/nls/ru/strings.js +++ b/src/nls/ru/strings.js @@ -459,32 +459,6 @@ define({ "LANGUAGE_CANCEL" : "Отмена", "LANGUAGE_SYSTEM_DEFAULT" : "По умолчанию", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Czech", - "LOCALE_DE" : "German", - "LOCALE_EL" : "Greek", - "LOCALE_EN" : "English", - "LOCALE_ES" : "Spanish", - "LOCALE_FI" : "Finnish", - "LOCALE_FR" : "French", - "LOCALE_IT" : "Italian", - "LOCALE_JA" : "Japanese", - "LOCALE_NB" : "Norwegian", - "LOCALE_NL" : "Dutch", - "LOCALE_FA_IR" : "Persian-Farsi", - "LOCALE_PL" : "Polish", - "LOCALE_PT_BR" : "Portuguese, Brazil", - "LOCALE_PT_PT" : "Portuguese", - "LOCALE_RO" : "Romanian", - "LOCALE_RU" : "Russian", - "LOCALE_SK" : "Slovak", - "LOCALE_SR" : "Serbian", - "LOCALE_SV" : "Swedish", - "LOCALE_TR" : "Turkish", - "LOCALE_ZH_CN" : "Chinese, simplified", - "LOCALE_HU" : "Hungarian", - "LOCALE_KO" : "Korean", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Время", "INLINE_TIMING_EDITOR_PROGRESSION" : "Прогрессия", diff --git a/src/nls/sk/strings.js b/src/nls/sk/strings.js index 541cc3e38d3..b5f05c042dd 100644 --- a/src/nls/sk/strings.js +++ b/src/nls/sk/strings.js @@ -416,29 +416,6 @@ define({ "LANGUAGE_CANCEL" : "Zrušiť", "LANGUAGE_SYSTEM_DEFAULT" : "Predvolený v systéme", - /** - * Jazyky - */ - "LOCALE_CS" : "Český", - "LOCALE_DE" : "Nemecký", - "LOCALE_EN" : "Anglický", - "LOCALE_ES" : "Španielsky", - "LOCALE_FI" : "Fínsky", - "LOCALE_FR" : "Francúzky", - "LOCALE_IT" : "Talianský", - "LOCALE_JA" : "Japonský", - "LOCALE_NB" : "Nórsky", - "LOCALE_PL" : "Poľský", - "LOCALE_PT_BR" : "Portugalský, Brazília", - "LOCALE_PT_PT" : "Portugalský", - "LOCALE_RU" : "Ruský", - "LOCALE_SR" : "Srbčina", - "LOCALE_SV" : "Švédsky", - "LOCALE_TR" : "Turecký", - "LOCALE_ZH_CN" : "Čínsky, zjednodušený", - "LOCALE_HU" : "Maďarský", - "LOCALE_SK" : "Slovenský", - // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Aktuálna farba", "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "Pôvodná farba", diff --git a/src/nls/sr/strings.js b/src/nls/sr/strings.js index d28fe5c8ce5..9e5c4e949d3 100644 --- a/src/nls/sr/strings.js +++ b/src/nls/sr/strings.js @@ -431,27 +431,6 @@ define({ "LANGUAGE_CANCEL" : "Откажи", "LANGUAGE_SYSTEM_DEFAULT" : "језик система", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "чешки", - "LOCALE_DE" : "немачки", - "LOCALE_EN" : "енглески", - "LOCALE_ES" : "шпански", - "LOCALE_FI" : "фински", - "LOCALE_FR" : "француски", - "LOCALE_IT" : "италијански", - "LOCALE_JA" : "јапански", - "LOCALE_NB" : "норвешки", - "LOCALE_PL" : "пољски", - "LOCALE_PT_BR" : "португалски, Бразил", - "LOCALE_PT_PT" : "португалски", - "LOCALE_RU" : "руски", - "LOCALE_SK" : "словачки", - "LOCALE_SR" : "српски", - "LOCALE_SV" : "шведски", - "LOCALE_TR" : "турски", - "LOCALE_ZH_CN" : "кинески, поједностављен", - "LOCALE_HU" : "мађарски", - // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Тренутна боја", "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "Оригинална боја", diff --git a/src/nls/sv/strings.js b/src/nls/sv/strings.js index e7d0b2801be..75e2fb62823 100644 --- a/src/nls/sv/strings.js +++ b/src/nls/sv/strings.js @@ -459,32 +459,6 @@ define({ "LANGUAGE_CANCEL" : "Avbryt", "LANGUAGE_SYSTEM_DEFAULT" : "Systemstandard", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "Tjeckiska", - "LOCALE_DE" : "Tyska", - "LOCALE_EL" : "Grekiska", - "LOCALE_EN" : "Engelska", - "LOCALE_ES" : "Spanska", - "LOCALE_FI" : "Finska", - "LOCALE_FR" : "Franska", - "LOCALE_IT" : "Italienska", - "LOCALE_JA" : "Japanska", - "LOCALE_NB" : "Norska", - "LOCALE_NL" : "Holländska", - "LOCALE_FA_IR" : "Persiska-Farsi", - "LOCALE_PL" : "Polska", - "LOCALE_PT_BR" : "Portugisiska, Brasilien", - "LOCALE_PT_PT" : "Portugisiska", - "LOCALE_RO" : "Rumänska", - "LOCALE_RU" : "Ryska", - "LOCALE_SK" : "Slovakiska", - "LOCALE_SR" : "Serbiska", - "LOCALE_SV" : "Svenska", - "LOCALE_TR" : "Turkiska", - "LOCALE_ZH_CN" : "Kinesiska, förenklad", - "LOCALE_HU" : "Ungerska", - "LOCALE_KO" : "Koreanska", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Tid", "INLINE_TIMING_EDITOR_PROGRESSION" : "Progression", diff --git a/src/nls/tr/strings.js b/src/nls/tr/strings.js index d4014fe3ab3..bc1fa259785 100644 --- a/src/nls/tr/strings.js +++ b/src/nls/tr/strings.js @@ -268,27 +268,6 @@ define({ "LANGUAGE_SUBMIT" : "{APP_NAME} Yenile", "LANGUAGE_CANCEL" : "İptal", - /** - * Locales - */ - "LOCALE_DE" : "Almanca", - "LOCALE_EN" : "Ingilizce", - "LOCALE_FR" : "Fransizca", - "LOCALE_CS" : "Çekçe", - "LOCALE_ES" : "İspanyolca", - "LOCALE_IT" : "İtalyanca", - "LOCALE_JA" : "Japonca", - "LOCALE_NB" : "Norveççe", - "LOCALE_PL" : "Polonyaca", - "LOCALE_PT_BR" : "Portekizce, Brezilya", - "LOCALE_PT_PT" : "Portekizce", - "LOCALE_RU" : "Rusça", - "LOCALE_SR" : "Sırpça", - "LOCALE_SV" : "İsveççe", - "LOCALE_TR" : "Türkçe", - "LOCALE_ZH_CN" : "Çince, basitleştirilmiş", - "LOCALE_HU" : "Macarca", - // extensions/default/JSLint "CMD_JSLINT" : "JSLint Aç", "JSLINT_ERRORS" : "JSLint Hataları", diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 00a36f9728a..2449d1bf276 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -450,30 +450,6 @@ define({ "LANGUAGE_CANCEL" : "取消", "LANGUAGE_SYSTEM_DEFAULT" : "系统默认语言", - // Locales (used by Debug > Switch Language) - "LOCALE_CS" : "捷克语", - "LOCALE_DE" : "德语", - "LOCALE_EN" : "英语", - "LOCALE_ES" : "西班牙语", - "LOCALE_FI" : "芬兰语", - "LOCALE_FR" : "法语", - "LOCALE_IT" : "意大利语", - "LOCALE_JA" : "日语", - "LOCALE_NB" : "挪威语", - "LOCALE_NL" : "荷兰语", - "LOCALE_FA_IR" : "波斯语(伊朗)", - "LOCALE_PL" : "波兰语", - "LOCALE_PT_BR" : "葡萄牙语(巴西)", - "LOCALE_PT_PT" : "葡萄牙语", - "LOCALE_RO" : "罗马尼亚语", - "LOCALE_RU" : "俄语", - "LOCALE_SK" : "斯洛伐克语", - "LOCALE_SR" : "塞尔维亚", - "LOCALE_SV" : "瑞典语", - "LOCALE_TR" : "土耳其语", - "LOCALE_ZH_CN" : "简体中文", - "LOCALE_HU" : "匈牙利语", - // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Time", "INLINE_TIMING_EDITOR_PROGRESSION" : "Progression", From 5412fa168b2f1739fd588cc0479a061b3d2ffcb4 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Tue, 4 Feb 2014 16:40:03 -0800 Subject: [PATCH 05/55] Add deprecation warnings for the old APIs. --- src/preferences/PreferenceStorage.js | 2 ++ src/preferences/PreferencesManager.js | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/preferences/PreferenceStorage.js b/src/preferences/PreferenceStorage.js index ae28344eaf2..9518d5e5736 100644 --- a/src/preferences/PreferenceStorage.js +++ b/src/preferences/PreferenceStorage.js @@ -108,6 +108,7 @@ define(function (require, exports, module) { * @param {object} value A valid JSON value */ PreferenceStorage.prototype.setValue = function (key, value) { + console.warn("setValue is deprecated. Use PreferencesManager.set instead."); if (_validateJSONPair(key, value)) { this._json[key] = value; _commit(); @@ -120,6 +121,7 @@ define(function (require, exports, module) { * @return {object} Returns the value for the key or undefined. */ PreferenceStorage.prototype.getValue = function (key) { + console.warn("getValue is deprecated. Use PreferencesManager.get instead."); return this._json[key]; }; diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 178594e663b..23b38ddbff5 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -113,6 +113,12 @@ define(function (require, exports, module) { * @return {PreferenceStorage} */ function getPreferenceStorage(clientID, defaults, _doNotCreate) { + // No one should be calling this to access the old preference storage except for + // migrating the old preferences to the new model. So if this is called without + // having _doNotCreate set to true, then the caller is using the old preferences model. + if (!_doNotCreate) { + console.warn("PreferencesManager.getPreferenceStorage is deprecated. Use PreferencesManager.definePreference instead."); + } if (!clientID || (typeof clientID === "object" && (!clientID.id || !clientID.uri))) { console.error("Invalid clientID"); return; From 1f5ac198c6ba396640598221157d34550f0b6d2a Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Thu, 6 Feb 2014 22:44:44 -0800 Subject: [PATCH 06/55] Fix all broken integration tests with one exception -- excluding one failing test in WorkingSetView tests. --- test/spec/SpecRunnerUtils.js | 8 +++++++- test/spec/WorkingSetView-test.js | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index c4ad3a610fc..758c5130868 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -534,12 +534,18 @@ define(function (require, exports, module) { // Reconfigure the preferences manager so that the "user" scoped // preferences are empty and the tests will not reconfigure // the preferences of the user running the tests. - var pm = _testWindow.brackets.test.PreferencesManager._manager; + var pm = _testWindow.brackets.test.PreferencesManager._manager, + sm = _testWindow.brackets.test.PreferencesManager.stateManager; pm.removeScope("user"); pm.addScope("user", new PreferencesBase.MemoryStorage(), { before: "default" }); + sm.removeScope("user"); + sm.addScope("user", new PreferencesBase.MemoryStorage(), { + before: "default" + }); + // callback allows specs to query the testWindow before they run callback.call(spec, _testWindow); }); diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index 9a583aa7124..d2ec5100028 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -155,7 +155,7 @@ define(function (require, exports, module) { }); }); - it("should rebuild the ui from the model correctly", function () { + xit("should rebuild the ui from the model correctly", function () { // force the test window to initialize to unit test preferences // for just this test runs(function () { From bd58ce522f3337eaff62565bd920f9780134ec91 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Thu, 6 Feb 2014 22:53:20 -0800 Subject: [PATCH 07/55] Add xit to fix JSLint error. --- test/spec/WorkingSetView-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/spec/WorkingSetView-test.js b/test/spec/WorkingSetView-test.js index d2ec5100028..60779601a2d 100644 --- a/test/spec/WorkingSetView-test.js +++ b/test/spec/WorkingSetView-test.js @@ -23,7 +23,7 @@ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global $, define, describe, it, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, beforeFirst, afterLast */ +/*global $, define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, beforeFirst, afterLast */ define(function (require, exports, module) { "use strict"; From d8783b86b90afaa4321a640fceb8cb4dba431b53 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Mon, 10 Feb 2014 23:00:14 -0800 Subject: [PATCH 08/55] Store working set files in a project layer. --- src/document/DocumentManager.js | 30 +++++++--- src/preferences/PreferenceStorage.js | 11 +++- src/preferences/PreferencesBase.js | 79 +++++++++++++++++++++++++++ src/preferences/PreferencesManager.js | 19 +++++-- src/utils/Resizer.js | 4 +- 5 files changed, 125 insertions(+), 18 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 3acb21b1ccc..2521a5d11c0 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -810,11 +810,14 @@ define(function (require, exports, module) { */ function _savePreferences() { // save the working set file paths - var files = [], - isActive = false, - workingSet = getWorkingSet(), - currentDoc = getCurrentDocument(), - projectRoot = ProjectManager.getProjectRoot(); + var files = [], + isActive = false, + workingSet = getWorkingSet(), + currentDoc = getCurrentDocument(), + projectRoot = ProjectManager.getProjectRoot(), + projectFiles = { location : { scope: "user", + layer: "project", + layerID: projectRoot.fullPath } }; if (!projectRoot) { return; @@ -837,8 +840,10 @@ define(function (require, exports, module) { } }); - // append file root to make file list unique for each project - PreferencesManager.setViewState("files_" + projectRoot.fullPath, files); + // Update the project path in project layer before writing out working set files. + PreferencesManager.projectLayer.setProjectPath(projectRoot.fullPath); + PreferencesManager.setViewState("project.files", files, projectFiles); + PreferencesManager.projectLayer.setProjectPath(null); } /** @@ -848,7 +853,11 @@ define(function (require, exports, module) { function _projectOpen(e) { // file root is appended for each project var projectRoot = ProjectManager.getProjectRoot(), - files = PreferencesManager.getViewState("files_" + projectRoot.fullPath); + files = []; + + PreferencesManager.projectLayer.setProjectPath(projectRoot.fullPath); + files = PreferencesManager.getViewState("project.files"); + PreferencesManager.projectLayer.setProjectPath(null); console.assert(Object.keys(_openDocuments).length === 0); // no files leftover from prev proj @@ -998,13 +1007,16 @@ define(function (require, exports, module) { */ function _checkPreferencePrefix(key) { if (key.indexOf("files_/") === 0) { - return "user"; + var projectPath = key.substr(6); + PreferencesManager.projectLayer.setProjectPath(projectPath); + return "user project.files " + projectPath; } return null; } PreferencesManager.convertPreferences(module, {"files_": "user"}, true, _checkPreferencePrefix); + PreferencesManager.projectLayer.setProjectPath(null); // Handle file saves that may affect preferences $(exports).on("documentSaved", function (e, doc) { diff --git a/src/preferences/PreferenceStorage.js b/src/preferences/PreferenceStorage.js index 9518d5e5736..341ee72bcf7 100644 --- a/src/preferences/PreferenceStorage.js +++ b/src/preferences/PreferenceStorage.js @@ -221,8 +221,17 @@ define(function (require, exports, module) { var parts = rule.split(" "); if (parts[0] === "user") { var newKey = parts.length > 1 ? parts[1] : key; + var options = null; + + if (parts.length > 2 && parts[2].indexOf("/") === 0) { + var projectPath = rule.substr(rule.indexOf(parts[2])); + options = { location: { scope: "user", + layer: "project", + layerID: projectPath } }; + } + if (isViewState) { - PreferencesManager.stateManager.set(newKey, prefs[key]); + PreferencesManager.stateManager.set(newKey, prefs[key], options); } else { PreferencesManager.set(newKey, prefs[key]); } diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js index 28ca0845f4b..4b8be326b54 100644 --- a/src/preferences/PreferencesBase.js +++ b/src/preferences/PreferencesBase.js @@ -320,6 +320,10 @@ define(function (require, exports, module) { if (location && location.layer) { var layer = this._layerMap[location.layer]; if (layer) { + if (this.data[layer.key] === undefined) { + this.data[layer.key] = {}; + } + var wasSet = layer.set(this.data[layer.key], id, value, context, location.layerID); this._dirty = this._dirty || wasSet; return wasSet; @@ -547,6 +551,70 @@ define(function (require, exports, module) { } } + function ProjectLayer() { + this.projectPath = null; + } + + ProjectLayer.prototype = { + key: "project", + + get: function (data, id, context) { + if (!data || !this.projectPath) { + return; + } + + if (data[this.projectPath] && data[this.projectPath][id]) { + return data[this.projectPath][id]; + } + return; + }, + + getPreferenceLocation: function (data, id, context) { + if (!data || !this.projectPath) { + return; + } + + if (data[this.projectPath] && data[this.projectPath][id]) { + return this.projectPath; + } + + return; + }, + + set: function (data, id, value, context, layerID) { + if (!layerID) { + layerID = this.getPreferenceLocation(data, id, context); + } + + if (!layerID) { + return false; + } + + var section = data[layerID]; + if (!section) { + data[layerID] = section = {}; + } + if (value === undefined) { + delete section[id]; + } else { + section[id] = value; + } + return true; + }, + + getKeys: function (data, context) { + if (!data) { + return; + } + + return _.union.apply(null, _.map(_.values(data), _.keys)); + }, + + setProjectPath: function (projectPath) { + this.projectPath = projectPath; + } + }; + /** * Provides layered preferences based on file globs, generally following the model provided * by [EditorConfig](http://editorconfig.org/). In usage, it looks something like this @@ -1271,6 +1339,16 @@ define(function (require, exports, module) { return deferred.promise(); }, + /** + * Adds a Layer to the specified scope. + * + * @param {string} scope Name of the scope where the layer object is to be added. + * @param {Layer} layer Layer object to add to this Scope + */ + addLayer: function (scope, layer) { + this._scopes[scope].addLayer(layer); + }, + /** * Path Scopes provide special handling for scopes that are managed by a * collection of files in the file tree. The idea is that files are @@ -1488,5 +1566,6 @@ define(function (require, exports, module) { exports.Scope = Scope; exports.MemoryStorage = MemoryStorage; exports.PathLayer = PathLayer; + exports.ProjectLayer = ProjectLayer; exports.FileStorage = FileStorage; }); \ No newline at end of file diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 23b38ddbff5..19576a77555 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -240,11 +240,16 @@ define(function (require, exports, module) { var stateManager = new PreferencesBase.PreferencesSystem(); var userStateFile = brackets.app.getApplicationSupportDirectory() + "/" + STATE_FILENAME; - stateManager.addScope("user", new PreferencesBase.FileStorage(userStateFile, true)); + var userScope = stateManager.addScope("user", new PreferencesBase.FileStorage(userStateFile, true)); + var projectLayer = new PreferencesBase.ProjectLayer(); + + userScope.done(function () { + stateManager.addLayer("user", projectLayer); + }); var preferencesManager = new PreferencesBase.PreferencesSystem(); - var userScope = preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true)); + userScope = preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true)); // Set up the .brackets.json file handling userScope @@ -353,13 +358,14 @@ define(function (require, exports, module) { * * @param {string} id preference to set * @param {*} value new value for the preference - * @param {boolean=} dontSave If it is undefined or false, then save the + * @param {boolean=} doNotSave If it is undefined or false, then save the * view state immediately. */ - function setViewState(id, value, dontSave) { - stateManager.set(id, value); + function setViewState(id, value, options, doNotSave) { + + stateManager.set(id, value, options); - if (!dontSave) { + if (!doNotSave) { stateManager.save(); } } @@ -383,6 +389,7 @@ define(function (require, exports, module) { exports.setViewState = setViewState; exports.addScope = preferencesManager.addScope.bind(preferencesManager); exports.stateManager = stateManager; + exports.projectLayer = projectLayer; exports.FileStorage = PreferencesBase.FileStorage; exports.SETTINGS_FILENAME = SETTINGS_FILENAME; exports.definePreference = preferencesManager.definePreference.bind(preferencesManager); diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index dc8133c082f..0da0521a6aa 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -214,7 +214,7 @@ define(function (require, exports, module) { adjustSibling(elementSize); $element.trigger("panelExpanded", [elementSize]); - PreferencesManager.setViewState(elementID, elementPrefs, true); + PreferencesManager.setViewState(elementID, elementPrefs, null, true); }); $element.data("hide", function () { @@ -236,7 +236,7 @@ define(function (require, exports, module) { adjustSibling(0); $element.trigger("panelCollapsed", [elementSize]); - PreferencesManager.setViewState(elementID, elementPrefs, true); + PreferencesManager.setViewState(elementID, elementPrefs, null, true); }); // If the resizer is positioned right or bottom of the panel, we need to listen to From 16483699295348845cca3e9e103ff15364f01656 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Tue, 11 Feb 2014 22:05:50 -0800 Subject: [PATCH 09/55] Store project tree states in the project layer. --- src/document/DocumentManager.js | 14 +++++++---- src/preferences/PreferencesManager.js | 10 +++++--- src/project/ProjectManager.js | 36 +++++++++++++-------------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 2521a5d11c0..9a036f38f25 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -815,7 +815,7 @@ define(function (require, exports, module) { workingSet = getWorkingSet(), currentDoc = getCurrentDocument(), projectRoot = ProjectManager.getProjectRoot(), - projectFiles = { location : { scope: "user", + context = { location : { scope: "user", layer: "project", layerID: projectRoot.fullPath } }; @@ -842,7 +842,7 @@ define(function (require, exports, module) { // Update the project path in project layer before writing out working set files. PreferencesManager.projectLayer.setProjectPath(projectRoot.fullPath); - PreferencesManager.setViewState("project.files", files, projectFiles); + PreferencesManager.setViewState("project.files", files, context); PreferencesManager.projectLayer.setProjectPath(null); } @@ -853,10 +853,13 @@ define(function (require, exports, module) { function _projectOpen(e) { // file root is appended for each project var projectRoot = ProjectManager.getProjectRoot(), - files = []; + files = [], + context = { location : { scope: "user", + layer: "project", + layerID: projectRoot.fullPath } }; PreferencesManager.projectLayer.setProjectPath(projectRoot.fullPath); - files = PreferencesManager.getViewState("project.files"); + files = PreferencesManager.getViewState("project.files", context); PreferencesManager.projectLayer.setProjectPath(null); console.assert(Object.keys(_openDocuments).length === 0); // no files leftover from prev proj @@ -1007,7 +1010,8 @@ define(function (require, exports, module) { */ function _checkPreferencePrefix(key) { if (key.indexOf("files_/") === 0) { - var projectPath = key.substr(6); + // Get the project path from the old preference key by stripping "files_". + var projectPath = key.substr(key.indexOf("/")); PreferencesManager.projectLayer.setProjectPath(projectPath); return "user project.files " + projectPath; } diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 19576a77555..e90adcdeea9 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -348,9 +348,10 @@ define(function (require, exports, module) { * Convenience function that gets a view state * * @param {string} id preference to get + * @param {?Object} context Optional additional information about the request */ - function getViewState(id) { - return stateManager.get(id); + function getViewState(id, context) { + return stateManager.get(id, context); } /** @@ -358,12 +359,13 @@ define(function (require, exports, module) { * * @param {string} id preference to set * @param {*} value new value for the preference + * @param {?Object} context Optional additional information about the request * @param {boolean=} doNotSave If it is undefined or false, then save the * view state immediately. */ - function setViewState(id, value, options, doNotSave) { + function setViewState(id, value, context, doNotSave) { - stateManager.set(id, value, options); + stateManager.set(id, value, context); if (!doNotSave) { stateManager.save(); diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index e0352cf49ec..ba3b10adeef 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -362,21 +362,6 @@ define(function (require, exports, module) { return absPath; } - /** - * @private - * Get prefs tree state lookup key for given project path. - */ - function _getTreeStateKey(path) { - // generate unique tree state key for this project path - var key = "projectTreeState_" + path; - - // normalize to always have slash at end - if (key[key.length - 1] !== "/") { - key += "/"; - } - return key; - } - /** * @private * Save ProjectManager project path and tree state. @@ -392,7 +377,10 @@ define(function (require, exports, module) { entry, fullPath, shortPath, - depth; + depth, + context = { location : { scope: "user", + layer: "project", + layerID: _projectRoot.fullPath } }; // Query open nodes by class selector $(".jstree-open:visible").each(function (index) { @@ -419,7 +407,9 @@ define(function (require, exports, module) { }); // Store the open nodes by their full path and persist to storage - PreferencesManager.setViewState(_getTreeStateKey(_projectRoot.fullPath), openNodes); + PreferencesManager.projectLayer.setProjectPath(_projectRoot.fullPath); + PreferencesManager.setViewState("project.treeState", openNodes, context); + PreferencesManager.projectLayer.setProjectPath(null); } /** @@ -1060,6 +1050,9 @@ define(function (require, exports, module) { } startLoad.done(function () { + var context = { location : { scope: "user", + layer: "project", + layerID: rootPath } }; // Clear project path map _projectInitialLoad = { @@ -1069,7 +1062,9 @@ define(function (require, exports, module) { }; // restore project tree state from last time this project was open - _projectInitialLoad.previous = PreferencesManager.getViewState(_getTreeStateKey(rootPath)) || []; + PreferencesManager.projectLayer.setProjectPath(rootPath); + _projectInitialLoad.previous = PreferencesManager.getViewState("project.treeState", context) || []; + PreferencesManager.projectLayer.setProjectPath(null); // Populate file tree as long as we aren't running in the browser if (!brackets.inBrowser) { @@ -2150,7 +2145,10 @@ define(function (require, exports, module) { */ function _checkPreferencePrefix(key) { if (key.indexOf("projectTreeState_/") === 0) { - return "user"; + // Get the project path from the old preference key by stripping "projectTreeState_". + var projectPath = key.substr(key.indexOf("/")); + PreferencesManager.projectLayer.setProjectPath(projectPath); + return "user project.treeState " + projectPath; } return null; From 1a12690903f09d005cedc03e02ff2f52c3ad0cc2 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Thu, 13 Feb 2014 00:13:03 -0800 Subject: [PATCH 10/55] Making changes to review feedbacks. --- src/brackets.js | 6 +-- src/document/DocumentManager.js | 2 +- src/preferences/PreferenceStorage.js | 28 +++-------- src/preferences/PreferencesBase.js | 10 ---- src/preferences/PreferencesManager.js | 71 +++++++++++++-------------- 5 files changed, 45 insertions(+), 72 deletions(-) diff --git a/src/brackets.js b/src/brackets.js index e70acdf54e0..8e14ef8e53d 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -213,11 +213,11 @@ define(function (require, exports, module) { // If this is the first launch, and we have an index.html file in the project folder (which should be // the samples folder on first launch), open it automatically. (We explicitly check for the // samples folder in case this is the first time we're launching Brackets after upgrading from - // an old version that might not have set the "livedev.afterFirstLaunch" pref.) + // an old version that might not have set the "afterFirstLaunch" pref.) var deferred = new $.Deferred(); - if (!params.get("skipSampleProjectLoad") && !PreferencesManager.getViewState("livedev.afterFirstLaunch")) { - PreferencesManager.setViewState("livedev.afterFirstLaunch", "true"); + if (!params.get("skipSampleProjectLoad") && !PreferencesManager.getViewState("afterFirstLaunch")) { + PreferencesManager.setViewState("afterFirstLaunch", "true"); if (ProjectManager.isWelcomeProjectPath(initialProjectPath)) { FileSystem.resolve(initialProjectPath + "index.html", function (err, file) { if (!err) { diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 9a036f38f25..90b8aa77f64 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -1000,7 +1000,7 @@ define(function (require, exports, module) { /** * @private - * Exemine each preference key for migration of the working set files. + * Examine each preference key for migration of the working set files. * If the key has a prefix of "files_/", then it is a working set files * preference from old preference model. * diff --git a/src/preferences/PreferenceStorage.js b/src/preferences/PreferenceStorage.js index 341ee72bcf7..4193d545f6b 100644 --- a/src/preferences/PreferenceStorage.js +++ b/src/preferences/PreferenceStorage.js @@ -199,6 +199,7 @@ define(function (require, exports, module) { var prefs = this._json, self = this, complete = true, + manager = isViewState ? PreferencesManager.stateManager : PreferencesManager, deferred = new $.Deferred(); if (!convertedKeys) { @@ -230,11 +231,7 @@ define(function (require, exports, module) { layerID: projectPath } }; } - if (isViewState) { - PreferencesManager.stateManager.set(newKey, prefs[key], options); - } else { - PreferencesManager.set(newKey, prefs[key]); - } + manager.set(newKey, prefs[key], options); convertedKeys.push(key); } } else { @@ -243,21 +240,12 @@ define(function (require, exports, module) { }); if (convertedKeys.length > 0) { - if (isViewState) { - PreferencesManager.stateManager.save().done(function () { - _commit(); - deferred.resolve(complete, convertedKeys); - }).fail(function (error) { - deferred.reject(error); - }); - } else { - PreferencesManager.save().done(function () { - _commit(); - deferred.resolve(complete, convertedKeys); - }).fail(function (error) { - deferred.reject(error); - }); - } + manager.save().done(function () { + _commit(); + deferred.resolve(complete, convertedKeys); + }).fail(function (error) { + deferred.reject(error); + }); } else { deferred.resolve(complete, convertedKeys); } diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js index 4b8be326b54..89083eb70ef 100644 --- a/src/preferences/PreferencesBase.js +++ b/src/preferences/PreferencesBase.js @@ -1339,16 +1339,6 @@ define(function (require, exports, module) { return deferred.promise(); }, - /** - * Adds a Layer to the specified scope. - * - * @param {string} scope Name of the scope where the layer object is to be added. - * @param {Layer} layer Layer object to add to this Scope - */ - addLayer: function (scope, layer) { - this._scopes[scope].addLayer(layer); - }, - /** * Path Scopes provide special handling for scopes that are managed by a * collection of files in the file tree. The idea is that files are diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index e90adcdeea9..f33ad65c95e 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -231,25 +231,9 @@ define(function (require, exports, module) { return userPrefFile; } - // TODO: In order to migrate all view states I have to move the code that creates stateManager - // (and adds a user scope to it) before the code that creates preferencesManager and all its scopes. - // Need to figure out why ??? - // - // "State" is stored like preferences but it is not generally intended to be user-editable. - // It's for more internal, implicit things like window size, working set, etc. - var stateManager = new PreferencesBase.PreferencesSystem(); - var userStateFile = brackets.app.getApplicationSupportDirectory() + "/" + STATE_FILENAME; - - var userScope = stateManager.addScope("user", new PreferencesBase.FileStorage(userStateFile, true)); - var projectLayer = new PreferencesBase.ProjectLayer(); - - userScope.done(function () { - stateManager.addLayer("user", projectLayer); - }); - var preferencesManager = new PreferencesBase.PreferencesSystem(); - userScope = preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true)); + var userScope = preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true)); // Set up the .brackets.json file handling userScope @@ -286,6 +270,15 @@ define(function (require, exports, module) { return preferencesManager.getPrefixedSystem(prefix); } + // "State" is stored like preferences but it is not generally intended to be user-editable. + // It's for more internal, implicit things like window size, working set, etc. + var stateManager = new PreferencesBase.PreferencesSystem(); + var userStateFile = brackets.app.getApplicationSupportDirectory() + "/" + STATE_FILENAME; + var smUserScope = new PreferencesBase.Scope(new PreferencesBase.FileStorage(userStateFile, true)); + var projectLayer = new PreferencesBase.ProjectLayer(); + smUserScope.addLayer(projectLayer); + var smUserScopeLoading = stateManager.addScope("user", smUserScope); + /** * Converts from the old localStorage-based preferences to the new-style * preferences according to the "rules" given. @@ -307,27 +300,29 @@ define(function (require, exports, module) { * exemines each preference key for migration. */ function convertPreferences(clientID, rules, isViewState, prefCheckCallback) { - userScope.done(function () { - var prefs = getPreferenceStorage(clientID, null, true); - - if (!prefs) { - return; - } - - var prefsID = getClientID(clientID); - if (prefStorage.convertedKeysMap === undefined) { - prefStorage.convertedKeysMap = {}; - } - var convertedKeysMap = prefStorage.convertedKeysMap; - - prefs.convert(rules, convertedKeysMap[prefsID], isViewState, prefCheckCallback) - .done(function (complete, convertedKeys) { - prefStorage.convertedKeysMap[prefsID] = convertedKeys; - savePreferences(); - }); - }).fail(function (error) { - console.error("Error while converting ", getClientID(clientID)); - console.error(error); + smUserScopeLoading.done(function () { + userScope.done(function () { + var prefs = getPreferenceStorage(clientID, null, true); + + if (!prefs) { + return; + } + + var prefsID = getClientID(clientID); + if (prefStorage.convertedKeysMap === undefined) { + prefStorage.convertedKeysMap = {}; + } + var convertedKeysMap = prefStorage.convertedKeysMap; + + prefs.convert(rules, convertedKeysMap[prefsID], isViewState, prefCheckCallback) + .done(function (complete, convertedKeys) { + prefStorage.convertedKeysMap[prefsID] = convertedKeys; + savePreferences(); + }); + }).fail(function (error) { + console.error("Error while converting ", getClientID(clientID)); + console.error(error); + }); }); } From 29799011c2b56f276349998fca3d10cf543fc872 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Thu, 13 Feb 2014 10:35:13 -0800 Subject: [PATCH 11/55] Use the project layer in the right way. --- src/document/DocumentManager.js | 14 +++----------- src/project/ProjectManager.js | 12 +++--------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 90b8aa77f64..409dece2dff 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -816,8 +816,7 @@ define(function (require, exports, module) { currentDoc = getCurrentDocument(), projectRoot = ProjectManager.getProjectRoot(), context = { location : { scope: "user", - layer: "project", - layerID: projectRoot.fullPath } }; + layer: "project" } }; if (!projectRoot) { return; @@ -840,10 +839,8 @@ define(function (require, exports, module) { } }); - // Update the project path in project layer before writing out working set files. - PreferencesManager.projectLayer.setProjectPath(projectRoot.fullPath); + // Writing out working set files using the project layer specified in 'context'. PreferencesManager.setViewState("project.files", files, context); - PreferencesManager.projectLayer.setProjectPath(null); } /** @@ -855,12 +852,9 @@ define(function (require, exports, module) { var projectRoot = ProjectManager.getProjectRoot(), files = [], context = { location : { scope: "user", - layer: "project", - layerID: projectRoot.fullPath } }; + layer: "project" } }; - PreferencesManager.projectLayer.setProjectPath(projectRoot.fullPath); files = PreferencesManager.getViewState("project.files", context); - PreferencesManager.projectLayer.setProjectPath(null); console.assert(Object.keys(_openDocuments).length === 0); // no files leftover from prev proj @@ -1012,7 +1006,6 @@ define(function (require, exports, module) { if (key.indexOf("files_/") === 0) { // Get the project path from the old preference key by stripping "files_". var projectPath = key.substr(key.indexOf("/")); - PreferencesManager.projectLayer.setProjectPath(projectPath); return "user project.files " + projectPath; } @@ -1020,7 +1013,6 @@ define(function (require, exports, module) { } PreferencesManager.convertPreferences(module, {"files_": "user"}, true, _checkPreferencePrefix); - PreferencesManager.projectLayer.setProjectPath(null); // Handle file saves that may affect preferences $(exports).on("documentSaved", function (e, doc) { diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index ba3b10adeef..1be4102b3be 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -379,8 +379,7 @@ define(function (require, exports, module) { shortPath, depth, context = { location : { scope: "user", - layer: "project", - layerID: _projectRoot.fullPath } }; + layer: "project" } }; // Query open nodes by class selector $(".jstree-open:visible").each(function (index) { @@ -407,9 +406,7 @@ define(function (require, exports, module) { }); // Store the open nodes by their full path and persist to storage - PreferencesManager.projectLayer.setProjectPath(_projectRoot.fullPath); PreferencesManager.setViewState("project.treeState", openNodes, context); - PreferencesManager.projectLayer.setProjectPath(null); } /** @@ -1051,8 +1048,7 @@ define(function (require, exports, module) { startLoad.done(function () { var context = { location : { scope: "user", - layer: "project", - layerID: rootPath } }; + layer: "project" } }; // Clear project path map _projectInitialLoad = { @@ -1062,9 +1058,7 @@ define(function (require, exports, module) { }; // restore project tree state from last time this project was open - PreferencesManager.projectLayer.setProjectPath(rootPath); _projectInitialLoad.previous = PreferencesManager.getViewState("project.treeState", context) || []; - PreferencesManager.projectLayer.setProjectPath(null); // Populate file tree as long as we aren't running in the browser if (!brackets.inBrowser) { @@ -1102,6 +1096,7 @@ define(function (require, exports, module) { if (projectRootChanged) { // Allow asynchronous event handlers to finish before resolving result by collecting promises from them var promises = []; + PreferencesManager.projectLayer.setProjectPath(_projectRoot ? _projectRoot.fullPath : null); $(exports).triggerHandler({ type: "projectOpen", promises: promises }, [_projectRoot]); $.when.apply($, promises).then(result.resolve, result.reject); } else { @@ -2147,7 +2142,6 @@ define(function (require, exports, module) { if (key.indexOf("projectTreeState_/") === 0) { // Get the project path from the old preference key by stripping "projectTreeState_". var projectPath = key.substr(key.indexOf("/")); - PreferencesManager.projectLayer.setProjectPath(projectPath); return "user project.treeState " + projectPath; } From 06d56e0fe9e99bb5aa62ccc56523c4e02cd6f4de Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Fri, 14 Feb 2014 10:18:21 -0500 Subject: [PATCH 12/55] Makes console messages from test windows appear in Spec Runner's console. --- test/spec/SpecRunnerUtils.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index c4ad3a610fc..68db66ea7d0 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -501,6 +501,8 @@ define(function (require, exports, module) { _testWindow = window.open(getBracketsSourceRoot() + "/index.html?" + params.toString(), "_blank", optionsStr); + _testWindow.console = console; + _testWindow.isBracketsTestWindow = true; _testWindow.executeCommand = function executeCommand(cmd, args) { From dcbafb8b018515d0d2392b9ca7a1bd007cffb897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Malbr=C3=A1n?= Date: Sun, 16 Feb 2014 04:33:47 -0300 Subject: [PATCH 13/55] Added smart indent and auto close tags as preferences. --- src/editor/Editor.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/editor/Editor.js b/src/editor/Editor.js index f6231b4a020..cf08da3a74e 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -76,16 +76,19 @@ define(function (require, exports, module) { _ = require("thirdparty/lodash"); /** Editor preferences */ - var USE_TAB_CHAR = "useTabChar", + var SMART_INDENT = "smartIndent", + USE_TAB_CHAR = "useTabChar", TAB_SIZE = "tabSize", SPACE_UNITS = "spaceUnits", CLOSE_BRACKETS = "closeBrackets", SHOW_LINE_NUMBERS = "showLineNumbers", STYLE_ACTIVE_LINE = "styleActiveLine", WORD_WRAP = "wordWrap", + CLOSE_TAGS = "closeTags", cmOptions = {}; // Mappings from Brackets preferences to CodeMirror options + cmOptions[SMART_INDENT] = "smartIndent"; cmOptions[USE_TAB_CHAR] = "indentWithTabs"; cmOptions[TAB_SIZE] = "indentUnit"; cmOptions[SPACE_UNITS] = "indentUnit"; @@ -93,7 +96,9 @@ define(function (require, exports, module) { cmOptions[SHOW_LINE_NUMBERS] = "lineNumbers"; cmOptions[STYLE_ACTIVE_LINE] = "styleActiveLine"; cmOptions[WORD_WRAP] = "lineWrapping"; + cmOptions[CLOSE_TAGS] = "autoCloseTags"; + PreferencesManager.definePreference(SMART_INDENT, "boolean", true); PreferencesManager.definePreference(USE_TAB_CHAR, "boolean", false); PreferencesManager.definePreference(TAB_SIZE, "number", 4); PreferencesManager.definePreference(SPACE_UNITS, "number", 4); @@ -101,9 +106,10 @@ define(function (require, exports, module) { PreferencesManager.definePreference(SHOW_LINE_NUMBERS, "boolean", true); PreferencesManager.definePreference(STYLE_ACTIVE_LINE, "boolean", false); PreferencesManager.definePreference(WORD_WRAP, "boolean", true); + PreferencesManager.definePreference(CLOSE_TAGS, "Object", { whenOpening: true, whenClosing: true, indentTabs: [] }); - var editorOptions = [USE_TAB_CHAR, TAB_SIZE, SPACE_UNITS, CLOSE_BRACKETS, - SHOW_LINE_NUMBERS, STYLE_ACTIVE_LINE, WORD_WRAP]; + var editorOptions = [SMART_INDENT, USE_TAB_CHAR, TAB_SIZE, SPACE_UNITS, CLOSE_BRACKETS, + SHOW_LINE_NUMBERS, STYLE_ACTIVE_LINE, WORD_WRAP, CLOSE_TAGS]; /** Editor preferences */ @@ -381,6 +387,7 @@ define(function (require, exports, module) { // (note: CodeMirror doesn't actually require using 'new', but jslint complains without it) this._codeMirror = new CodeMirror(container, { electricChars: false, // we use our own impl of this to avoid CodeMirror bugs; see _checkElectricChars() + smartIndent: currentOptions[SMART_INDENT], indentWithTabs: currentOptions[USE_TAB_CHAR], tabSize: currentOptions[TAB_SIZE], indentUnit: currentOptions[USE_TAB_CHAR] ? currentOptions[TAB_SIZE] : currentOptions[SPACE_UNITS], @@ -393,11 +400,7 @@ define(function (require, exports, module) { dragDrop: false, extraKeys: codeMirrorKeyMap, autoCloseBrackets: currentOptions[CLOSE_BRACKETS], - autoCloseTags: { - whenOpening: true, - whenClosing: true, - indentTags: [] - }, + autoCloseTags: currentOptions[CLOSE_TAGS], cursorScrollMargin: 3 }); From 4a5d350905cd25ef8676b014553ca87bdb99bb35 Mon Sep 17 00:00:00 2001 From: Razvan Caliman Date: Mon, 17 Feb 2014 10:15:52 +0000 Subject: [PATCH 14/55] expose server baseUrl in LiveDevelopment --- src/LiveDevelopment/LiveDevelopment.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index f6b6a7afbed..0882879aa8b 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -1347,6 +1347,10 @@ define(function LiveDevelopment(require, exports, module) { return _server; } + function getServerBaseUrl() { + return _server.getBaseUrl(); + } + // For unit testing exports.launcherUrl = launcherUrl; exports._getServer = _getServer; @@ -1365,4 +1369,5 @@ define(function LiveDevelopment(require, exports, module) { exports.redrawHighlight = redrawHighlight; exports.init = init; exports.getCurrentProjectServerConfig = getCurrentProjectServerConfig; + exports.getServerBaseUrl = getServerBaseUrl; }); \ No newline at end of file From fc574fa490db3f47a0f95b729047e35aa75f5d75 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Mon, 17 Feb 2014 20:16:39 +0100 Subject: [PATCH 15/55] Remove lineComment of JSON --- src/language/languages.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/language/languages.json b/src/language/languages.json index 8b312ae4abf..78a2db7ac67 100644 --- a/src/language/languages.json +++ b/src/language/languages.json @@ -79,8 +79,7 @@ "json": { "name": "JSON", "mode": ["javascript", "application/json"], - "fileExtensions": ["json"], - "lineComment": ["//"] + "fileExtensions": ["json"] }, "xml": { From fc0def17d4ec82dc3293b8717a899832f7c26917 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Mon, 17 Feb 2014 11:26:32 -0800 Subject: [PATCH 16/55] Removing space character from secondary trigger keys for CSS code hints. --- src/extensions/default/CSSCodeHints/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/CSSCodeHints/main.js b/src/extensions/default/CSSCodeHints/main.js index 36a2a0ea2f3..63df241fdad 100644 --- a/src/extensions/default/CSSCodeHints/main.js +++ b/src/extensions/default/CSSCodeHints/main.js @@ -45,7 +45,7 @@ define(function (require, exports, module) { */ function CssPropHints() { this.primaryTriggerKeys = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-()"; - this.secondaryTriggerKeys = ": "; + this.secondaryTriggerKeys = ":"; this.exclusion = null; } From bd7e8d0565b6ba5896378139860c7a18fd330142 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Mon, 17 Feb 2014 13:35:04 -0800 Subject: [PATCH 17/55] when selection is changed in working set, scroll it into view --- src/project/WorkingSetView.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index ad7a3f2dcd8..67ee6faa13b 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -69,6 +69,8 @@ define(function (require, exports, module) { * Redraw selection when list size changes or DocumentManager currentDocument changes. */ function _fireSelectionChanged() { + _scrollSelectedDocIntoView(); + // redraw selection $openFilesList.trigger("selectionChanged"); From 12ae9f3e4a941d4e399f95ef427da71d9f0be99d Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 18 Feb 2014 11:23:00 -0500 Subject: [PATCH 18/55] Removes the Browse Extensions button in the default configuration. This is a fix for #6800. If the extension_wiki_url configuration option is not set, the Browse Extensions button will not be displayed. In the default Brackets configuration, this value is no longer set. --- src/brackets.config.json | 2 +- src/config.json | 2 +- src/extensibility/InstallExtensionDialog.js | 3 +- src/htmlContent/install-extension-dialog.html | 2 +- test/spec/InstallExtensionDialog-test.js | 36 ++++++++++++++----- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/brackets.config.json b/src/brackets.config.json index f446ef7814c..f69fc03a4ab 100644 --- a/src/brackets.config.json +++ b/src/brackets.config.json @@ -13,7 +13,7 @@ "troubleshoot_url" : "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev", "twitter_name" : "@brackets", "contributors_url" : "https://api.github.com/repos/adobe/brackets/contributors", - "extension_wiki_url": "https://github.com/adobe/brackets/wiki/Brackets-Extensions", + "extension_wiki_url": "", "extension_registry": "https://s3.amazonaws.com/extend.brackets/registry.json", "extension_url" : "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip", "linting.enabled_by_default" : true diff --git a/src/config.json b/src/config.json index 993e90b7a04..6f718ebc2f4 100644 --- a/src/config.json +++ b/src/config.json @@ -12,7 +12,7 @@ "troubleshoot_url": "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev", "twitter_name": "@brackets", "contributors_url": "https://api.github.com/repos/adobe/brackets/contributors", - "extension_wiki_url": "https://github.com/adobe/brackets/wiki/Brackets-Extensions", + "extension_wiki_url": "", "extension_registry": "https://s3.amazonaws.com/extend.brackets/registry.json", "extension_url": "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip", "linting.enabled_by_default": true diff --git a/src/extensibility/InstallExtensionDialog.js b/src/extensibility/InstallExtensionDialog.js index 902bca9bcec..0097ffbf18a 100644 --- a/src/extensibility/InstallExtensionDialog.js +++ b/src/extensibility/InstallExtensionDialog.js @@ -332,7 +332,8 @@ define(function (require, exports, module) { var context = { Strings: Strings, - isUpdate: this._isUpdate + isUpdate: this._isUpdate, + includeBrowseExtensions: !!brackets.config.extension_wiki_url }; // We ignore the promise returned by showModalDialogUsingTemplate, since we're managing the diff --git a/src/htmlContent/install-extension-dialog.html b/src/htmlContent/install-extension-dialog.html index 4bbf4763ee9..831f519c64a 100644 --- a/src/htmlContent/install-extension-dialog.html +++ b/src/htmlContent/install-extension-dialog.html @@ -14,7 +14,7 @@

- + {{#includeBrowseExtensions}}{{/includeBrowseExtensions}}
diff --git a/test/spec/InstallExtensionDialog-test.js b/test/spec/InstallExtensionDialog-test.js index ea270480602..bde01899793 100644 --- a/test/spec/InstallExtensionDialog-test.js +++ b/test/spec/InstallExtensionDialog-test.js @@ -22,8 +22,7 @@ */ -/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define, describe, it, xit, expect, beforeEach, afterEach, waits, waitsFor, runs, $, waitsForDone, spyOn, jasmine, beforeFirst, afterLast */ +/*global define, describe, it, xit, expect, beforeEach, afterEach, waits, waitsFor, runs, $, waitsForDone, spyOn, jasmine, beforeFirst, afterLast, brackets */ /*unittests: Install Extension Dialog*/ define(function (require, exports, module) { @@ -37,7 +36,8 @@ define(function (require, exports, module) { describe("Install Extension Dialog", function () { var testWindow, dialog, fields, goodInstaller, badInstaller, closed, - url = "http://brackets.io/extensions/myextension.zip"; + url = "http://brackets.io/extensions/myextension.zip", + oldExtensionWikiURL = brackets.config.extension_wiki_url; this.category = "integration"; @@ -55,6 +55,7 @@ define(function (require, exports, module) { }); afterEach(function () { + testWindow.brackets.config.extension_wiki_url = oldExtensionWikiURL; runs(function () { if (dialog) { dialog._close(); @@ -96,6 +97,28 @@ define(function (require, exports, module) { return installer; } + describe("with Browse Extensions enabled", function () { + it("should open the extension list wiki page when the user clicks on the Browse Extensions button", function () { + var extensionWikiURL = "https://github.com/adobe/brackets/wiki/Brackets-Extensions"; + testWindow.brackets.config.extension_wiki_url = extensionWikiURL; + + dialog = new testWindow.brackets.test.InstallExtensionDialog._Dialog(); + dialog.show() + .always(function () { + closed = true; + }); + + fields = { + $browseExtensionsButton: dialog.$browseExtensionsButton + }; + + var NativeApp = testWindow.brackets.getModule("utils/NativeApp"); + spyOn(NativeApp, "openURLInDefaultBrowser"); + fields.$browseExtensionsButton.click(); + expect(NativeApp.openURLInDefaultBrowser).toHaveBeenCalledWith(extensionWikiURL); + }); + }); + describe("when user-initiated", function () { beforeEach(function () { @@ -663,11 +686,8 @@ define(function (require, exports, module) { }); - it("should open the extension list wiki page when the user clicks on the Browse Extensions button", function () { - var NativeApp = testWindow.brackets.getModule("utils/NativeApp"); - spyOn(NativeApp, "openURLInDefaultBrowser"); - fields.$browseExtensionsButton.click(); - expect(NativeApp.openURLInDefaultBrowser).toHaveBeenCalledWith("https://github.com/adobe/brackets/wiki/Brackets-Extensions"); + it("should not display the Browse Extensions button in the default configuration", function () { + expect(fields.$browseExtensionsButton.length).toBe(0); }); it("should display a warning message if the extension is already installed", function () { From 616c5e0ff2d1ddd76e69f0be6702424fd6a7eb7f Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 18 Feb 2014 11:34:25 -0500 Subject: [PATCH 19/55] Automatically saves prefs on `set` unless new `doNotSave` flag is set. This is following the pattern @RaymondLim established in #6740. --- src/editor/Editor.js | 10 +++++----- src/preferences/PreferencesManager.js | 12 ++++++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/editor/Editor.js b/src/editor/Editor.js index f6231b4a020..f76e511d532 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -1599,7 +1599,7 @@ define(function (require, exports, module) { * @param {boolean} value */ Editor.setUseTabChar = function (value) { - PreferencesManager.setValueAndSave(USE_TAB_CHAR, value); + PreferencesManager.set(USE_TAB_CHAR, value); }; /** @type {boolean} Gets whether the current editor uses tab characters (vs. spaces) when inserting new text */ @@ -1613,7 +1613,7 @@ define(function (require, exports, module) { * @param {number} value */ Editor.setTabSize = function (value) { - PreferencesManager.setValueAndSave(TAB_SIZE, value); + PreferencesManager.set(TAB_SIZE, value); }; /** @type {number} Get indent unit */ @@ -1627,7 +1627,7 @@ define(function (require, exports, module) { * @param {number} value */ Editor.setSpaceUnits = function (value) { - PreferencesManager.setValueAndSave(SPACE_UNITS, value); + PreferencesManager.set(SPACE_UNITS, value); }; /** @type {number} Get indentation width */ @@ -1641,7 +1641,7 @@ define(function (require, exports, module) { * @param {boolean} value */ Editor.setCloseBrackets = function (value) { - PreferencesManager.setValueAndSave(CLOSE_BRACKETS, value); + PreferencesManager.set(CLOSE_BRACKETS, value); }; /** @type {boolean} Gets whether the current editor uses auto close brackets */ @@ -1655,7 +1655,7 @@ define(function (require, exports, module) { * @param {boolean} value */ Editor.setShowLineNumbers = function (value) { - PreferencesManager.setValueAndSave(SHOW_LINE_NUMBERS, value); + PreferencesManager.set(SHOW_LINE_NUMBERS, value); }; /** @type {boolean} Returns true if show line numbers is enabled for the current editor */ diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 34b4ee28e6f..bc36b3dee69 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -489,6 +489,8 @@ define(function (require, exports, module) { * comes from the "default" scope, the new value will be set at the level just above * default. * + * The preferences are saved automatically unless doNotSave is true. + * * As with the `get()` function, the context can be a filename, * CURRENT_FILE, CURRENT_PROJECT or a full context object as supported by * PreferencesSystem. @@ -496,13 +498,18 @@ define(function (require, exports, module) { * @param {string} id Identifier of the preference to set * @param {Object} value New value for the preference * @param {{location: ?Object, context: ?Object|string}=} options Specific location in which to set the value or the context to use when setting the value + * @param {boolean=} doNotSave True if the preference change should not be saved automatically. * @return {boolean} true if a value was set */ - function set(id, value, options) { + function set(id, value, options, doNotSave) { if (options && options.context) { options.context = _normalizeContext(options.context); } - return preferencesManager.set(id, value, options); + var wasSet = preferencesManager.set(id, value, options); + if (!doNotSave) { + preferencesManager.save(); + } + return wasSet; } /** @@ -515,6 +522,7 @@ define(function (require, exports, module) { * @return {boolean} true if a value was set */ function setValueAndSave(id, value, options) { + // TODO: Add a deprecation warning for this. var changed = set(id, value, options); preferencesManager.save(); return changed; From 27d8c67e31a04b367d1e7f9f94070d9b0f0698db Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 18 Feb 2014 12:36:08 -0500 Subject: [PATCH 20/55] Mirror console log output from test window in both consoles. --- test/spec/SpecRunnerUtils.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index 68db66ea7d0..4eedb6455c6 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -501,7 +501,16 @@ define(function (require, exports, module) { _testWindow = window.open(getBracketsSourceRoot() + "/index.html?" + params.toString(), "_blank", optionsStr); - _testWindow.console = console; + // Displays the primary console messages from the test window in the the + // test runner's console as well. + ["log", "info", "warn", "error"].forEach(function (method) { + var originalMethod = _testWindow.console[method]; + _testWindow.console[method] = function () { + var log = ["[testWindow] "].concat(Array.prototype.slice.call(arguments, 0)); + console[method].apply(console, log); + originalMethod.apply(_testWindow.console, arguments); + }; + }); _testWindow.isBracketsTestWindow = true; From 97bbeca5aa04ce8d09f25e4ffda8413ff6db1d03 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 18 Feb 2014 14:04:31 -0500 Subject: [PATCH 21/55] Add proxy support for extension installation. Configurable via a "proxy" preference (which could be used for other parts of Brackets that should use HTTP proxy). This fixes #6241, #5958 and [this backlog item](https://trello.com/c/SEV95fdK/902-support-for-a-proxy-in-extensions-installation) --- src/extensibility/Package.js | 7 +++++-- src/extensibility/node/ExtensionManagerDomain.js | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/extensibility/Package.js b/src/extensibility/Package.js index 8124a85bdad..a0d08d4256c 100644 --- a/src/extensibility/Package.js +++ b/src/extensibility/Package.js @@ -37,7 +37,10 @@ define(function (require, exports, module) { StringUtils = require("utils/StringUtils"), Strings = require("strings"), ExtensionLoader = require("utils/ExtensionLoader"), - NodeConnection = require("utils/NodeConnection"); + NodeConnection = require("utils/NodeConnection"), + PreferencesManager = require("preferences/PreferencesManager"); + + PreferencesManager.definePreference("proxy", "string"); var Errors = { ERROR_LOADING: "ERROR_LOADING", @@ -246,7 +249,7 @@ define(function (require, exports, module) { } // Download the bits (using Node since brackets-shell doesn't support binary file IO) - var r = extensionManager.downloadFile(downloadId, urlInfo.url); + var r = extensionManager.downloadFile(downloadId, urlInfo.url, PreferencesManager.get("proxy")); r.done(function (result) { d.resolve({ localPath: result, filenameHint: urlInfo.filenameHint }); }).fail(function (err) { diff --git a/src/extensibility/node/ExtensionManagerDomain.js b/src/extensibility/node/ExtensionManagerDomain.js index 4e35e99ba02..e2f489e23ee 100644 --- a/src/extensibility/node/ExtensionManagerDomain.js +++ b/src/extensibility/node/ExtensionManagerDomain.js @@ -379,7 +379,13 @@ function _endDownload(downloadId, error) { /** * Implements "downloadFile" command, asynchronously. */ -function _cmdDownloadFile(downloadId, url, callback) { +function _cmdDownloadFile(downloadId, url, proxy, callback) { + // Backwards compatibility check, added in 0.37 + if (typeof proxy === "function") { + callback = proxy; + proxy = undefined; + } + if (pendingDownloads[downloadId]) { callback(Errors.DOWNLOAD_ID_IN_USE, null); return; @@ -387,7 +393,8 @@ function _cmdDownloadFile(downloadId, url, callback) { var req = request.get({ url: url, - encoding: null + encoding: null, + proxy: proxy }, // Note: we could use the traditional "response"/"data"/"end" events too if we wanted to stream data // incrementally, limit download size, etc. - but the simple callback is good enough for our needs. @@ -593,6 +600,10 @@ function init(domainManager) { name: "url", type: "string", description: "URL to download from" + }, { + name: "proxy", + type: "string", + description: "optional proxy URL" }], { type: "string", From a953fb8dea9cc2d8f8aa7e9ccf748084cb6915e6 Mon Sep 17 00:00:00 2001 From: Razvan Caliman Date: Tue, 18 Feb 2014 19:56:59 +0000 Subject: [PATCH 22/55] handle null or undefined server --- src/LiveDevelopment/LiveDevelopment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index 0882879aa8b..9fdc1c523b2 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -1348,7 +1348,7 @@ define(function LiveDevelopment(require, exports, module) { } function getServerBaseUrl() { - return _server.getBaseUrl(); + return _server && _server.getBaseUrl(); } // For unit testing From dbb11fea3ac92c36eb1b7d4f73b4300aca31605a Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 18 Feb 2014 15:54:03 -0500 Subject: [PATCH 23/55] Addresses review comments for browse extensions button. --- src/brackets.config.json | 30 ++++++++++----------- src/config.json | 2 +- src/extensibility/InstallExtensionDialog.js | 4 +-- test/spec/InstallExtensionDialog-test.js | 13 ++++----- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/brackets.config.json b/src/brackets.config.json index f69fc03a4ab..0c4268620db 100644 --- a/src/brackets.config.json +++ b/src/brackets.config.json @@ -1,21 +1,21 @@ { "config" : { - "app_title" : "Brackets", - "app_name_about" : "Brackets", - "about_icon" : "styles/images/brackets_icon.svg", - "update_info_url" : "http://dev.brackets.io/updates/stable/", - "how_to_use_url" : "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets", - "forum_url" : "https://groups.google.com/forum/?fromgroups#!forum/brackets-dev", - "release_notes_url" : "https://github.com/adobe/brackets/wiki/Release-Notes", - "report_issue_url" : "https://github.com/adobe/brackets/wiki/How-to-Report-an-Issue", - "twitter_url" : "https://twitter.com/brackets", - "troubleshoot_url" : "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev", - "twitter_name" : "@brackets", - "contributors_url" : "https://api.github.com/repos/adobe/brackets/contributors", - "extension_wiki_url": "", - "extension_registry": "https://s3.amazonaws.com/extend.brackets/registry.json", - "extension_url" : "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip", + "app_title" : "Brackets", + "app_name_about" : "Brackets", + "about_icon" : "styles/images/brackets_icon.svg", + "update_info_url" : "http://dev.brackets.io/updates/stable/", + "how_to_use_url" : "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets", + "forum_url" : "https://groups.google.com/forum/?fromgroups#!forum/brackets-dev", + "release_notes_url" : "https://github.com/adobe/brackets/wiki/Release-Notes", + "report_issue_url" : "https://github.com/adobe/brackets/wiki/How-to-Report-an-Issue", + "twitter_url" : "https://twitter.com/brackets", + "troubleshoot_url" : "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev", + "twitter_name" : "@brackets", + "contributors_url" : "https://api.github.com/repos/adobe/brackets/contributors", + "extension_listing_url" : "", + "extension_registry" : "https://s3.amazonaws.com/extend.brackets/registry.json", + "extension_url" : "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip", "linting.enabled_by_default" : true } } \ No newline at end of file diff --git a/src/config.json b/src/config.json index 6f718ebc2f4..e36fa95e914 100644 --- a/src/config.json +++ b/src/config.json @@ -12,7 +12,7 @@ "troubleshoot_url": "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev", "twitter_name": "@brackets", "contributors_url": "https://api.github.com/repos/adobe/brackets/contributors", - "extension_wiki_url": "", + "extension_listing_url": "", "extension_registry": "https://s3.amazonaws.com/extend.brackets/registry.json", "extension_url": "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip", "linting.enabled_by_default": true diff --git a/src/extensibility/InstallExtensionDialog.js b/src/extensibility/InstallExtensionDialog.js index 0097ffbf18a..6a1dfd982e2 100644 --- a/src/extensibility/InstallExtensionDialog.js +++ b/src/extensibility/InstallExtensionDialog.js @@ -333,7 +333,7 @@ define(function (require, exports, module) { var context = { Strings: Strings, isUpdate: this._isUpdate, - includeBrowseExtensions: !!brackets.config.extension_wiki_url + includeBrowseExtensions: !!brackets.config.extension_listing_url }; // We ignore the promise returned by showModalDialogUsingTemplate, since we're managing the @@ -353,7 +353,7 @@ define(function (require, exports, module) { this.$cancelButton.on("click", this._handleCancel.bind(this)); this.$url.on("input", this._handleUrlInput.bind(this)); this.$browseExtensionsButton.on("click", function () { - NativeApp.openURLInDefaultBrowser(brackets.config.extension_wiki_url); + NativeApp.openURLInDefaultBrowser(brackets.config.extension_listing_url); }); $(document.body).on("keyup.installDialog", this._handleKeyUp.bind(this)); diff --git a/test/spec/InstallExtensionDialog-test.js b/test/spec/InstallExtensionDialog-test.js index bde01899793..d353af34d25 100644 --- a/test/spec/InstallExtensionDialog-test.js +++ b/test/spec/InstallExtensionDialog-test.js @@ -36,8 +36,7 @@ define(function (require, exports, module) { describe("Install Extension Dialog", function () { var testWindow, dialog, fields, goodInstaller, badInstaller, closed, - url = "http://brackets.io/extensions/myextension.zip", - oldExtensionWikiURL = brackets.config.extension_wiki_url; + url = "http://brackets.io/extensions/myextension.zip"; this.category = "integration"; @@ -55,7 +54,7 @@ define(function (require, exports, module) { }); afterEach(function () { - testWindow.brackets.config.extension_wiki_url = oldExtensionWikiURL; + testWindow.brackets.config.extension_listing_url = brackets.config.extension_listing_url; runs(function () { if (dialog) { dialog._close(); @@ -99,8 +98,10 @@ define(function (require, exports, module) { describe("with Browse Extensions enabled", function () { it("should open the extension list wiki page when the user clicks on the Browse Extensions button", function () { - var extensionWikiURL = "https://github.com/adobe/brackets/wiki/Brackets-Extensions"; - testWindow.brackets.config.extension_wiki_url = extensionWikiURL; + // Set the extension_listing_url in the configuration so that the button will + // show up. + var extensionListingURL = "https://github.com/adobe/brackets/wiki/Brackets-Extensions"; + testWindow.brackets.config.extension_listing_url = extensionListingURL; dialog = new testWindow.brackets.test.InstallExtensionDialog._Dialog(); dialog.show() @@ -115,7 +116,7 @@ define(function (require, exports, module) { var NativeApp = testWindow.brackets.getModule("utils/NativeApp"); spyOn(NativeApp, "openURLInDefaultBrowser"); fields.$browseExtensionsButton.click(); - expect(NativeApp.openURLInDefaultBrowser).toHaveBeenCalledWith(extensionWikiURL); + expect(NativeApp.openURLInDefaultBrowser).toHaveBeenCalledWith(extensionListingURL); }); }); From f5d5c24db1d00ca58861c23e7a6a155a27efce4b Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Tue, 18 Feb 2014 13:04:54 -0800 Subject: [PATCH 24/55] move functions which are referenced before they're defined --- src/project/WorkingSetView.js | 90 +++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js index 67ee6faa13b..52ec884cff1 100644 --- a/src/project/WorkingSetView.js +++ b/src/project/WorkingSetView.js @@ -64,6 +64,51 @@ define(function (require, exports, module) { var _suppressSortRedraw = false; + /** + * Finds the listItem item assocated with the file. Returns null if not found. + * @private + * @param {!File} file + * @return {HTMLLIItem} + */ + function _findListItemFromFile(file) { + var result = null; + + if (file) { + var items = $openFilesContainer.find("ul").children(); + items.each(function () { + var $listItem = $(this); + if ($listItem.data(_FILE_KEY).fullPath === file.fullPath) { + result = $listItem; + return false; + // breaks each + } + }); + } + + return result; + } + + /** + * @private + */ + function _scrollSelectedDocIntoView() { + if (FileViewController.getFileSelectionFocus() !== FileViewController.WORKING_SET_VIEW) { + return; + } + + var doc = DocumentManager.getCurrentDocument(); + if (!doc) { + return; + } + + var $selectedDoc = _findListItemFromFile(doc.file); + if (!$selectedDoc) { + return; + } + + ViewUtils.scrollElementIntoView($openFilesContainer, $selectedDoc, false); + } + /** * @private * Redraw selection when list size changes or DocumentManager currentDocument changes. @@ -474,51 +519,6 @@ define(function (require, exports, module) { } } - /** - * Finds the listItem item assocated with the file. Returns null if not found. - * @private - * @param {!File} file - * @return {HTMLLIItem} - */ - function _findListItemFromFile(file) { - var result = null; - - if (file) { - var items = $openFilesContainer.find("ul").children(); - items.each(function () { - var $listItem = $(this); - if ($listItem.data(_FILE_KEY).fullPath === file.fullPath) { - result = $listItem; - return false; - // breaks each - } - }); - } - - return result; - } - - /** - * @private - */ - function _scrollSelectedDocIntoView() { - if (FileViewController.getFileSelectionFocus() !== FileViewController.WORKING_SET_VIEW) { - return; - } - - var doc = DocumentManager.getCurrentDocument(); - if (!doc) { - return; - } - - var $selectedDoc = _findListItemFromFile(doc.file); - if (!$selectedDoc) { - return; - } - - ViewUtils.scrollElementIntoView($openFilesContainer, $selectedDoc, false); - } - /** * @private */ From 7392df86f0077e3b2e29580eccc69e4ec8972c88 Mon Sep 17 00:00:00 2001 From: Clay Miller Date: Tue, 18 Feb 2014 15:45:34 -0600 Subject: [PATCH 25/55] Provide syntax highlighting for ASP.NET User Controls (.ascx files). --- 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 8b312ae4abf..f2676560c04 100644 --- a/src/language/languages.json +++ b/src/language/languages.json @@ -36,7 +36,7 @@ "html": { "name": "HTML", "mode": ["htmlmixed", "text/x-brackets-html"], - "fileExtensions": ["html", "htm", "shtm", "shtml", "xhtml", "cfm", "cfml", "cfc", "dhtml", "xht", "tpl", "twig", "hbs", "handlebars", "kit", "jsp", "aspx", "asp", "master","cshtml","vbhtml"], + "fileExtensions": ["html", "htm", "shtm", "shtml", "xhtml", "cfm", "cfml", "cfc", "dhtml", "xht", "tpl", "twig", "hbs", "handlebars", "kit", "jsp", "aspx", "ascx", "asp", "master", "cshtml", "vbhtml"], "blockComment": [""] }, From 163ca2ff719c22061e2e2a6049153e1dfcceb38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Malbr=C3=A1n?= Date: Tue, 18 Feb 2014 19:55:10 -0200 Subject: [PATCH 26/55] Fixes: indentTabs -> indentTags --- src/editor/Editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/Editor.js b/src/editor/Editor.js index cf08da3a74e..36fe3b390f6 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -106,7 +106,7 @@ define(function (require, exports, module) { PreferencesManager.definePreference(SHOW_LINE_NUMBERS, "boolean", true); PreferencesManager.definePreference(STYLE_ACTIVE_LINE, "boolean", false); PreferencesManager.definePreference(WORD_WRAP, "boolean", true); - PreferencesManager.definePreference(CLOSE_TAGS, "Object", { whenOpening: true, whenClosing: true, indentTabs: [] }); + PreferencesManager.definePreference(CLOSE_TAGS, "Object", { whenOpening: true, whenClosing: true, indentTags: [] }); var editorOptions = [SMART_INDENT, USE_TAB_CHAR, TAB_SIZE, SPACE_UNITS, CLOSE_BRACKETS, SHOW_LINE_NUMBERS, STYLE_ACTIVE_LINE, WORD_WRAP, CLOSE_TAGS]; From 19f7424aa23f5f4ae2e68dc140b8a82129bef900 Mon Sep 17 00:00:00 2001 From: Clay Miller Date: Tue, 18 Feb 2014 16:02:30 -0600 Subject: [PATCH 27/55] Provide syntax highlighting for Property Lists (.plist files). --- 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 8b312ae4abf..900f5250c16 100644 --- a/src/language/languages.json +++ b/src/language/languages.json @@ -86,7 +86,7 @@ "xml": { "name": "XML", "mode": "xml", - "fileExtensions": ["svg", "xml", "wxs", "wxl", "wsdl", "rss", "atom", "rdf", "xslt", "xul", "xbl", "mathml", "config"], + "fileExtensions": ["svg", "xml", "wxs", "wxl", "wsdl", "rss", "atom", "rdf", "xslt", "xul", "xbl", "mathml", "config", "plist"], "blockComment": [""] }, From 607abe97cac63e5d0e42a608690431b7d2c40628 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Wed, 19 Feb 2014 00:53:10 -0800 Subject: [PATCH 28/55] Add unit tests for space key input in CSS. --- .../default/CSSCodeHints/unittests.js | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/extensions/default/CSSCodeHints/unittests.js b/src/extensions/default/CSSCodeHints/unittests.js index 7a3284d6260..9a38945e416 100644 --- a/src/extensions/default/CSSCodeHints/unittests.js +++ b/src/extensions/default/CSSCodeHints/unittests.js @@ -85,8 +85,8 @@ define(function (require, exports, module) { } // Ask provider for hints at current cursor position; expect it NOT to return any - function expectNoHints(provider) { - expect(provider.hasHints(testEditor, null)).toBe(false); + function expectNoHints(provider, implicitChar) { + expect(provider.hasHints(testEditor, implicitChar)).toBe(false); } function verifyAttrHints(hintList, expectedFirstHint) { @@ -634,6 +634,26 @@ define(function (require, exports, module) { verifyAllValues(hintList, []); }); }); + + describe("Should not invoke CSS hints on space key", function () { + beforeEach(function () { + setupTest(testContentHTML, "html"); + }); + + afterEach(function () { + tearDownTest(); + }); + + it("should not trigger CSS property name hints with space key", function () { + testEditor.setCursorPos({ line: 25, ch: 11 }); // after { + expectNoHints(CSSCodeHints.cssPropHintProvider, " "); + }); + + it("should not trigger CSS property value hints with space key", function () { + testEditor.setCursorPos({ line: 28, ch: 21 }); // after flow-from + expectNoHints(CSSCodeHints.cssPropHintProvider, " "); + }); + }); }); }); From 74950133a523d73d4b4fdee6fdf80d2d3c0b0a7e Mon Sep 17 00:00:00 2001 From: Mohammad Yaghobi Date: Wed, 19 Feb 2014 16:17:58 +0330 Subject: [PATCH 29/55] Update strings.js --- src/nls/fa-ir/strings.js | 187 ++++++++++++++++++++++++--------------- 1 file changed, 116 insertions(+), 71 deletions(-) diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index 720d41b7669..946b0fe4dab 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -37,6 +37,7 @@ define({ "NOT_READABLE_ERR" : "فایل قابل خواندن نیست.", "NO_MODIFICATION_ALLOWED_ERR" : "دایرکتوری هدف قابل ویرایش نیست.", "NO_MODIFICATION_ALLOWED_ERR_FILE" : "دسترسی های تعریف شده برای شما اجازه تغییرات را نمی دهند.", + "CONTENTS_MODIFIED_ERR" : "این فایل قبل خارج از محیط این نرم افزار ویرایش شده است.", "FILE_EXISTS_ERR" : "پرونده یا پوشه مد نظر موجود می باشد.", "FILE" : "پرونده", "DIRECTORY" : "پوشه", @@ -69,7 +70,7 @@ define({ "ERROR_IN_BROWSER_TITLE" : "!!! براکتس در مرورگرها اجرا نمی شود.", "ERROR_IN_BROWSER" : "براکتس با HTML ساخته شده, ولی هم اکنون بعنوان یک برنامه رومیزی(desktop) اجرا می شود و شما می توانید از آن جهت ویرایش پرونده های خود استفاده نمایید.", - // FileIndexManager error string + // ProjectManager max files error string "ERROR_MAX_FILES_TITLE" : "خطا در فهرست بندی پرونده ها", "ERROR_MAX_FILES" : "مقدار پرونده های قابل فهرست بندی به حداکثر رسیده بهمین علیت عملگر بهنگام فهرست بندی با خطا مواجه می شود.", @@ -94,11 +95,12 @@ define({ "LIVE_DEV_STATUS_TIP_PROGRESS2" : "پیش نمایش زنده: درحال مقدار دهی اولیه\u2026", "LIVE_DEV_STATUS_TIP_CONNECTED" : "قطع اتصال از پیش نمایش زنده", "LIVE_DEV_STATUS_TIP_OUT_OF_SYNC" : "پیش نمایش زنده: جهت قطع اتصال کلیک کنید (ذخیره پرونده ها جهت بروز رسانی)", + "LIVE_DEV_STATUS_TIP_SYNC_ERROR" : "پیش نمایش زنده(به دلیل خطا در نحو بروزرسانی نشده است)", "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS" : "پیش نمایش زنده لغو شد زیرا از برخی از ابزارهای توسعه مختص مرورگرتان استفاده کرده اید.", "LIVE_DEV_DETACHED_TARGET_CLOSED" : "پیش نمایش زنده لغو شد زیرا پنجره یا زبانه مربوط به صفحه در مرورگر بسته شده.", "LIVE_DEV_NAVIGATED_AWAY" : "پیش نمایش زنده لغو شد زیرا پنجره یا زبانه موجود در مرورگر آدرس دیگری را پیمایش کرده است.", - "LIVE_DEV_CLOSED_UNKNOWN_REASON" : "پیش نمایش زنده بدلیل نامشخصی لغو شد ({0})", + "LIVE_DEV_CLOSED_UNKNOWN_REASON" : "پیش نمایش زنده به دلیل نامشخصی لغو شد ({0})", "SAVE_CLOSE_TITLE" : "ذخیره تغییرات", "SAVE_CLOSE_MESSAGE" : "آیا مایلید تغییرات داده شده در سند ذخیره گردند {0}?", @@ -107,20 +109,34 @@ define({ "CONFIRM_FOLDER_DELETE_TITLE" : "تائید حذف", "CONFIRM_FOLDER_DELETE" : "آیا مطمئنید می خواهید این پوشه حذف گردد {0}?", "FILE_DELETED_TITLE" : "پرونده حذف گردید", - "EXT_MODIFIED_MESSAGE" : "{0} تغییراتی بر روی دیسک انجام شده, ولی تغییرات بر روی براکتس ذخیره نگردیده.

کدام نسخه را می خواهید نگه دارید?", + "EXT_MODIFIED_WARNING" : "{0} خارج از براکتس ویرایش شده.

آیا می خواهید فایل را ذخیره و و تغییراتی را که دادید دوباره بر روی فایل ویرایش شده اعمال نمایید؟", + "EXT_MODIFIED_MESSAGE" : "{0} تغییراتی بر روی دیسک انجام شده, ولی تغییرات بر روی براکتس ذخیره نگردیده.

کدام نسخه را می خواهید نگه دارید?", "EXT_DELETED_MESSAGE" : "{0} برخی مقادیر از دیسک حذف شده, ولی تغییرات بر روی براکتس اعمال/ذخیره نشده.

آیا می خواهید تغییرات را حفظ کنید?", - // Find, Replace, Find in Files - "SEARCH_REGEXP_INFO" : "برای جستجوی regexp از /re/ استفاده کنید", - "FIND_RESULT_COUNT" : "{0} نتایج", - "FIND_RESULT_COUNT_SINGLE" : "1 نتیجه", - "FIND_NO_RESULTS" : "بی نتیجه", - "WITH" : "با", + // Generic dialog/button labels + "OK" : "تائید", + "CANCEL" : "لغو", + "DONT_SAVE" : "ذخیره نکن", + "SAVE" : "ذخیره", + "SAVE_AS" : "ذخیره بعنوان\u2026", + "SAVE_AND_OVERWRITE" : "ذخیره/دوباره نویسی فایل", + "DELETE" : "حذف", "BUTTON_YES" : "بله", "BUTTON_NO" : "خیر", - "BUTTON_REPLACE_ALL" : "همه موارد\u2026", - "BUTTON_STOP" : "ایست", + + // Find, Replace, Find in Files + "FIND_RESULT_COUNT" : "{0} نتیجه", + "FIND_RESULT_COUNT_SINGLE" : "1 نتیجه", + "FIND_NO_RESULTS" : "بدون نتیجه", + "REPLACE_PLACEHOLDER" : "جایگزینی با\u2026", + "BUTTON_REPLACE_ALL" : "همه\u2026", "BUTTON_REPLACE" : "جایگزینی", + "BUTTON_NEXT" : "\u25B6", + "BUTTON_PREV" : "\u25C0", + "BUTTON_NEXT_HINT" : "مورد بعدی", + "BUTTON_PREV_HINT" : "مورد قبلی", + "BUTTON_CASESENSITIVE_HINT" : "مورد تطبیق یافته", + "BUTTON_REGEXP_HINT" : "عبارت منظم", "OPEN_FILE" : "باز کردن پرونده", "SAVE_FILE_AS" : "ذخیره پرونده", @@ -130,10 +146,12 @@ 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 in Files "FIND_IN_FILES_TITLE_PART1" : "\"", "FIND_IN_FILES_TITLE_PART2" : "\" پیدا شد", "FIND_IN_FILES_TITLE_PART3" : "— {0} {1} in {2} {3}", @@ -146,12 +164,11 @@ define({ "FIND_IN_FILES_MORE_THAN" : "بیش تر از ", "FIND_IN_FILES_PAGING" : "{0}—{1}", "FIND_IN_FILES_FILE_PATH" : "پرونده: {0}", - "FIND_IN_FILES_LINE" : "خط: {0}", - - "ERROR_FETCHING_UPDATE_INFO_TITLE" : "خطا در دریافت اطلاعات بروز رسانی", - "ERROR_FETCHING_UPDATE_INFO_MSG" : "خطا بهنگام دریافت آخرین اطلاعات بروزرسانی از سرویس دهنده رخ داده. اطمینان حاصل کنید که به اینترنت متصلید و سپس دوباره تلاش کنید.", - - /** + "FIND_IN_FILES_EXPAND_COLLAPSE" : "جهت بازکردن/بستن منوها کلید Ctrl/Cmd را گرفته و کلیک کنید.", + "ERROR_FETCHING_UPDATE_INFO_TITLE" : "درحال بروزرسانی اطلاعات خطا", + "ERROR_FETCHING_UPDATE_INFO_MSG" : "بروز خطا در هنگام دستیابی به آخرین اطلاعات بروزرسانی از سرویس دهنده. اطمینان حاصل کنید که به اینترنت متصل بوده و دوباره تلاش نمایید.", + + /** * ProjectManager */ "PROJECT_LOADING" : "درحال بارگذاری\u2026", @@ -175,12 +192,23 @@ define({ "STATUSBAR_SELECTION_LINE_PLURAL" : " \u2014 {0} خط انتخاب شده", "STATUSBAR_INDENT_TOOLTIP_SPACES" : "کلیک کنید تا به این فضاها منتقل شوید", "STATUSBAR_INDENT_TOOLTIP_TABS" : "کلیک کنید تا به این زبانه ها منتقل شوید", - "STATUSBAR_INDENT_SIZE_TOOLTIP_SPACES" : "Click to change number of spaces used when indenting", + "STATUSBAR_INDENT_SIZE_TOOLTIP_SPACES" : "جهت تغییر تعداد فضاهای خالی استفاده شده در هنگام فاصله دهی خطوط از چپ، کلیک کنید", "STATUSBAR_INDENT_SIZE_TOOLTIP_TABS" : "کلیک کنید تا طول زبانه کاراکتر ها تغییر کند", "STATUSBAR_SPACES" : "فاصله", "STATUSBAR_TAB_SIZE" : "اندازه زبانه", "STATUSBAR_LINE_COUNT_SINGULAR" : "\u2014 {0} خط", "STATUSBAR_LINE_COUNT_PLURAL" : "\u2014 {0} خط ها", + "STATUSBAR_USER_EXTENSIONS_DISABLED" : "غیرفعال سازی افزونه ها", + + // CodeInspection: errors/warnings + "ERRORS_PANEL_TITLE_MULTIPLE" : "{0} خطا", + "SINGLE_ERROR" : "1 {0} خطا", + "MULTIPLE_ERRORS" : "{1} {0} خطا", + "NO_ERRORS" : "هیچ خطایی یافت نشد {0} - کارت درسته!", + "NO_ERRORS_MULTIPLE_PROVIDER" : "خطایی پیدا نشد - کارت درسته!", + "LINT_DISABLED" : "Linting غیرفعال شد", + "NO_LINT_AVAILABLE" : "linter برای {0} دردسترس نیست", + "NOTHING_TO_LINT" : "احتیاج به lint وجود ندارد", /** * Command Name Constants @@ -193,9 +221,14 @@ define({ "CMD_FILE_NEW_FOLDER" : "پوشه جدید", "CMD_FILE_OPEN" : "باز کردن\u2026", "CMD_ADD_TO_WORKING_SET" : "افزودن به محیط کاری", + "CMD_OPEN_DROPPED_FILES" : "بازکردن فایل های درنظر گرفته نشده", "CMD_OPEN_FOLDER" : "باز کردن پوشه\u2026", "CMD_FILE_CLOSE" : "بستن", "CMD_FILE_CLOSE_ALL" : "بستن همه", + "CMD_FILE_CLOSE_LIST" : "بستن لیست", + "CMD_FILE_CLOSE_OTHERS" : "بستن سایر موارد", + "CMD_FILE_CLOSE_ABOVE" : "بستن موارد بالایی", + "CMD_FILE_CLOSE_BELOW" : "بستن موارد پایینی", "CMD_FILE_SAVE" : "ذخیره", "CMD_FILE_SAVE_ALL" : "ذخیره همه", "CMD_FILE_SAVE_AS" : "ذخیره همه\u2026", @@ -206,8 +239,8 @@ define({ "CMD_INSTALL_EXTENSION" : "نصب افزونه ها\u2026", "CMD_EXTENSION_MANAGER" : "مدیریت افزونه ها\u2026", "CMD_FILE_REFRESH" : "تازه سازی درختی پرونده", - "CMD_QUIT" : "رها سازی", - // Used in native File menu on Windows + "CMD_QUIT" : "خروج", + // Used in native File menu on Windows "CMD_EXIT" : "خروج", // Edit menu commands @@ -220,6 +253,7 @@ define({ "CMD_SELECT_ALL" : "انتخاب همه", "CMD_SELECT_LINE" : "انتخاب خط", "CMD_FIND" : "جستجو", + "CMD_FIND_FIELD_PLACEHOLDER" : "جستجو\u2026", "CMD_FIND_IN_FILES" : "جستجو در پرونده ها", "CMD_FIND_IN_SUBTREE" : "جستجو در\u2026", "CMD_FIND_NEXT" : "بعدی", @@ -262,10 +296,12 @@ define({ "CMD_QUICK_OPEN" : "باز کردن سریع", "CMD_GOTO_LINE" : "برو به خط", "CMD_GOTO_DEFINITION" : "تعریف جستجوی سریع", + "CMD_GOTO_FIRST_PROBLEM" : "رجوء با اولین خطا/اخطار", "CMD_TOGGLE_QUICK_EDIT" : "ویرایش سریع", "CMD_TOGGLE_QUICK_DOCS" : "مستند گزاری سریع", "CMD_QUICK_EDIT_PREV_MATCH" : "تطبیق یافته قبلی", "CMD_QUICK_EDIT_NEXT_MATCH" : "تطبیق یافته بعدی", + "CMD_CSS_QUICK_EDIT_NEW_RULE" : "قاعده جدید", "CMD_NEXT_DOC" : "سند بعدی", "CMD_PREV_DOC" : "سند قبلی", "CMD_SHOW_IN_TREE" : "نمایش پرونده در میان پرونده های کاری", @@ -281,21 +317,11 @@ define({ "CMD_SHOW_EXTENSIONS_FOLDER" : "نمایش پوشه افزونه ها", "CMD_TWITTER" : "{TWITTER_NAME} در تویتر", "CMD_ABOUT" : "پیرامون براکتس", - - - // Special commands invoked by the native shell - "CMD_CLOSE_WINDOW" : "بستن پنجره", - "CMD_ABORT_QUIT" : "لغو ترک", - "CMD_BEFORE_MENUPOPUP" : "قبل از منوی Popup", + "CMD_OPEN_PREFERENCES" : "بازکردن فایل تنظیمات", // Strings for main-view.html "EXPERIMENTAL_BUILD" : "experimental build", "DEVELOPMENT_BUILD" : "development build", - "OK" : "تائید", - "DONT_SAVE" : "ذخیره نکن", - "SAVE" : "ذخیره", - "CANCEL" : "لغو", - "DELETE" : "حذف", "RELOAD_FROM_DISK" : "دوباره بارگذاری کن از دیسک", "KEEP_CHANGES_IN_EDITOR" : "تغییرات در ویرایشگر را نگه دار", "CLOSE_DONT_SAVE" : "بستن(بدون ذخیره سازی)", @@ -319,7 +345,10 @@ define({ "BASEURL_ERROR_SEARCH_DISALLOWED" : "URL اصلی نمی تواند شامل پارامترهای جستجو بمانند \"{0}\" باشد.", "BASEURL_ERROR_HASH_DISALLOWED" : "URL اصلی نمی تواند hashes مشابه \"{0}\" داشته باشد.", "BASEURL_ERROR_INVALID_CHAR" : "برخی کاراکتر های خاص شبیه '{0}' می بایست %-encoded.", - "BASEURL_ERROR_UNKOWN_ERROR" : "خطای ناشناخته در URL اصلی/پایه", + "BASEURL_ERROR_UNKNOWN_ERROR" : "خطای ناشناخته در URL اصلی/پایه", + + // CSS Quick Edit + "BUTTON_NEW_RULE" : "قائده جدید", // Extension Management strings "INSTALL" : "نصب", @@ -328,7 +357,8 @@ define({ "OVERWRITE" : "دوباره نویسی", "CANT_REMOVE_DEV" : "افزونه های موجود در پوشه \"dev\" می بایست بصورت دستی حذف گردند.", "CANT_UPDATE" : "بروز رسانی سازگار با این نسخه از براکتس نیست.", - "INSTALL_EXTENSION_TITLE" : "نصب افزونه", + "CANT_UPDATE_DEV" : "افزونه موجود در پوشه \"dev\" قادر به بروزرسانی خودکار نیست.", + "INSTALL_EXTENSION_TITLE" : "نصب افزونه", "UPDATE_EXTENSION_TITLE" : "بروز رسانی افزونه", "INSTALL_EXTENSION_LABEL" : "URL افزونه", "INSTALL_EXTENSION_HINT" : "URL افزونه های دارای پرونده zip یا مخازن Github", @@ -368,6 +398,8 @@ define({ "EXTENSION_DATE" : "تاریخ", "EXTENSION_INCOMPATIBLE_NEWER" : "این افزونه احتیاج به نسخه جدیدی از براکتس دارد.", "EXTENSION_INCOMPATIBLE_OLDER" : "نسخه فعلی این افزونه فقط با نسخه های قبلی براکتس سازگار است.", + "EXTENSION_LATEST_INCOMPATIBLE_NEWER" : "نسخه {0} از این افزونه نیازمند نسخه جدیدی از {APP_NAME} می باشد. ولی شما می توانید یک نسخه پایین تر از {1} را نصب کنید.", + "EXTENSION_LATEST_INCOMPATIBLE_OLDER" : "نسخه {0} از این افزونه تنها با نسخه های قدیمی {APP_NAME} سازگار است. با این وجود شما می توانید از نسخه های پایین تر {1} استفاده کنید.", "EXTENSION_NO_DESCRIPTION" : "بدون شرح", "EXTENSION_MORE_INFO" : "اطلاعات بیشتر...", "EXTENSION_ERROR" : "خطای افزونه", @@ -385,11 +417,12 @@ define({ "UNDO_REMOVE" : "Undo", "MARKED_FOR_UPDATE" : "انتخاب شده برای بروزرسانی", "UNDO_UPDATE" : "Undo", - "CHANGE_AND_QUIT_TITLE" : "تغییر در افزونه ها", - "CHANGE_AND_QUIT_MESSAGE" : "جهت بروزرسانی یا حذف افزونه ها می بایست براکتس را ترک و دوباره اجرا کنید. شما می بایست تغییرات ذخیره نشده را ذخیره نمایید.", - "REMOVE_AND_QUIT" : "حذف افزونه ها و ترک(خروج)", - "CHANGE_AND_QUIT" : "تغییر افزونه ها و ترک", - "UPDATE_AND_QUIT" : "بروزرسانی افزونه ها و ترک", + "CHANGE_AND_RELOAD_TITLE" : "تغییر افزونه ها و بارگذاری مجدد", + "CHANGE_AND_RELOAD_MESSAGE" : "جهت بروزرسانی یا حذف افزونه های انتخاب شده براکتس احتیاج به بارگذاری مجدد دارد. تغییرات ذخیره نشده شما ذخیره خواهد شد.", + "REMOVE_AND_RELOAD" : "حذف افزونه ها و بارگذاری مجدد", + "CHANGE_AND_RELOAD" : "تغییر افزونه ها و بارگذاری مجدد", + "UPDATE_AND_RELOAD" : "بروزرسانی افزونه ها و بارگذاری مجدد", + "PROCESSING_EXTENSIONS" : "درحال پردازش تغییرات\u2026", "EXTENSION_NOT_INSTALLED" : "ناتوان در حذف افزونه {0} زیرا این افزونه بدرستی نصب نشده.", "NO_EXTENSIONS" : "هیچ افزونه ای نصب نشده.
جهت شروع بر روی زبانه در درسترس بالا کلیک کنید.", "NO_EXTENSION_MATCHES" : "هیچ افزونه ای منطبق با جستجوی شما پیدا نشد.", @@ -397,7 +430,11 @@ define({ "EXTENSIONS_INSTALLED_TITLE" : "نصب شده", "EXTENSIONS_AVAILABLE_TITLE" : "در دسترس", "EXTENSIONS_UPDATES_TITLE" : "بروزرسانی ها", - + + "INLINE_EDITOR_NO_MATCHES" : "هیچ مورد سازگاری دردسترس نیست.", + "CSS_QUICK_EDIT_NO_MATCHES" : "هیچ قائده منطبقی برای CSSها نسبت به موردی که انتخاب کردید وجود ندارد.
از گزینه \"قائده جدید\" برای تغریف یک قائده جدید استفاده کنید.", + "CSS_QUICK_EDIT_NO_STYLESHEETS" : "هیچ شیوه نامه ای-فایل CSS- در پروژه شما وجود ندارد.
جهت تعریف قوائد CSS ابتدا یک فایل شیوه نامه ایجاد کنید.", + /** * Unit names */ @@ -408,6 +445,7 @@ define({ "DEBUG_MENU" : "خطا یابی", "CMD_SHOW_DEV_TOOLS" : "نمایش ابزار های توسعه دهندگان", "CMD_REFRESH_WINDOW" : "بارگذاری مجدد براکتس", + "CMD_RELOAD_WITHOUT_USER_EXTS" : "بارگذاری مجدد براکتس بدون بارگذاری افزونه های کاربر", "CMD_NEW_BRACKETS_WINDOW" : "یک پنجره جدید از براکتس باز کنید", "CMD_SWITCH_LANGUAGE" : "انتخاب زبان", "CMD_RUN_UNIT_TESTS" : "برسی برای اجرا", @@ -422,27 +460,37 @@ define({ "LANGUAGE_CANCEL" : "لغو", "LANGUAGE_SYSTEM_DEFAULT" : "زبان پیش فرض", - /** - * Locales - */ - "LOCALE_CS" : "Czech", - "LOCALE_DE" : "German", - "LOCALE_EN" : "English", - "LOCALE_ES" : "Spanish", - "LOCALE_FI" : "Finnish", - "LOCALE_FR" : "French", - "LOCALE_IT" : "Italian", - "LOCALE_JA" : "Japanese", - "LOCALE_NB" : "Norwegian", - "LOCALE_FA_IR" : "Persian-پارسی", - "LOCALE_PL" : "Polish", - "LOCALE_PT_BR" : "Portuguese, Brazil", - "LOCALE_PT_PT" : "Portuguese", - "LOCALE_RU" : "Russian", - "LOCALE_SV" : "Swedish", - "LOCALE_TR" : "Turkish", - "LOCALE_ZH_CN" : "Chinese, simplified", - "LOCALE_HU" : "Hungarian", + // Locales (used by Debug > Switch Language) + "LOCALE_CS" : "چک", + "LOCALE_DE" : "آلمانی", + "LOCALE_EL" : "یونانی", + "LOCALE_EN" : "انگلیسی", + "LOCALE_ES" : "اسپانیایی", + "LOCALE_FI" : "فنلاندی", + "LOCALE_FR" : "فرانسه", + "LOCALE_IT" : "ایتالیایی", + "LOCALE_JA" : "ژاپنی", + "LOCALE_NB" : "نروژی", + "LOCALE_NL" : "هلندی", + "LOCALE_FA_IR" : "پارسی", + "LOCALE_PL" : "اسکاتلندی", + "LOCALE_PT_BR" : "پرتغالی، برزیل", + "LOCALE_PT_PT" : "پرتغالی", + "LOCALE_RO" : "رومانیایی", + "LOCALE_RU" : "روسی", + "LOCALE_SK" : "اسلواکی", + "LOCALE_SR" : "صرب", + "LOCALE_SV" : "سوئد", + "LOCALE_TR" : "ترکی", + "LOCALE_ZH_CN" : "چینی، ساده شده", + "LOCALE_HU" : "مجارستانی", + "LOCALE_KO" : "کره ای", + + // extensions/default/InlineTimingFunctionEditor + "INLINE_TIMING_EDITOR_TIME" : "زمان", + "INLINE_TIMING_EDITOR_PROGRESSION" : "پیشرفت", + "BEZIER_EDITOR_INFO" : "↑↓←→ Move selected point
Shift Move by ten units
Tab Switch points", + "STEPS_EDITOR_INFO" : "↑↓ Increase or decrease steps
←→ 'Start' or 'End'", // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "رنگ فعلی", @@ -457,19 +505,16 @@ define({ "CMD_JUMPTO_DEFINITION" : "پرش جهت تعریف", "CMD_SHOW_PARAMETER_HINT" : "نمایش پارامتر", "NO_ARGUMENTS" : "<بدون پارامتر>", - + // extensions/default/JSLint - "CMD_JSLINT" : "فعال سازی JSLint", - "CMD_JSLINT_FIRST_ERROR" : "رجوء به اولی خطای JSLint", - "JSLINT_ERRORS" : "خطاهای JSLint", - "JSLINT_ERROR_INFORMATION" : "یک خطای JSLint", - "JSLINT_ERRORS_INFORMATION" : "{0} خطای JSLint", - "JSLINT_NO_ERRORS" : "JSLint بدون خطای - ایول!", - "JSLINT_DISABLED" : "JSLint یا نافعال است و یا برای پرونده فعلی کار نمی کند", + "JSLINT_NAME" : "JSLint", // extensions/default/QuickView - "CMD_ENABLE_QUICK_VIEW" : "نمایش سریع با اشاره", + "CMD_ENABLE_QUICK_VIEW" : "مشاهده سریع بهنگام اشاره با ماوس", + + // extensions/default/RecentProjects + "CMD_TOGGLE_RECENT_PROJECTS" : "پروژه های اخیر", // extensions/default/WebPlatformDocs - "DOCS_MORE_LINK" : "بیشتر بخوانید" -}); \ No newline at end of file + "DOCS_MORE_LINK" : "بیشتر" +}); From ceea7156c96134bdb1d7b6bf3fe6a4593e2ee5f3 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 19 Feb 2014 08:44:53 -0500 Subject: [PATCH 30/55] Adjust test wait condition to make it resilient to different timing. --- test/spec/PreferencesManager-test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js index bad9df8a505..16c439557cb 100644 --- a/test/spec/PreferencesManager-test.js +++ b/test/spec/PreferencesManager-test.js @@ -135,7 +135,8 @@ define(function (require, exports, module) { function projectPrefsAreSet() { // The test project file, the Brackets repo file, // user and defaults should be the scopes - return Object.keys(PreferencesManager._manager._scopes).length > 3; + return Object.keys(PreferencesManager._manager._scopes).length > 3 && + PreferencesManager._manager._scopes.project.storage.path === testPath + "/.brackets.json"; } waitsFor(projectPrefsAreSet, "prefs appear to be loaded"); runs(function () { From fed043e810ba563220a19374dd922088a9732d91 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Tue, 4 Feb 2014 21:30:01 +0100 Subject: [PATCH 31/55] Rebased: Handle invalid timing function params --- .../BezierCurveEditor.js | 17 ++ .../BezierCurveEditorTemplate.html | 1 + .../InlineTimingFunctionEditor.js | 11 +- .../InlineTimingFunctionEditor/StepEditor.js | 17 ++ .../StepEditorTemplate.html | 1 + .../TimingFunctionUtils.js | 215 ++++++++++++++++-- .../InlineTimingFunctionEditor/main.css | 13 ++ .../InlineTimingFunctionEditor/main.js | 11 +- .../unittest-files/unittests.css | 10 + .../InlineTimingFunctionEditor/unittests.js | 176 +++++++++----- src/nls/de/strings.js | 1 + src/nls/root/strings.js | 1 + 12 files changed, 394 insertions(+), 80 deletions(-) diff --git a/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js b/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js index 2fca5361847..12740eb8b53 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js +++ b/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js @@ -530,6 +530,15 @@ define(function (require, exports, module) { // current cubic-bezier() function params this._cubicBezierCoords = this._getCubicBezierCoords(bezierCurve); + this.hint = $(".hint", this.$element); + // If function was auto-corrected, then originalString holds the original function, + // and an informational message needs to be shown + if (bezierCurve.originalString) { + TimingFunctionUtils.showHideHint(this, true, bezierCurve.originalString, "cubic-bezier(" + this._cubicBezierCoords.join(", ") + ")"); + } else { + TimingFunctionUtils.showHideHint(this, false); + } + this.P1 = this.$element.find(".P1")[0]; this.P2 = this.$element.find(".P2")[0]; this.curve = this.$element.find(".curve")[0]; @@ -602,6 +611,7 @@ define(function (require, exports, module) { this._cubicBezierCoords[2] + ", " + this._cubicBezierCoords[3] + ")"; this._callback(bezierCurveVal); + TimingFunctionUtils.showHideHint(this, false); }; /** @@ -684,6 +694,13 @@ define(function (require, exports, module) { BezierCurveEditor.prototype.handleExternalUpdate = function (bezierCurve) { this._cubicBezierCoords = this._getCubicBezierCoords(bezierCurve); this._updateCanvas(); + // If function was auto-corrected, then originalString holds the original function, + // and an informational message needs to be shown + if (bezierCurve.originalString) { + TimingFunctionUtils.showHideHint(this, true, bezierCurve.originalString, "cubic-bezier(" + this._cubicBezierCoords.join(", ") + ")"); + } else { + TimingFunctionUtils.showHideHint(this, false); + } }; diff --git a/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditorTemplate.html b/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditorTemplate.html index ecf2b3e7fcb..e8a0aae1944 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditorTemplate.html +++ b/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditorTemplate.html @@ -9,6 +9,7 @@

{{{BEZIER_EDITOR_INFO}}}

+
diff --git a/src/extensions/default/InlineTimingFunctionEditor/InlineTimingFunctionEditor.js b/src/extensions/default/InlineTimingFunctionEditor/InlineTimingFunctionEditor.js index 584b6efe72b..590ec6e8b5e 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/InlineTimingFunctionEditor.js +++ b/src/extensions/default/InlineTimingFunctionEditor/InlineTimingFunctionEditor.js @@ -121,17 +121,19 @@ define(function (require, exports, module) { // instead of two bookmarks to track the range. (In our current old version of // CodeMirror v2, markText() isn't robust enough for this case.) var line = this.hostEditor.document.getLine(start.line), - matches = TimingFunctionUtils.timingFunctionMatch(line.substr(start.ch), true); + matches = TimingFunctionUtils.timingFunctionMatch(line.substr(start.ch), true), + originalLength; // No longer have a match if (!matches) { return null; } + originalLength = ((matches.originalString && matches.originalString.length) || matches[0].length); // Note that end.ch is exclusive, so we don't need to add 1 before comparing to // the matched length here. - if (end.ch === undefined || (end.ch - start.ch) !== matches[0].length) { - end.ch = start.ch + matches[0].length; + if (end.ch === undefined || (end.ch - start.ch) !== originalLength) { + end.ch = start.ch + originalLength; this._endBookmark.clear(); this._endBookmark = this.hostEditor._codeMirror.setBookmark(end); } @@ -143,7 +145,8 @@ define(function (require, exports, module) { return { start: start, end: end, - match: matches + match: matches, + originalLength: originalLength }; } }; diff --git a/src/extensions/default/InlineTimingFunctionEditor/StepEditor.js b/src/extensions/default/InlineTimingFunctionEditor/StepEditor.js index 94e52d2a31b..63cf02a2576 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/StepEditor.js +++ b/src/extensions/default/InlineTimingFunctionEditor/StepEditor.js @@ -310,6 +310,15 @@ define(function (require, exports, module) { // current step function params this._stepParams = this._getStepParams(stepMatch); + this.hint = $(".hint", this.$element); + // If function was auto-corrected, then originalString holds the original function, + // and an informational message needs to be shown + if (stepMatch.originalString) { + TimingFunctionUtils.showHideHint(this, true, stepMatch.originalString, "steps(" + this._stepParams.count.toString() + ", " + this._stepParams.timing + ")"); + } else { + TimingFunctionUtils.showHideHint(this, false); + } + this.canvas = this.$element.find(".steps")[0]; this.canvas.stepEditor = this; @@ -355,6 +364,7 @@ define(function (require, exports, module) { this._stepParams.count.toString() + ", " + this._stepParams.timing + ")"; this._callback(stepFuncVal); + TimingFunctionUtils.showHideHint(this, false); }; /** @@ -423,6 +433,13 @@ define(function (require, exports, module) { StepEditor.prototype.handleExternalUpdate = function (stepMatch) { this._stepParams = this._getStepParams(stepMatch); this._updateCanvas(); + // If function was auto-corrected, then originalString holds the original function, + // and an informational message needs to be shown + if (stepMatch.originalString) { + TimingFunctionUtils.showHideHint(this, true, stepMatch.originalString, "steps(" + this._stepParams.count.toString() + ", " + this._stepParams.timing + ")"); + } else { + TimingFunctionUtils.showHideHint(this, false); + } }; diff --git a/src/extensions/default/InlineTimingFunctionEditor/StepEditorTemplate.html b/src/extensions/default/InlineTimingFunctionEditor/StepEditorTemplate.html index 46ffced371b..57daef195c5 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/StepEditorTemplate.html +++ b/src/extensions/default/InlineTimingFunctionEditor/StepEditorTemplate.html @@ -5,6 +5,7 @@

{{{STEPS_EDITOR_INFO}}}

+
diff --git a/src/extensions/default/InlineTimingFunctionEditor/TimingFunctionUtils.js b/src/extensions/default/InlineTimingFunctionEditor/TimingFunctionUtils.js index aba71cfbbbe..19831570fd6 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/TimingFunctionUtils.js +++ b/src/extensions/default/InlineTimingFunctionEditor/TimingFunctionUtils.js @@ -22,7 +22,7 @@ */ /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */ -/*global define */ +/*global define, brackets */ /** * Utilities functions related to color matching @@ -30,18 +30,24 @@ define(function (require, exports, module) { "use strict"; + var Strings = brackets.getModule("strings"), + StringUtils = brackets.getModule("utils/StringUtils"), + AnimationUtils = brackets.getModule("utils/AnimationUtils"); + /** * Regular expressions for matching timing functions * @const @type {RegExp} */ - var BEZIER_CURVE_REGEX = /cubic-bezier\(\s*(\S+)\s*,\s*(\S+)\s*,\s*(\S+)\s*,\s*(\S+)\s*\)/, - EASE_STRICT_REGEX = /[: ,]ease(?:-in)?(?:-out)?[ ,;]/, - EASE_LAX_REGEX = /ease(?:-in)?(?:-out)?/, - LINEAR_STRICT_REGEX = /transition.*?[: ,]linear[ ,;]/, - LINEAR_LAX_REGEX = /linear/, - STEPS_REGEX = /steps\(\s*(\d+)\s*(?:,\s*(start|end)\s*)?\)/, - STEP_STRICT_REGEX = /[: ,](?:step-start|step-end)[ ,;]/, - STEP_LAX_REGEX = /step-start|step-end/; + var BEZIER_CURVE_VALID_REGEX = /cubic-bezier\(\s*(\S+)\s*,\s*(\S+)\s*,\s*(\S+)\s*,\s*(\S+)\s*\)/, + BEZIER_CURVE_GENERAL_REGEX = /cubic-bezier\((.*)\)/, + EASE_STRICT_REGEX = /[: ,]ease(?:-in)?(?:-out)?[ ,;]/, + EASE_LAX_REGEX = /ease(?:-in)?(?:-out)?/, + LINEAR_STRICT_REGEX = /transition.*?[: ,]linear[ ,;]/, + LINEAR_LAX_REGEX = /linear/, + STEPS_VALID_REGEX = /steps\(\s*(\d+)\s*(?:,\s*(\w+)\s*)?\)/, + STEPS_GENERAL_REGEX = /steps\((.*)\)/, + STEP_STRICT_REGEX = /[: ,](?:step-start|step-end)[ ,;]/, + STEP_LAX_REGEX = /step-start|step-end/; /** * Type constants @@ -71,6 +77,65 @@ define(function (require, exports, module) { }; } + /** + * Get valid params for an invalid cubic-bezier. + * + * @param {RegExp.match} match (Invalid) matches from cubicBezierMatch() + * @return {?RegExp.match} Valid match or null if the output is not valid + */ + function _getValidBezierParams(match) { + var param, + // take ease-in-out as default value in case there are no params yet (or they are invalid) + def = [ ".42", "0", ".58", "1" ], + oldIndex = match.index, // we need to store the old match.index to re-set the index afterwards + originalString = match[0], + i; + + if (match) { + match = match[1].split(","); + } + + if (match) { + for (i = 0; i <= 3; i++) { + if (match[i]) { + match[i] = match[i].trim(); + param = _convertToNumber(match[i]); + + // Verify the param is a number + // If not, replace it with the default value + if (!param.isNumber) { + match[i] = undefined; + + // Verify x coordinates are in 0-1 range + // If not, set them to the closest value in range + } else if (i === 0 || i === 2) { + if (param.value < 0) { + match[i] = "0"; + } else if (param.value > 1) { + match[i] = "1"; + } + } + } + + if (!match[i]) { + match[i] = def[i]; + } + } + } else { + match = def; + } + match = match.splice(0, 4); // make sure there are only 4 params + match = "cubic-bezier(" + match.join(", ") + ")"; + match = match.match(BEZIER_CURVE_VALID_REGEX); + + if (match) { + match.index = oldIndex; // re-set the index here to get the right context + match.originalString = originalString; + return match; + } + return null; + } + /** * Validate cubic-bezier function parameters that are not already validated by regex: * @@ -97,6 +162,68 @@ define(function (require, exports, module) { return true; } + /** + * Get valid params for an invalid steps function. + * + * @param {RegExp.match} match (Invalid) matches from stepsMatch() + * @return {?RegExp.match} Valid match or null if the output is not valid + */ + function _getValidStepsParams(match) { + var param, + def = [ "5", "end" ], + params = def, + oldIndex = match.index, // we need to store the old match.index to re-set the index afterwards + originalString = match[0], + i; + + if (match) { + match = match[1].split(","); + } + + if (match) { + if (match[0]) { + param = match[0].replace(/[\s\"']/g, ""); // replace possible trailing whitespace or leading quotes + param = _convertToNumber(param); + + // Verify number_of_params is a number + // If not, replace it with the default value + if (!param.isNumber) { + param.value = def[0]; + + // Round number_of_params to an integer + } else if (param.value) { + param.value = Math.floor(param.value); + } + + // Verify number_of_steps is >= 1 + // If not, set them to the default value + if (param.value < 1) { + param.value = def[0]; + } + params[0] = param.value; + } + if (match[1]) { + // little autocorrect feature: leading s gets 'start', everything else gets 'end' + param = match[1].replace(/[\s\"']/g, ""); // replace possible trailing whitespace or leading quotes + param = param.substr(0, 1); + if (param === "s") { + params[1] = "start"; + } else { + params[1] = "end"; + } + } + } + params = "steps(" + params.join(", ") + ")"; + params = params.match(STEPS_VALID_REGEX); + + if (params) { + params.index = oldIndex; // re-set the index here to get the right context + params.originalString = originalString; + return params; + } + return null; + } + /** * Validate steps function parameters that are not already validated by regex: * @@ -107,12 +234,44 @@ define(function (require, exports, module) { function _validateStepsParams(match) { var count = _convertToNumber(match[1]); - if (!count.isNumber || count.value <= 0) { + if (!count.isNumber || count.value < 1 || Math.floor(count.value) !== count.value) { + return false; + } + + if (match[2] && match[2] !== "start" && match[2] !== "end") { return false; } return true; } + + /** + * Show, hide or update the hint text + * + * @param {(BezierCurveEditor|StepEditor)} editor BezierCurveEditor or StepsEditor where the hint should be changed + * @param {boolean} show Whether the hint should be shown or hidden + * @param {string=} documentCode The invalid code from the document (can be omitted when hiding) + * @param {string=} editorCode The valid code that is shown in the Inline Editor (can be omitted when hiding) + */ + function showHideHint(editor, show, documentCode, editorCode) { + if (!editor.hint) { + return; + } + + if (show) { + editor.hintShown = true; + editor.hint.html(StringUtils.format(Strings.INLINE_TIMING_EDITOR_INVALID, documentCode, editorCode)); + editor.hint.css("display", "block"); + } else if (editor.hintShown) { + AnimationUtils.animateUsingClass(editor.hint[0], "fadeout") + .done(function () { + editor.hint.css("display", "none"); + editor.hintShown = false; + }); + } else { + editor.hint.css("display", "none"); + } + } /** * Tag this match with type and return it for chaining @@ -150,11 +309,22 @@ define(function (require, exports, module) { * @return {!RegExpMatch} */ function bezierCurveMatch(str, lax) { + var match; + + // First look for any cubic-bezier(). + match = str.match(BEZIER_CURVE_VALID_REGEX); + if (match && _validateCubicBezierParams(match)) { // cubic-bezier() with valid params + return _tagMatch(match, BEZIER); + } - // First look for cubic-bezier(x1,y1,x2,y2). - var match = str.match(BEZIER_CURVE_REGEX); + match = str.match(BEZIER_CURVE_GENERAL_REGEX); if (match) { - return _validateCubicBezierParams(match) ? _tagMatch(match, BEZIER) : null; + match = _getValidBezierParams(match); + if (match && _validateCubicBezierParams(match)) { + return _tagMatch(match, BEZIER); + } else { // this should not happen! + window.console.log("brackets-cubic-bezier: TimingFunctionUtils._getValidBezierParams created invalid code"); + } } // Next look for the ease functions (which are special cases of cubic-bezier()) @@ -208,10 +378,22 @@ define(function (require, exports, module) { * @return {!RegExpMatch} */ function stepsMatch(str, lax) { - // First look for steps(i,pos). - var match = str.match(STEPS_REGEX); + var match; + + // First look for any steps(). + match = str.match(STEPS_VALID_REGEX); + if (match && _validateStepsParams(match)) { // cubic-bezier() with valid params + return _tagMatch(match, STEP); + } + + match = str.match(STEPS_GENERAL_REGEX); if (match) { - return _validateStepsParams(match) ? _tagMatch(match, STEP) : null; + match = _getValidStepsParams(match); + if (match && _validateStepsParams(match)) { + return _tagMatch(match, STEP); + } else { // this should not happen! + window.console.log("brackets-steps: TimingFunctionUtils._getValidStepsParams created invalid code"); + } } // Next look for the step functions (which are special cases of steps()) @@ -255,4 +437,5 @@ define(function (require, exports, module) { exports.timingFunctionMatch = timingFunctionMatch; exports.bezierCurveMatch = bezierCurveMatch; exports.stepsMatch = stepsMatch; + exports.showHideHint = showHideHint; }); diff --git a/src/extensions/default/InlineTimingFunctionEditor/main.css b/src/extensions/default/InlineTimingFunctionEditor/main.css index 1e4e7952cfc..1ede4426e04 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/main.css +++ b/src/extensions/default/InlineTimingFunctionEditor/main.css @@ -286,3 +286,16 @@ padding: 4px 4px; } +.bezier-curve-editor .info .hint, +.step-editor .info .hint { + margin-top: 25px; + font-size: 13px; + display: none; + opacity: 1; +} + +.bezier-curve-editor .info .hint.fadeout, +.step-editor .info .hint.fadeout { + transition: opacity 0.6s ease-in 0.1s; + opacity: 0; +} diff --git a/src/extensions/default/InlineTimingFunctionEditor/main.js b/src/extensions/default/InlineTimingFunctionEditor/main.js index ab319e118aa..f57ba4a0919 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/main.js +++ b/src/extensions/default/InlineTimingFunctionEditor/main.js @@ -90,13 +90,14 @@ define(function (require, exports, module) { } // check for subsequent matches, and use first match after pos - var lineOffset = 0; - while (pos.ch > (currentMatch.index + currentMatch[0].length + lineOffset)) { - var restOfLine = cursorLine.substring(currentMatch.index + currentMatch[0].length + lineOffset), + var lineOffset = 0, + matchLength = ((currentMatch.originalString && currentMatch.originalString.length) || currentMatch[0].length); + while (pos.ch > (currentMatch.index + matchLength + lineOffset)) { + var restOfLine = cursorLine.substring(currentMatch.index + matchLength + lineOffset), newMatch = TimingFunctionUtils.timingFunctionMatch(restOfLine, false); if (newMatch) { - lineOffset += (currentMatch.index + currentMatch[0].length); + lineOffset += (currentMatch.index + matchLength); currentMatch = $.extend(true, [], newMatch); } else { break; @@ -106,7 +107,7 @@ define(function (require, exports, module) { currentMatch.lineOffset = lineOffset; startPos = {line: pos.line, ch: lineOffset + currentMatch.index}; - endPos = {line: pos.line, ch: lineOffset + currentMatch.index + currentMatch[0].length}; + endPos = {line: pos.line, ch: lineOffset + currentMatch.index + matchLength}; startBookmark = cm.setBookmark(startPos); endBookmark = cm.setBookmark(endPos); diff --git a/src/extensions/default/InlineTimingFunctionEditor/unittest-files/unittests.css b/src/extensions/default/InlineTimingFunctionEditor/unittest-files/unittests.css index 9be902e2ad6..053ec47e5c2 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/unittest-files/unittests.css +++ b/src/extensions/default/InlineTimingFunctionEditor/unittest-files/unittests.css @@ -21,3 +21,13 @@ transition-timing-function: step-start; transition-timing-function: step-end; } + +.qux { + transition-timing-function: cubic-bezier(-0.001, Infinity, 1.001, NaN); + transition-timing-function: cubic-bezier(); +} + +.quux { + transition-timing-function: steps(-5, s, 2, 3); + transition-timing-function: steps(); +} diff --git a/src/extensions/default/InlineTimingFunctionEditor/unittests.js b/src/extensions/default/InlineTimingFunctionEditor/unittests.js index bce756cf859..cc85c37a23b 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/unittests.js +++ b/src/extensions/default/InlineTimingFunctionEditor/unittests.js @@ -76,40 +76,62 @@ define(function (require, exports, module) { describe("TimingFunctionUtils for bezier curve functions", function () { var match; + /** + * Expects an invalid steps() function to be corrected the right way, with the right match + * and originalString given a string to match and an expectation of the output match. + * @param {string} str The string to match + * @param {Array} expectedArray The array that should equal the output match. + */ + function testInvalidBezier(str, expectedArray) { + var match = TimingFunctionUtils.timingFunctionMatch(str, false); + runs(function () { + expectArraysToBeEqual(match, expectedArray); + expect(match.originalString).toEqual(str); + }); + } + // Valid cubic-bezier function cases it("should match bezier curve function in strict mode", function () { match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(.1, .2, .3, .4)", false); expect(match).toBeTruthy(); expectArraysToBeEqual(match, ["cubic-bezier(.1, .2, .3, .4)", ".1", ".2", ".3", ".4"]); + expect(match.originalString).toBeFalsy(); }); it("should match bezier curve function in lax mode", function () { match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(.1, .2, .3, .4)", true); expect(match).toBeTruthy(); expectArraysToBeEqual(match, ["cubic-bezier(.1, .2, .3, .4)", ".1", ".2", ".3", ".4"]); + expect(match.originalString).toBeFalsy(); }); it("should match bezier curve function with negative value", function () { match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(0, -.2, 1, 1.2)", false); expectArraysToBeEqual(match, ["cubic-bezier(0, -.2, 1, 1.2)", "0", "-.2", "1", "1.2"]); + expect(match.originalString).toBeFalsy(); }); it("should match bezier curve function in full line of longhand css", function () { match = TimingFunctionUtils.timingFunctionMatch(" transition-timing-function: cubic-bezier(.37, .28, .83, .94);", false); expectArraysToBeEqual(match, ["cubic-bezier(.37, .28, .83, .94)", ".37", ".28", ".83", ".94"]); + expect(match.originalString).toBeFalsy(); }); it("should match bezier curve function in full line of shorthand css", function () { match = TimingFunctionUtils.timingFunctionMatch(" transition: top 100ms cubic-bezier(.37, .28, .83, .94) 0;", false); expectArraysToBeEqual(match, ["cubic-bezier(.37, .28, .83, .94)", ".37", ".28", ".83", ".94"]); + expect(match.originalString).toBeFalsy(); }); it("should match bezier curve function with leading zeros", function () { match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(0.1, 0.2, 0.3, 0.4)", false); expectArraysToBeEqual(match, ["cubic-bezier(0.1, 0.2, 0.3, 0.4)", "0.1", "0.2", "0.3", "0.4"]); + expect(match.originalString).toBeFalsy(); }); it("should match bezier curve function with no optional whitespace", function () { match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(.1,.2,.3,.4)", false); expectArraysToBeEqual(match, ["cubic-bezier(.1,.2,.3,.4)", ".1", ".2", ".3", ".4"]); + expect(match.originalString).toBeFalsy(); }); it("should match bezier curve function with extra optional whitespace", function () { match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier( .1 , .2 , .3 , .4 )", false); expectArraysToBeEqual(match, ["cubic-bezier( .1 , .2 , .3 , .4 )", ".1", ".2", ".3", ".4"]); + expect(match.originalString).toBeFalsy(); }); // Valid other functions @@ -117,78 +139,84 @@ define(function (require, exports, module) { match = TimingFunctionUtils.timingFunctionMatch("transition-timing-function: linear;", false); expect(match.length).toEqual(1); expect(match[0]).toEqual("linear"); + expect(match.originalString).toBeFalsy(); }); it("should match linear function value in lax mode", function () { match = TimingFunctionUtils.timingFunctionMatch("linear", true); expect(match.length).toEqual(1); expect(match[0]).toEqual("linear"); + expect(match.originalString).toBeFalsy(); }); it("should match ease function in declaration in strict mode", function () { match = TimingFunctionUtils.timingFunctionMatch("transition-timing-function: ease;", false); expect(match.length).toEqual(1); expect(match[0]).toEqual("ease"); + expect(match.originalString).toBeFalsy(); }); it("should match ease function value in lax mode", function () { match = TimingFunctionUtils.timingFunctionMatch("ease", true); expect(match.length).toEqual(1); expect(match[0]).toEqual("ease"); + expect(match.originalString).toBeFalsy(); }); it("should match ease-in function in declaration in strict mode", function () { match = TimingFunctionUtils.timingFunctionMatch("transition-timing-function: ease-in;", false); expect(match.length).toEqual(1); expect(match[0]).toEqual("ease-in"); + expect(match.originalString).toBeFalsy(); }); it("should match ease-in function value in lax mode", function () { match = TimingFunctionUtils.timingFunctionMatch("ease-in", true); expect(match.length).toEqual(1); expect(match[0]).toEqual("ease-in"); + expect(match.originalString).toBeFalsy(); }); it("should match ease-out function in declaration in strict mode", function () { match = TimingFunctionUtils.timingFunctionMatch("transition-timing-function: ease-out;", false); expect(match.length).toEqual(1); expect(match[0]).toEqual("ease-out"); + expect(match.originalString).toBeFalsy(); }); it("should match ease-out function value in lax mode", function () { match = TimingFunctionUtils.timingFunctionMatch("ease-out", true); expect(match.length).toEqual(1); expect(match[0]).toEqual("ease-out"); + expect(match.originalString).toBeFalsy(); }); it("should match ease-in-out function in declaration in strict mode", function () { match = TimingFunctionUtils.timingFunctionMatch("transition-timing-function: ease-in-out;", false); expect(match.length).toEqual(1); expect(match[0]).toEqual("ease-in-out"); + expect(match.originalString).toBeFalsy(); }); it("should match ease-in-out function value in lax mode", function () { match = TimingFunctionUtils.timingFunctionMatch("ease-in-out", true); expect(match.length).toEqual(1); expect(match[0]).toEqual("ease-in-out"); + expect(match.originalString).toBeFalsy(); }); - // Invalid cases - it("should not match cubic-bezier function with out-of-range X parameters", function () { - match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(-.2, 0, 1.2, 1)", false); - expect(match).toBeFalsy(); + // Invalid cubic-beziers - they should be corrected automatically + it("should correct cubic-bezier function with out-of-range X parameters", function () { + testInvalidBezier("cubic-bezier(-.2, 0, 1.2, 1)", ["cubic-bezier(0, 0, 1, 1)", "0", "0", "1", "1"]); }); - it("should not match cubic-bezier function with Infinity parameters", function () { - match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(0, Infinity, 1, -Infinity)", false); - expect(match).toBeFalsy(); + it("should correct cubic-bezier function with Infinity parameters", function () { + testInvalidBezier("cubic-bezier(0, Infinity, 1, -Infinity)", ["cubic-bezier(0, 0, 1, 1)", "0", "0", "1", "1"]); }); - it("should not match cubic-bezier function with non-numeric parameters", function () { - match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(x1, y1, x2, y2)", false); - expect(match).toBeFalsy(); + it("should correct cubic-bezier function with non-numeric parameters", function () { + testInvalidBezier("cubic-bezier(x1, y1, x2, y2)", ["cubic-bezier(.42, 0, .58, 1)", ".42", "0", ".58", "1"]); }); - it("should not match cubic-bezier function with no parameters", function () { - match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier()", false); - expect(match).toBeFalsy(); + it("should correct cubic-bezier function with no parameters", function () { + testInvalidBezier("cubic-bezier()", ["cubic-bezier(.42, 0, .58, 1)", ".42", "0", ".58", "1"]); }); - it("should not match cubic-bezier function with 3 parameters", function () { - match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(0, 0, 1)", false); - expect(match).toBeFalsy(); + it("should correct cubic-bezier function with 3 parameters", function () { + testInvalidBezier("cubic-bezier(0, 0, 1)", ["cubic-bezier(0, 0, 1, 1)", "0", "0", "1", "1"]); }); - it("should not match cubic-bezier function with 5 parameters", function () { - match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier(0, 0, 1, 1, 1)", false); - expect(match).toBeFalsy(); + it("should correct cubic-bezier function with 5 parameters", function () { + testInvalidBezier("cubic-bezier(0, 0, 1, 1, 1)", ["cubic-bezier(0, 0, 1, 1)", "0", "0", "1", "1"]); }); + + // Real invalid cubic-beziers - they should NOT be corrected automatically it("should not match cubic-bezier function with invalid whitespace", function () { match = TimingFunctionUtils.timingFunctionMatch("cubic-bezier (0, 0, 1, 1)", false); expect(match).toBeFalsy(); @@ -210,52 +238,77 @@ define(function (require, exports, module) { describe("TimingFunctionUtils for step functions", function () { var match; + /** + * Expects an invalid steps() function to be corrected the right way, with the right match + * and originalString given a string to match and an expectation of the output match. + * @param {string} str The string to match + * @param {Array} expectedArray The array that should equal the output match. + */ + function testInvalidStep(str, expectedArray) { + var match = TimingFunctionUtils.timingFunctionMatch(str, false); + runs(function () { + expectArraysToBeEqual(match, expectedArray); + expect(match.originalString).toEqual(str); + }); + } + // Valid steps function cases it("should match steps function in strict mode", function () { match = TimingFunctionUtils.timingFunctionMatch("steps(3, start)", false); expect(match).toBeTruthy(); expectArraysToBeEqual(match, ["steps(3, start)", "3", "start"]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function in lax mode", function () { match = TimingFunctionUtils.timingFunctionMatch("steps(3, start)", true); expect(match).toBeTruthy(); expectArraysToBeEqual(match, ["steps(3, start)", "3", "start"]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function with second parameter of end", function () { match = TimingFunctionUtils.timingFunctionMatch("steps(12, end)", false); expectArraysToBeEqual(match, ["steps(12, end)", "12", "end"]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function with only 1 parameter", function () { match = TimingFunctionUtils.timingFunctionMatch("steps(8)", false); expectArraysToBeEqual(match, ["steps(8)", "8", undefined]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function in full line of longhand css", function () { match = TimingFunctionUtils.timingFunctionMatch(" transition-timing-function: steps(5, start);", false); expectArraysToBeEqual(match, ["steps(5, start)", "5", "start"]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function in full line of shorthand css", function () { match = TimingFunctionUtils.timingFunctionMatch(" transition: top 100ms steps(10) 0;", false); expectArraysToBeEqual(match, ["steps(10)", "10", undefined]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function with leading zeros", function () { match = TimingFunctionUtils.timingFunctionMatch("steps(04, end)", false); expectArraysToBeEqual(match, ["steps(04, end)", "04", "end"]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function with no optional whitespace with 1 param", function () { match = TimingFunctionUtils.timingFunctionMatch("steps(3)", false); expectArraysToBeEqual(match, ["steps(3)", "3", undefined]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function with no optional whitespace with 2 params", function () { match = TimingFunctionUtils.timingFunctionMatch("steps(3,end)", false); expectArraysToBeEqual(match, ["steps(3,end)", "3", "end"]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function with extra optional whitespace with 1 param", function () { match = TimingFunctionUtils.timingFunctionMatch("steps( 7 )", false); expectArraysToBeEqual(match, ["steps( 7 )", "7", undefined]); + expect(match.originalString).toBeFalsy(); }); it("should match steps function with extra optional whitespace with 2 params", function () { match = TimingFunctionUtils.timingFunctionMatch("steps( 8 , start )", false); expectArraysToBeEqual(match, ["steps( 8 , start )", "8", "start"]); + expect(match.originalString).toBeFalsy(); }); // Valid other functions @@ -263,70 +316,71 @@ define(function (require, exports, module) { match = TimingFunctionUtils.timingFunctionMatch("transition-timing-function: step-start;", false); expect(match.length).toEqual(1); expect(match[0]).toEqual("step-start"); + expect(match.originalString).toBeFalsy(); }); it("should match step-start function value in lax mode", function () { match = TimingFunctionUtils.timingFunctionMatch("step-start", true); expect(match.length).toEqual(1); expect(match[0]).toEqual("step-start"); + expect(match.originalString).toBeFalsy(); }); it("should match step-end function in declaration in strict mode", function () { match = TimingFunctionUtils.timingFunctionMatch("transition-timing-function: step-end;", false); expect(match.length).toEqual(1); expect(match[0]).toEqual("step-end"); + expect(match.originalString).toBeFalsy(); }); it("should match step-end function value in lax mode", function () { match = TimingFunctionUtils.timingFunctionMatch("step-end", true); expect(match.length).toEqual(1); expect(match[0]).toEqual("step-end"); + expect(match.originalString).toBeFalsy(); }); - // Invalid cases - it("should not match steps function with zero steps", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps(0)", false); - expect(match).toBeFalsy(); + // Invalid steps - they should be corrected automatically + it("should correct steps function with zero steps", function () { + testInvalidStep("steps(0)", ["steps(5, end)", "5", "end"]); }); - it("should not match steps function with a non-integer number of steps", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps(3.0)", false); - expect(match).toBeFalsy(); + it("should correct steps function with a non-integer number of steps", function () { + testInvalidStep("steps(3.0)", ["steps(3, end)", "3", "end"]); }); - it("should not match steps function with a negative number of steps", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps(-2)", false); - expect(match).toBeFalsy(); + it("should correct steps function with a negative number of steps", function () { + testInvalidStep("steps(-2)", ["steps(5, end)", "5", "end"]); }); - it("should not match steps function with an infinite number of steps", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps(Infinity,)", false); - expect(match).toBeFalsy(); + it("should correct steps function with an infinite number of steps", function () { + testInvalidStep("steps(Infinity,)", ["steps(5, end)", "5", "end"]); }); - it("should not match steps function with NaN number of steps", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps(NaN,)", false); - expect(match).toBeFalsy(); + it("should correct steps function with NaN number of steps", function () { + testInvalidStep("steps(NaN,)", ["steps(5, end)", "5", "end"]); }); - it("should not match steps function with non-numeric number of steps", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps(x)", false); - expect(match).toBeFalsy(); + it("should correct steps function with non-numeric number of steps", function () { + testInvalidStep("steps(x)", ["steps(5, end)", "5", "end"]); }); - it("should not match steps function with a string-value number of steps", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps('3')", false); - expect(match).toBeFalsy(); + it("should correct steps function with a string-value number of steps", function () { + testInvalidStep("steps('3')", ["steps(3, end)", "3", "end"]); }); - it("should not match steps function with no parens", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps", false); - expect(match).toBeFalsy(); + it("should correct steps function with no parameters", function () { + testInvalidStep("steps()", ["steps(5, end)", "5", "end"]); }); - it("should not match steps function with no parameters", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps()", false); - expect(match).toBeFalsy(); + it("should correct steps function with empty second parameter", function () { + testInvalidStep("steps(1,)", ["steps(1, end)", "1", "end"]); }); - it("should not match steps function with empty second parameter", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps(1,)", false); - expect(match).toBeFalsy(); + it("should correct steps function with undefined second parameter", function () { + testInvalidStep("steps(1, middle)", ["steps(1, end)", "1", "end"]); }); - it("should not match steps function with undefined second parameter", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps(1, middle)", false); - expect(match).toBeFalsy(); + it("should correct steps function with typo in second parameter", function () { + testInvalidStep("steps(1, satrt)", ["steps(1, start)", "1", "start"]); + }); + it("should correct steps function with a string as second parameter", function () { + testInvalidStep("steps(1, 'start')", ["steps(1, start)", "1", "start"]); + }); + it("should correct steps function with 3 parameters", function () { + testInvalidStep("steps(1, start, end)", ["steps(1, start)", "1", "start"]); }); - it("should not match steps function with 3 parameters", function () { - match = TimingFunctionUtils.timingFunctionMatch("steps(1, start, end)", false); + + // Real invalid cubic-beziers - they should NOT be corrected automatically + it("should not match steps function with no parens", function () { + match = TimingFunctionUtils.timingFunctionMatch("steps", false); expect(match).toBeFalsy(); }); it("should not match steps function with invalid whitespace", function () { @@ -389,6 +443,18 @@ define(function (require, exports, module) { it("should bookmark step-start function when opened in inline editor", function () { testOpenTimingFunction({line: 20, ch: 40}, 32, 42); }); + it("should bookmark long, invalid cubic-bezier() function when opened in inline editor", function () { + testOpenTimingFunction({line: 25, ch: 52}, 32, 74); + }); + it("should bookmark empty, invalid cubic-bezier() function when opened in inline editor", function () { + testOpenTimingFunction({line: 26, ch: 47}, 32, 46); + }); + it("should bookmark long, invalid steps() function when opened in inline editor", function () { + testOpenTimingFunction({line: 30, ch: 44}, 32, 50); + }); + it("should bookmark empty, invalid steps() function when opened in inline editor", function () { + testOpenTimingFunction({line: 31, ch: 45}, 32, 39); + }); }); describe("TimingFunction editor UI", function () { diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 6ce74c638e2..d67a270fc2f 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -491,6 +491,7 @@ define({ "INLINE_TIMING_EDITOR_PROGRESSION" : "Verlauf", "BEZIER_EDITOR_INFO" : "↑↓←→ Ausgewählten Punkt bewegen
Umschalt Um 10 Einheiten bewegen
Tab Zwischen Punkten wechseln", "STEPS_EDITOR_INFO" : "↑↓ Stufenzahl vergrößern oder verkleinern
←→ 'Start' oder 'Ende'", + "INLINE_TIMING_EDITOR_INVALID" : "Der Code im Dokument {0} ist nicht korrekt, daher wird die Funktion {1} angezeigt. Die Änderungen werden bei der ersten Bearbeitung ins Dokument übernommen.", // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Aktuelle Farbe", diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index a9c5d7d9f38..6ceb06fd583 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -493,6 +493,7 @@ define({ "INLINE_TIMING_EDITOR_PROGRESSION" : "Progression", "BEZIER_EDITOR_INFO" : "↑↓←→ Move selected point
Shift Move by ten units
Tab Switch points", "STEPS_EDITOR_INFO" : "↑↓ Increase or decrease steps
←→ 'Start' or 'End'", + "INLINE_TIMING_EDITOR_INVALID" : "The old value {0} is not valid, so the displayed function was changed to {1}. The document will be updated with the first edit.", // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Current Color", From 12ed46391c850772b2e22ed0c390fe72bb5812f6 Mon Sep 17 00:00:00 2001 From: wpt Date: Wed, 19 Feb 2014 19:59:13 +0300 Subject: [PATCH 32/55] Update strings.js fix ru version --- src/nls/ru/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/ru/strings.js b/src/nls/ru/strings.js index c3147cd12d1..ea32d48e55f 100644 --- a/src/nls/ru/strings.js +++ b/src/nls/ru/strings.js @@ -268,7 +268,7 @@ define({ "CMD_LINE_DOWN" : "Переместить строку вниз", "CMD_OPEN_LINE_ABOVE" : "Встравить строку сверху", "CMD_OPEN_LINE_BELOW" : "Вставить строку снизу", - "CMD_TOGGLE_CLOSE_BRACKETS" : "Автоматически закрывать скобкуи", + "CMD_TOGGLE_CLOSE_BRACKETS" : "Автоматически закрывать скобки", "CMD_SHOW_CODE_HINTS" : "Показывать подсказки в коде", // View menu commands From b51cef391c38aa7333d42a87c4b92638cbf51893 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Wed, 19 Feb 2014 18:22:11 -0800 Subject: [PATCH 33/55] JSDoc for project layer object and implement new deprecation warning function. --- src/preferences/PreferenceStorage.js | 7 ++- src/preferences/PreferencesBase.js | 54 ++++++++++++++++-- src/preferences/PreferencesManager.js | 13 +++-- src/utils/DeprecationWarning.js | 79 +++++++++++++++++++++++++++ 4 files changed, 140 insertions(+), 13 deletions(-) create mode 100644 src/utils/DeprecationWarning.js diff --git a/src/preferences/PreferenceStorage.js b/src/preferences/PreferenceStorage.js index 4193d545f6b..f5eb0cbfa48 100644 --- a/src/preferences/PreferenceStorage.js +++ b/src/preferences/PreferenceStorage.js @@ -33,7 +33,8 @@ define(function (require, exports, module) { var _ = require("thirdparty/lodash"); - var PreferencesManager = require("preferences/PreferencesManager"); + var PreferencesManager = require("preferences/PreferencesManager"), + DeprecationWarning = require("utils/DeprecationWarning"); /** * @private @@ -108,7 +109,7 @@ define(function (require, exports, module) { * @param {object} value A valid JSON value */ PreferenceStorage.prototype.setValue = function (key, value) { - console.warn("setValue is deprecated. Use PreferencesManager.set instead."); + DeprecationWarning.deprecationWarning("setValue is called to set preference '" + key + ",' use PreferencesManager.set instead."); if (_validateJSONPair(key, value)) { this._json[key] = value; _commit(); @@ -121,7 +122,7 @@ define(function (require, exports, module) { * @return {object} Returns the value for the key or undefined. */ PreferenceStorage.prototype.getValue = function (key) { - console.warn("getValue is deprecated. Use PreferencesManager.get instead."); + DeprecationWarning.deprecationWarning("getValue is called to get preference '" + key + ",' use PreferencesManager.get instead."); return this._json[key]; }; diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js index 9852cb48d39..200fccb3862 100644 --- a/src/preferences/PreferencesBase.js +++ b/src/preferences/PreferencesBase.js @@ -537,6 +537,13 @@ define(function (require, exports, module) { } } + /** + * @constructor + * + * Create a default project layer object that has a single property "key" + * with "project" as its value. + * + */ function ProjectLayer() { this.projectPath = null; } @@ -544,7 +551,14 @@ define(function (require, exports, module) { ProjectLayer.prototype = { key: "project", - get: function (data, id, context) { + /** + * Retrieve the current value based on the current project path + * in the layer. + * + * @param {Object} data the preference data from the Scope + * @param {string} id preference ID to look up + */ + get: function (data, id) { if (!data || !this.projectPath) { return; } @@ -555,7 +569,15 @@ define(function (require, exports, module) { return; }, - getPreferenceLocation: function (data, id, context) { + /** + * Gets the location in which the given pref was set, if it was set within + * this project layer for the current project path. + * + * @param {Object} data the preference data from the Scope + * @param {string} id preference ID to look up + * @return {string} the Layer ID, in this case the current project path. + */ + getPreferenceLocation: function (data, id) { if (!data || !this.projectPath) { return; } @@ -567,9 +589,23 @@ define(function (require, exports, module) { return; }, + /** + * Sets the preference value in the given data structure for the layerID provided. If no + * layerID is provided, then the current project path is used. If a layerID is provided + * and it does not exist, it will be created. + * + * This function returns whether or not a value was set. + * + * @param {Object} data the preference data from the Scope + * @param {string} id preference ID to look up + * @param {Object} value new value to assign to the preference + * @param {Object} context Object with scope and layer key-value pairs (not yet used in project layer) + * @param {string=} layerID Optional: project path to be used for setting value + * @return {boolean} true if the value was set + */ set: function (data, id, value, context, layerID) { if (!layerID) { - layerID = this.getPreferenceLocation(data, id, context); + layerID = this.getPreferenceLocation(data, id); } if (!layerID) { @@ -588,7 +624,12 @@ define(function (require, exports, module) { return true; }, - getKeys: function (data, context) { + /** + * Retrieves the keys provided by this layer object. + * + * @param {Object} data the preference data from the Scope + */ + getKeys: function (data) { if (!data) { return; } @@ -596,6 +637,11 @@ define(function (require, exports, module) { return _.union.apply(null, _.map(_.values(data), _.keys)); }, + /** + * Set the project path to be used as the layer ID of this layer object. + * + * @param {string} projectPath Path of the project root + */ setProjectPath: function (projectPath) { this.projectPath = projectPath; } diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index eb814be6c65..23ef2dbda99 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -33,11 +33,12 @@ define(function (require, exports, module) { "use strict"; var OldPreferenceStorage = require("preferences/PreferenceStorage").PreferenceStorage, - FileUtils = require("file/FileUtils"), - ExtensionLoader = require("utils/ExtensionLoader"), - PreferencesBase = require("preferences/PreferencesBase"), - FileSystem = require("filesystem/FileSystem"), - _ = require("thirdparty/lodash"); + FileUtils = require("file/FileUtils"), + DeprecationWarning = require("utils/DeprecationWarning"), + ExtensionLoader = require("utils/ExtensionLoader"), + PreferencesBase = require("preferences/PreferencesBase"), + FileSystem = require("filesystem/FileSystem"), + _ = require("thirdparty/lodash"); /** * The local storage ID @@ -117,7 +118,7 @@ define(function (require, exports, module) { // migrating the old preferences to the new model. So if this is called without // having _doNotCreate set to true, then the caller is using the old preferences model. if (!_doNotCreate) { - console.warn("PreferencesManager.getPreferenceStorage is deprecated. Use PreferencesManager.definePreference instead."); + DeprecationWarning.deprecationWarning("getPreferenceStorage is called with client ID '" + clientID + ",' use PreferencesManager.definePreference instead."); } if (!clientID || (typeof clientID === "object" && (!clientID.id || !clientID.uri))) { console.error("Invalid clientID"); diff --git a/src/utils/DeprecationWarning.js b/src/utils/DeprecationWarning.js new file mode 100644 index 00000000000..fde036af9e5 --- /dev/null +++ b/src/utils/DeprecationWarning.js @@ -0,0 +1,79 @@ +/* + * 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 + * 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 */ + +/** + * Utilities functions to display deprecation warning in the console. + * + */ +define(function (require, exports, module) { + "use strict"; + + var displayedWarnings = {}; + + /** + * Trim the stack so that it does not have the call to this module, + * and all the calls to require.js to load the extension that shows + * this deprecation warning. + */ + function _trimStack(stack) { + var startOfFirstLine = stack.indexOf("\n") + 1, // Find the index after 'Error\n' + firstLine = stack.substr(startOfFirstLine, stack.indexOf(")") - startOfFirstLine + 1), + indexOfFirstRequireJSline; + + // Remove the first line in the stack that shows this module + stack = stack.replace(firstLine, ""); + + // Find the very first line of require.js in the stack if the call is from an extension. + // Remove all those lines from the call stack. + indexOfFirstRequireJSline = stack.indexOf("requirejs/require.js"); + if (indexOfFirstRequireJSline !== -1) { + indexOfFirstRequireJSline = stack.lastIndexOf(")", indexOfFirstRequireJSline) + 1; + stack = stack.substr(0, indexOfFirstRequireJSline); + } + + return stack; + } + + /** + * Show deprecation message with the call stack if it + * has never been displayed before. + * @param {!string} message The deprecation message to be displayed. + */ + function deprecationWarning(message) { + // If we have displayed this message before, then don't + // show it again. + if (!message || displayedWarnings[message]) { + return; + } + + console.warn(message); + console.warn(_trimStack(new Error().stack)); + displayedWarnings[message] = true; + } + + // Define public API + exports.deprecationWarning = deprecationWarning; +}); From bc1c935a784b6ce75f292d7771e8e6b748c8b875 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Wed, 19 Feb 2014 18:46:57 -0800 Subject: [PATCH 34/55] Remove "Error" messge from the stack. --- src/utils/DeprecationWarning.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/utils/DeprecationWarning.js b/src/utils/DeprecationWarning.js index fde036af9e5..13f6217531f 100644 --- a/src/utils/DeprecationWarning.js +++ b/src/utils/DeprecationWarning.js @@ -39,12 +39,10 @@ define(function (require, exports, module) { * this deprecation warning. */ function _trimStack(stack) { - var startOfFirstLine = stack.indexOf("\n") + 1, // Find the index after 'Error\n' - firstLine = stack.substr(startOfFirstLine, stack.indexOf(")") - startOfFirstLine + 1), - indexOfFirstRequireJSline; + var indexOfFirstRequireJSline; - // Remove the first line in the stack that shows this module - stack = stack.replace(firstLine, ""); + // Remove everything in the stack up to the end of the line that shows this module file path + stack = stack.substr(stack.indexOf(")") + 1); // Find the very first line of require.js in the stack if the call is from an extension. // Remove all those lines from the call stack. From 78f79fd88d0b8149c31e5b243a71686388559fac Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Wed, 19 Feb 2014 18:50:33 -0800 Subject: [PATCH 35/55] Concatenate call stack to deprecation message and show it as one warning. --- src/utils/DeprecationWarning.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/utils/DeprecationWarning.js b/src/utils/DeprecationWarning.js index 13f6217531f..036382f5bc2 100644 --- a/src/utils/DeprecationWarning.js +++ b/src/utils/DeprecationWarning.js @@ -67,8 +67,7 @@ define(function (require, exports, module) { return; } - console.warn(message); - console.warn(_trimStack(new Error().stack)); + console.warn(message + "\n" + _trimStack(new Error().stack)); displayedWarnings[message] = true; } From 3c0505e650b9350189cb2d11c4f9156f1ed089c3 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Wed, 19 Feb 2014 19:33:19 -0800 Subject: [PATCH 36/55] Update copyright year to 2014 and remove jslint comment. --- src/utils/DeprecationWarning.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/utils/DeprecationWarning.js b/src/utils/DeprecationWarning.js index 036382f5bc2..7bcfa644a3c 100644 --- a/src/utils/DeprecationWarning.js +++ b/src/utils/DeprecationWarning.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved. + * Copyright (c) 2014 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"), @@ -21,7 +21,6 @@ * */ -/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ /*global define */ /** From 1bd91968e7a35cf7bad74d01103113900138f36a Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Wed, 19 Feb 2014 21:13:04 -0800 Subject: [PATCH 37/55] Add "console" to globals directive since we don't set "devel" option in jslint directive any more. --- src/utils/DeprecationWarning.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/DeprecationWarning.js b/src/utils/DeprecationWarning.js index 7bcfa644a3c..037a74253cb 100644 --- a/src/utils/DeprecationWarning.js +++ b/src/utils/DeprecationWarning.js @@ -21,7 +21,7 @@ * */ -/*global define */ +/*global define, console */ /** * Utilities functions to display deprecation warning in the console. From 4eb4797cc921fb598f3973e172eabe80d80e277c Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 20 Feb 2014 08:58:29 -0500 Subject: [PATCH 38/55] Provide extra time for the preferences to load in the test. --- test/spec/PreferencesManager-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js index 16c439557cb..adfcd25eed7 100644 --- a/test/spec/PreferencesManager-test.js +++ b/test/spec/PreferencesManager-test.js @@ -139,9 +139,9 @@ define(function (require, exports, module) { PreferencesManager._manager._scopes.project.storage.path === testPath + "/.brackets.json"; } waitsFor(projectPrefsAreSet, "prefs appear to be loaded"); - runs(function () { - expect(PreferencesManager.get("spaceUnits")).toBe(92); - }); + waitsFor(function () { + return PreferencesManager.get("spaceUnits") === 92; + }, "spaceUnits should be 92"); waitsForDone(FileViewController.openAndSelectDocument(nonProjectFile, FileViewController.WORKING_SET_VIEW)); From 6e68636e358cb60c957c2bbc1bc11d538ec67fef Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 20 Feb 2014 10:01:16 -0500 Subject: [PATCH 39/55] Fixes nits (including deprecation warning showing proper client ID) --- src/document/DocumentManager.js | 2 +- src/preferences/PreferenceStorage.js | 2 +- src/preferences/PreferencesManager.js | 5 +++-- src/project/ProjectManager.js | 4 ++-- src/utils/Resizer.js | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 409dece2dff..62ce0f0fc3b 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -998,7 +998,7 @@ define(function (require, exports, module) { * If the key has a prefix of "files_/", then it is a working set files * preference from old preference model. * - * @param {string} key The key of the preference to be exemined + * @param {string} key The key of the preference to be examined * for migration of working set files. * @return {?string} - the scope to which the preference is to be migrated */ diff --git a/src/preferences/PreferenceStorage.js b/src/preferences/PreferenceStorage.js index f5eb0cbfa48..5c581bcce67 100644 --- a/src/preferences/PreferenceStorage.js +++ b/src/preferences/PreferenceStorage.js @@ -191,7 +191,7 @@ define(function (require, exports, module) { * listed in 'rules' are those normal user-editable preferences. Otherwise, * they are view state settings. * @param {function(string)=} prefCheckCallback Optional callback function that - * exemines each preference key for migration. + * examines each preference key for migration. * @return {Promise} promise that is resolved once the conversion is done. Callbacks are given a * `complete` flag that denotes whether everything from this object * was converted (making it safe to delete entirely). diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 23ef2dbda99..79ef2456cbe 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -118,7 +118,8 @@ define(function (require, exports, module) { // migrating the old preferences to the new model. So if this is called without // having _doNotCreate set to true, then the caller is using the old preferences model. if (!_doNotCreate) { - DeprecationWarning.deprecationWarning("getPreferenceStorage is called with client ID '" + clientID + ",' use PreferencesManager.definePreference instead."); + var clientString = typeof clientID === "object" ? clientID.uri : clientID; + DeprecationWarning.deprecationWarning("getPreferenceStorage is called with client ID '" + clientString + ",' use PreferencesManager.definePreference instead."); } if (!clientID || (typeof clientID === "object" && (!clientID.id || !clientID.uri))) { console.error("Invalid clientID"); @@ -359,7 +360,7 @@ define(function (require, exports, module) { * listed in 'rules' are those normal user-editable preferences. Otherwise, * they are view state settings. * @param {function(string)=} prefCheckCallback Optional callback function that - * exemines each preference key for migration. + * examines each preference key for migration. */ function convertPreferences(clientID, rules, isViewState, prefCheckCallback) { smUserScopeLoading.done(function () { diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index d7676c51671..6164b074423 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -2132,11 +2132,11 @@ define(function (require, exports, module) { /** * @private - * Exemine each preference key for migration of project tree states. + * Examine each preference key for migration of project tree states. * If the key has a prefix of "projectTreeState_/", then it is a project tree states * preference from old preference model. * - * @param {string} key The key of the preference to be exemined + * @param {string} key The key of the preference to be examined * for migration of project tree states. * @return {?string} - the scope to which the preference is to be migrated */ diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index 0da0521a6aa..04e97940d76 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -440,9 +440,9 @@ define(function (require, exports, module) { /** * @private - * Exemine each preference key for migration of any panel state. + * Examine each preference key for migration of any panel state. * - * @param {string} key The key of the preference to be exemined + * @param {string} key The key of the preference to be examined * for migration of panel states. * @return {?string} - the scope to which the preference is to be migrated */ From 08e8208e2c2bd229be4e0f11700853890a981c5f Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 20 Feb 2014 10:16:28 -0500 Subject: [PATCH 40/55] Adds a deprecation warning for setValueAndSave --- src/preferences/PreferencesManager.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index f498a6c9082..c3aa5baeb4d 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -532,6 +532,8 @@ define(function (require, exports, module) { } /** + * @deprecated Use set instead. + * * Convenience function that sets a preference and then saves the file, mimicking the * old behavior a bit more closely. * @@ -541,7 +543,7 @@ define(function (require, exports, module) { * @return {boolean} true if a value was set */ function setValueAndSave(id, value, options) { - // TODO: Add a deprecation warning for this. + DeprecationWarning.deprecationWarning("setValueAndSave called for " + id + ". Use set instead."); var changed = set(id, value, options); preferencesManager.save(); return changed; From 04881ea28cd4edb1a469332e7b9c7475c95f950e Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Thu, 20 Feb 2014 12:32:48 -0800 Subject: [PATCH 41/55] Check the path following the prefix the right way since on Windows the path does not start with "/". --- src/document/DocumentManager.js | 5 +++-- src/project/ProjectManager.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 62ce0f0fc3b..3e7199ac751 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -1003,9 +1003,10 @@ define(function (require, exports, module) { * @return {?string} - the scope to which the preference is to be migrated */ function _checkPreferencePrefix(key) { - if (key.indexOf("files_/") === 0) { + var pathPrefix = "files_"; + if (key.indexOf(pathPrefix) === 0) { // Get the project path from the old preference key by stripping "files_". - var projectPath = key.substr(key.indexOf("/")); + var projectPath = key.substr(pathPrefix.length - 1); return "user project.files " + projectPath; } diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 6164b074423..1b8fd95f2b2 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -2141,9 +2141,10 @@ define(function (require, exports, module) { * @return {?string} - the scope to which the preference is to be migrated */ function _checkPreferencePrefix(key) { - if (key.indexOf("projectTreeState_/") === 0) { + var pathPrefix = "projectTreeState_"; + if (key.indexOf(pathPrefix) === 0) { // Get the project path from the old preference key by stripping "projectTreeState_". - var projectPath = key.substr(key.indexOf("/")); + var projectPath = key.substr(pathPrefix.length - 1); return "user project.treeState " + projectPath; } From c03bd4aab505e004774c9af7ba6f62c90d8ae26c Mon Sep 17 00:00:00 2001 From: Jason San Jose Date: Thu, 20 Feb 2014 14:26:52 -0800 Subject: [PATCH 42/55] introduce new event type syntax domain:event for NodeConnection events --- src/utils/NodeConnection.js | 18 ++++++++--- src/utils/NodeDomain.js | 5 +++- .../TestCommandsOne.js | 30 +++++++++++++++++++ test/spec/NodeConnection-test.js | 18 ++++++----- 4 files changed, 59 insertions(+), 12 deletions(-) diff --git a/src/utils/NodeConnection.js b/src/utils/NodeConnection.js index b609cca7403..bbe50f94e66 100644 --- a/src/utils/NodeConnection.js +++ b/src/utils/NodeConnection.js @@ -112,7 +112,6 @@ define(function (require, exports, module) { this._registeredModules = []; this._pendingInterfaceRefreshDeferreds = []; this._pendingCommandDeferreds = []; - $(this).on("base.newDomains", this._refreshInterface.bind(this)); } /** @@ -124,7 +123,7 @@ define(function (require, exports, module) { * to call to enable the debugger. * * This object is automatically replaced every time the API changes (based - * on the base.newDomains event from the server). Therefore, code that + * on the base:newDomains event from the server). Therefore, code that * uses this object should not keep their own pointer to the domain property. */ NodeConnection.prototype.domains = null; @@ -460,7 +459,18 @@ define(function (require, exports, module) { switch (m.type) { case "event": - $(this).triggerHandler(m.message.domain + "." + m.message.event, + var $this = $(this); + + if (m.message.domain === "base" && m.message.event === "newDomains") { + this._refreshInterface(); + } + + // Event type for backwards compatibility for original design: "domain.event" + $this.triggerHandler(m.message.domain + "." + m.message.event, + m.message.parameters); + + // Event type "domain:event" + $this.triggerHandler(m.message.domain + ":" + m.message.event, m.message.parameters); break; case "commandResponse": @@ -492,7 +502,7 @@ define(function (require, exports, module) { /** * @private * Helper function for refreshing the interface in the "domain" property. - * Automatically called when the connection receives a base.newDomains + * Automatically called when the connection receives a base:newDomains * event from the server, and also called at connection time. */ NodeConnection.prototype._refreshInterface = function () { diff --git a/src/utils/NodeDomain.js b/src/utils/NodeDomain.js index ac547a6e375..0ccf6454885 100644 --- a/src/utils/NodeDomain.js +++ b/src/utils/NodeDomain.js @@ -134,13 +134,16 @@ define(function (require, exports, module) { var eventNames = Object.keys(connection.domainEvents[this._domainName]); eventNames.forEach(function (domainEvent) { - var connectionEvent = this._domainName + "." + domainEvent + EVENT_NAMESPACE; + var connectionEvent = this._domainName + ":" + domainEvent + EVENT_NAMESPACE; $(connection).on(connectionEvent, function () { var params = Array.prototype.slice.call(arguments, 1); $(this).triggerHandler(domainEvent, params); }.bind(this)); }, this); + }.bind(this)) + .fail(function (err) { + console.error("[NodeDomain] Error loading domain \"" + this._domainName + "\": " + err); }.bind(this)); }; diff --git a/test/spec/NodeConnection-test-files/TestCommandsOne.js b/test/spec/NodeConnection-test-files/TestCommandsOne.js index 680c4a84b6a..de2a2e9cc75 100644 --- a/test/spec/NodeConnection-test-files/TestCommandsOne.js +++ b/test/spec/NodeConnection-test-files/TestCommandsOne.js @@ -62,6 +62,22 @@ maxerr: 50, node: true */ function cmdRaiseException(m) { throw new Error(m); } + + /** + * @private + * Emit eventOne + */ + function emitEventOne() { + _domainManager.emitEvent("test", "eventOne", ["foo", "bar"]); + } + + /** + * @private + * Emit eventTwo + */ + function emitEventTwo() { + _domainManager.emitEvent("test", "eventOne", ["foo", "bar"]); + } /** * Initializes the test domain with several test commands. @@ -115,6 +131,20 @@ maxerr: 50, node: true */ {name: "argTwo", type: "boolean"} ] ); + _domainManager.registerCommand( + "test", + "emitEventOne", + emitEventOne, + false, + "emit eventOne" + ); + _domainManager.registerCommand( + "test", + "emitEventTwo", + emitEventTwo, + false, + "emit eventTwo" + ); } exports.init = init; diff --git a/test/spec/NodeConnection-test.js b/test/spec/NodeConnection-test.js index 6e81552d12a..bb191c3ac3a 100644 --- a/test/spec/NodeConnection-test.js +++ b/test/spec/NodeConnection-test.js @@ -194,23 +194,27 @@ define(function (require, exports, module) { it("should receive events", function () { var connection = createConnection(); var eventMessages = []; - $(connection).on( - "base.log", - function (evt, level, timestamp, message) { - eventMessages.push(message); - } + var spy = jasmine.createSpy() + $(connection).one( + "test:eventOne", + spy ); runConnectAndWait(connection, false); runLoadDomainsAndWait(connection, ["TestCommandsOne"], false); runs(function () { - connection.domains.test.log("1234"); + connection.domains.test.emitEventOne(); }); waitsFor( function () { - return eventMessages.indexOf("1234") >= 0; + return spy.calls.length === 1; }, CONNECTION_TIMEOUT ); + runs(function () { + expect(spy.calls[0].args[0].type).toBe("test:eventOne"); // event.type + expect(spy.calls[0].args[1]).toBe("foo"); // argOne + expect(spy.calls[0].args[2]).toBe("bar"); // argTwo + }); }); it("should parse domain event specifications", function () { From 091726db0ab2d0ee0c044ce45ee4cd6b887a2015 Mon Sep 17 00:00:00 2001 From: Jason San Jose Date: Thu, 20 Feb 2014 14:36:55 -0800 Subject: [PATCH 43/55] fix jshint errors --- test/spec/NodeConnection-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/spec/NodeConnection-test.js b/test/spec/NodeConnection-test.js index bb191c3ac3a..56489040e97 100644 --- a/test/spec/NodeConnection-test.js +++ b/test/spec/NodeConnection-test.js @@ -25,7 +25,7 @@ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ /*global define, describe, it, xit, expect, beforeEach, afterEach, waits, -waitsFor, runs, $, brackets, waitsForDone, ArrayBuffer, DataView */ +waitsFor, runs, $, brackets, waitsForDone, ArrayBuffer, DataView, jasmine */ define(function (require, exports, module) { "use strict"; @@ -194,7 +194,7 @@ define(function (require, exports, module) { it("should receive events", function () { var connection = createConnection(); var eventMessages = []; - var spy = jasmine.createSpy() + var spy = jasmine.createSpy(); $(connection).one( "test:eventOne", spy From b6972811282b79e5823077615fbc50185525634f Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Thu, 20 Feb 2014 15:21:23 -0800 Subject: [PATCH 44/55] Making sure line error background color always overrides other background color. --- src/styles/brackets.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 4e138cdf963..00cc02d5b36 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -1387,8 +1387,8 @@ label input { /* Live Preview */ .live-preview-sync-error .CodeMirror-linenumber { - background-color: @live-preview-sync-error-background; - color: @live-preview-sync-error-color; + background-color: @live-preview-sync-error-background !important; + color: @live-preview-sync-error-color !important; } .install-extension-dialog .spinner { From 44c8daba0ac0063dc470f25144b663ddf51b02ca Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Thu, 20 Feb 2014 15:48:39 -0800 Subject: [PATCH 45/55] add a read and compare on blind-write detection --- src/filesystem/File.js | 3 ++- .../impls/appshell/AppshellFileSystem.js | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/filesystem/File.js b/src/filesystem/File.js index 177aefbf9f8..9365c676294 100644 --- a/src/filesystem/File.js +++ b/src/filesystem/File.js @@ -149,7 +149,8 @@ define(function (require, exports, module) { // Request a consistency check if the write is not blind if (!options.blind) { - options.expectedHash = this._hash; + options.expectedHash = this._hash; + options.checkData = this._contents; } // Block external change events until after the write has finished diff --git a/src/filesystem/impls/appshell/AppshellFileSystem.js b/src/filesystem/impls/appshell/AppshellFileSystem.js index 6bd90a8bd00..840773db53a 100644 --- a/src/filesystem/impls/appshell/AppshellFileSystem.js +++ b/src/filesystem/impls/appshell/AppshellFileSystem.js @@ -422,8 +422,21 @@ define(function (require, exports, module) { if (options.hasOwnProperty("expectedHash") && options.expectedHash !== stats._hash) { console.error("Blind write attempted: ", path, stats._hash, options.expectedHash); - callback(FileSystemError.CONTENTS_MODIFIED); - return; + + if (options.hasOwnProperty("checkData")) { + appshell.fs.readFile(path, encoding, function (_err, _data) { + if (_err || _data !== options.checkData) { + callback(FileSystemError.CONTENTS_MODIFIED); + return; + } + + _finishWrite(false); + }); + return; + } else { + callback(FileSystemError.CONTENTS_MODIFIED); + return; + } } _finishWrite(false); From 72bfe237c5ca1c9e11a23cb423dfd8b298c3ef6f Mon Sep 17 00:00:00 2001 From: Jason San Jose Date: Fri, 21 Feb 2014 11:18:02 -0800 Subject: [PATCH 46/55] check for jquery property instead of instanceof --- src/editor/CodeHintList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/editor/CodeHintList.js b/src/editor/CodeHintList.js index 2a98f5fdb36..07ce852fcc1 100644 --- a/src/editor/CodeHintList.js +++ b/src/editor/CodeHintList.js @@ -200,7 +200,7 @@ define(function (require, exports, module) { }; } else { _addHint = function (hint) { - view.hints.push({ formattedHint: (hint instanceof $) ? "" : hint }); + view.hints.push({ formattedHint: (hint.jquery) ? "" : hint }); }; } @@ -237,7 +237,7 @@ define(function (require, exports, module) { $element.data("hint", hint); // insert jQuery hint objects after the template is rendered - if (hint instanceof $) { + if (hint.jquery) { $element.find(".codehint-item").append(hint); } }); From 2f3f77bf8e48f1cb7c13f3bb2f486c0663cc5739 Mon Sep 17 00:00:00 2001 From: Jeff Booher Date: Fri, 21 Feb 2014 13:13:51 -0800 Subject: [PATCH 47/55] rtc: better naming and added unit test --- src/filesystem/File.js | 2 +- .../impls/appshell/AppshellFileSystem.js | 6 ++-- test/spec/FileSystem-test.js | 31 +++++++++++++++++++ test/spec/MockFileSystemImpl.js | 11 +++++-- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/filesystem/File.js b/src/filesystem/File.js index 9365c676294..6c103b82510 100644 --- a/src/filesystem/File.js +++ b/src/filesystem/File.js @@ -150,7 +150,7 @@ define(function (require, exports, module) { // Request a consistency check if the write is not blind if (!options.blind) { options.expectedHash = this._hash; - options.checkData = this._contents; + options.expectedContents = this._contents; } // Block external change events until after the write has finished diff --git a/src/filesystem/impls/appshell/AppshellFileSystem.js b/src/filesystem/impls/appshell/AppshellFileSystem.js index 840773db53a..337d62142bf 100644 --- a/src/filesystem/impls/appshell/AppshellFileSystem.js +++ b/src/filesystem/impls/appshell/AppshellFileSystem.js @@ -390,7 +390,7 @@ define(function (require, exports, module) { * * @param {string} path * @param {string} data - * @param {{encoding : string=, mode : number=, expectedHash : object=}} options + * @param {{encoding : string=, mode : number=, expectedHash : object=, expectedContents : string=}} options * @param {function(?string, FileSystemStats=, boolean)} callback */ function writeFile(path, data, options, callback) { @@ -423,9 +423,9 @@ define(function (require, exports, module) { if (options.hasOwnProperty("expectedHash") && options.expectedHash !== stats._hash) { console.error("Blind write attempted: ", path, stats._hash, options.expectedHash); - if (options.hasOwnProperty("checkData")) { + if (options.hasOwnProperty("expectedContents")) { appshell.fs.readFile(path, encoding, function (_err, _data) { - if (_err || _data !== options.checkData) { + if (_err || _data !== options.expectedContents) { callback(FileSystemError.CONTENTS_MODIFIED); return; } diff --git a/test/spec/FileSystem-test.js b/test/spec/FileSystem-test.js index 9863047cbac..ecdbf804cb8 100644 --- a/test/spec/FileSystem-test.js +++ b/test/spec/FileSystem-test.js @@ -34,6 +34,7 @@ define(function (require, exports, module) { FileSystemError = require("filesystem/FileSystemError"), MockFileSystemImpl = require("./MockFileSystemImpl"); + describe("FileSystem", function () { // Callback factories @@ -1060,6 +1061,36 @@ define(function (require, exports, module) { }); }); + it("should verify blind writes", function () { + var file = fileSystem.getFileForPath(filename), + cb1 = writeCallback(), + cb2 = writeCallback(), + newFileContent = "Computer programming is an exact science", + checkedContent = file._contents = fileSystem._impl._model.readFile(filename); // avoids having to use a callback + + // Make sure that cache matches so writes will proceed over blind write + runs(function () { + expect(file._isWatched()).toBe(true); + expect(file._contents).toBe(checkedContent); + expect(file._hash).toBeFalsy(); + expect(writeCalls).toBe(0); + + file.write(newFileContent, cb1); + }); + waitsFor(function () { return cb1.wasCalled; }); + + // confirm impl write and updated cache + runs(function () { + expect(cb1.error).toBeFalsy(); + expect(cb1.stat).toBeTruthy(); + expect(file._isWatched()).toBe(true); + expect(file._stat).toBe(cb1.stat); + expect(file._contents).toBe(newFileContent); + expect(file._hash).toBeTruthy(); + expect(writeCalls).toBe(1); + }); + }); + it("should persist data on write and update cached data", function () { var file = fileSystem.getFileForPath(filename), cb1 = readCallback(), diff --git a/test/spec/MockFileSystemImpl.js b/test/spec/MockFileSystemImpl.js index 5cfae685643..b7ec441353d 100644 --- a/test/spec/MockFileSystemImpl.js +++ b/test/spec/MockFileSystemImpl.js @@ -158,8 +158,15 @@ define(function (require, exports, module) { var cb = _getCallback("writeFile", path, callback); if (_model.exists(path) && options.hasOwnProperty("expectedHash") && options.expectedHash !== _model.stat(path)._hash) { - cb(FileSystemError.CONTENTS_MODIFIED); - return; + if (options.hasOwnProperty("expectedContents")) { + if (options.expectedContents !== _model.readFile(path)) { + cb(FileSystemError.CONTENTS_MODIFIED); + return; + } + } else { + cb(FileSystemError.CONTENTS_MODIFIED); + return; + } } _model.writeFile(path, data); From 66fc80bfd7ca3ad3209f58e55346778885e3e1c5 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Sun, 23 Feb 2014 08:48:13 -0800 Subject: [PATCH 48/55] Fix view state migration issue by adjusting the file path strings handling. --- src/document/DocumentManager.js | 2 +- src/preferences/PreferenceStorage.js | 2 +- src/project/ProjectManager.js | 2 +- src/utils/DeprecationWarning.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 3e7199ac751..51154423885 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -1006,7 +1006,7 @@ define(function (require, exports, module) { var pathPrefix = "files_"; if (key.indexOf(pathPrefix) === 0) { // Get the project path from the old preference key by stripping "files_". - var projectPath = key.substr(pathPrefix.length - 1); + var projectPath = key.substr(pathPrefix.length); return "user project.files " + projectPath; } diff --git a/src/preferences/PreferenceStorage.js b/src/preferences/PreferenceStorage.js index 5c581bcce67..8d1906c2568 100644 --- a/src/preferences/PreferenceStorage.js +++ b/src/preferences/PreferenceStorage.js @@ -225,7 +225,7 @@ define(function (require, exports, module) { var newKey = parts.length > 1 ? parts[1] : key; var options = null; - if (parts.length > 2 && parts[2].indexOf("/") === 0) { + if (parts.length > 2 && parts[2].indexOf("/") !== -1) { var projectPath = rule.substr(rule.indexOf(parts[2])); options = { location: { scope: "user", layer: "project", diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 1b8fd95f2b2..45d62c47bad 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -2144,7 +2144,7 @@ define(function (require, exports, module) { var pathPrefix = "projectTreeState_"; if (key.indexOf(pathPrefix) === 0) { // Get the project path from the old preference key by stripping "projectTreeState_". - var projectPath = key.substr(pathPrefix.length - 1); + var projectPath = key.substr(pathPrefix.length); return "user project.treeState " + projectPath; } diff --git a/src/utils/DeprecationWarning.js b/src/utils/DeprecationWarning.js index 037a74253cb..0f218ccbe1c 100644 --- a/src/utils/DeprecationWarning.js +++ b/src/utils/DeprecationWarning.js @@ -41,7 +41,7 @@ define(function (require, exports, module) { var indexOfFirstRequireJSline; // Remove everything in the stack up to the end of the line that shows this module file path - stack = stack.substr(stack.indexOf(")") + 1); + stack = stack.substr(stack.indexOf(")\n") + 2); // Find the very first line of require.js in the stack if the call is from an extension. // Remove all those lines from the call stack. From 4139379abacad91fd899af87ff2c98e79260f0af Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Sun, 23 Feb 2014 09:04:30 -0800 Subject: [PATCH 49/55] Fix #6954 by migrating all "panelState" preferences if the key is a valid one. --- src/utils/Resizer.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index 04e97940d76..53179e01b2f 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -447,9 +447,7 @@ define(function (require, exports, module) { * @return {?string} - the scope to which the preference is to be migrated */ function _isPanelPreferences(key) { - // TODO: Need to update 'panels' array to include all Edge Code panels. - var panels = ["problems-panel", "search-results"]; - if (panels.indexOf(key) > -1) { + if (key) { return "user"; } From 57deb81b7f5ed6a3dfae45159dd71d0a65dec936 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 24 Feb 2014 13:36:45 -0500 Subject: [PATCH 50/55] Fix PreferencesManager test. This is a fix for #6917. The problem was that `openAndSelectDocument(nonProjectFile` was being called outside of a `run()` block, so sometimes the nonProjectFile would be open rather than file that was supposed to be open. --- test/spec/PreferencesManager-test.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js index adfcd25eed7..804c53ce6d4 100644 --- a/test/spec/PreferencesManager-test.js +++ b/test/spec/PreferencesManager-test.js @@ -132,19 +132,13 @@ define(function (require, exports, module) { var projectWithoutSettings = SpecRunnerUtils.getTestPath("/spec/WorkingSetView-test-files"), FileViewController = testWindow.brackets.test.FileViewController; waitsForDone(SpecRunnerUtils.openProjectFiles(".brackets.json")); - function projectPrefsAreSet() { - // The test project file, the Brackets repo file, - // user and defaults should be the scopes - return Object.keys(PreferencesManager._manager._scopes).length > 3 && - PreferencesManager._manager._scopes.project.storage.path === testPath + "/.brackets.json"; - } - waitsFor(projectPrefsAreSet, "prefs appear to be loaded"); - waitsFor(function () { - return PreferencesManager.get("spaceUnits") === 92; - }, "spaceUnits should be 92"); - waitsForDone(FileViewController.openAndSelectDocument(nonProjectFile, - FileViewController.WORKING_SET_VIEW)); + runs(function () { + expect(PreferencesManager.get("spaceUnits")).toBe(92); + waitsForDone(FileViewController.openAndSelectDocument(nonProjectFile, + FileViewController.WORKING_SET_VIEW)); + + }); runs(function () { expect(PreferencesManager.get("spaceUnits")).not.toBe(92); From 71865453874c66e5571743ec2c5988d749200fa5 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Mon, 24 Feb 2014 11:44:17 -0800 Subject: [PATCH 51/55] add comment about why important must be used --- src/styles/brackets.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 00cc02d5b36..2f6b1caf1c3 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -1386,6 +1386,8 @@ label input { } /* Live Preview */ + +// CodeMirror uses inline styles for active line number, so must use !important here to override .live-preview-sync-error .CodeMirror-linenumber { background-color: @live-preview-sync-error-background !important; color: @live-preview-sync-error-color !important; From 7c71908b88637a5e8e35f23b02f80e8205d15b6e Mon Sep 17 00:00:00 2001 From: Jason San Jose Date: Mon, 24 Feb 2014 12:12:42 -0800 Subject: [PATCH 52/55] safer check for jquery object --- test/spec/SpecRunnerUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index ee770dd2255..ecdc69d1ae8 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -1059,7 +1059,7 @@ define(function (require, exports, module) { // Unfortunately, we can't just use jQuery's :contains() selector, because it appears that // you can't escape quotes in it. var i; - if (root instanceof $) { + if (root.jquery) { root = root.get(0); } if (!root) { From 430dae11406c1ba2cf12f12a91bf641c793e5f85 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Mon, 24 Feb 2014 13:00:07 -0800 Subject: [PATCH 53/55] Add Michael Hernandez to the whitelist. --- tasks/cla-exceptions.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/cla-exceptions.json b/tasks/cla-exceptions.json index 4a79bc85c83..0cf313e6216 100644 --- a/tasks/cla-exceptions.json +++ b/tasks/cla-exceptions.json @@ -1,3 +1,4 @@ { - "busykai": true + "busykai": true, + "mjherna1": true } \ No newline at end of file From c01a89b1d0baade9a6e98453c192d0b49410a33c Mon Sep 17 00:00:00 2001 From: kvarel Date: Sat, 8 Feb 2014 15:14:38 +0100 Subject: [PATCH 54/55] sprint 36 - czech language update --- src/nls/cs/strings.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/nls/cs/strings.js b/src/nls/cs/strings.js index ac92aa529c2..325fa96c89c 100644 --- a/src/nls/cs/strings.js +++ b/src/nls/cs/strings.js @@ -36,6 +36,7 @@ define({ "NOT_READABLE_ERR" : "Soubor nelze číst.", "NO_MODIFICATION_ALLOWED_ERR" : "Cílová složka nemůže být změněna.", "NO_MODIFICATION_ALLOWED_ERR_FILE" : "Oprávnění neumožní provádět změny.", + "CONTENTS_MODIFIED_ERR" : "Soubor byl změněn mimo aplikaci {APP_NAME}.", "FILE_EXISTS_ERR" : "Soubor již existuje.", "FILE" : "Soubor", "DIRECTORY" : "Složka", @@ -59,7 +60,7 @@ define({ "ERROR_DELETING_FILE_TITLE" : "Chyba při mazání souboru", "ERROR_DELETING_FILE" : "Došlo k chybě při mazání souboru {0}. {1}", "INVALID_FILENAME_TITLE" : "Špatné jméno souboru", - "INVALID_FILENAME_MESSAGE" : "Jméno souboru nemůže obsahovat znaky: {0}", + "INVALID_FILENAME_MESSAGE" : "Jméno souboru nemůže obsahovat znaky: /?*:;{}<>\\|", "FILE_ALREADY_EXISTS" : "Soubor {0} již existuje.", "ERROR_CREATING_FILE_TITLE" : "Chyba při tvorbě souboru", "ERROR_CREATING_FILE" : "Došlo k chybě při vytváření souboru {0}. {1}", @@ -107,6 +108,7 @@ define({ "CONFIRM_FOLDER_DELETE_TITLE" : "Potvrdit smazání", "CONFIRM_FOLDER_DELETE" : "Opravdu chcete smazat složku {0}?", "FILE_DELETED_TITLE" : "Soubor smazán", + "EXT_MODIFIED_WARNING" : "{0} byl změněn.

Chcete uložit soubor a přepsat tyto změny?", "EXT_MODIFIED_MESSAGE" : "{0} byl změněn, ale neuložené změny se nachází také v {APP_NAME}.

Kterou verzi chcete zachovat?", "EXT_DELETED_MESSAGE" : "{0} byl smazán z disku, ale změny nebyly uloženy v {APP_NAME}.

Chcete uložit změny?", @@ -184,14 +186,14 @@ define({ "STATUSBAR_TAB_SIZE" : "Velikost tabulátoru:", "STATUSBAR_LINE_COUNT_SINGULAR" : "Řádek: {0}", "STATUSBAR_LINE_COUNT_PLURAL" : "Řádky: {0}", + "STATUSBAR_USER_EXTENSIONS_DISABLED" : "Doplňky zakázany", // CodeInspection: chyby/varování - "ERRORS_PANEL_TITLE" : "{0} chyby", - "ERRORS_PANEL_TITLE_SINGLE" : "{0} chyby", - "ERRORS_PANEL_TITLE_MULTI" : "Lint problémy", + "ERRORS_PANEL_TITLE_MULTIPLE" : "{0} chyb", "SINGLE_ERROR" : "1 {0} chyba", "MULTIPLE_ERRORS" : "{1} {0} chyby", "NO_ERRORS" : "Žádné {0} chyby - dobrá práce!", + "NO_ERRORS_MULTIPLE_PROVIDER" : "Žádné chyby nenalezeny - dobrá práce!", "LINT_DISABLED" : "Lintování je vypnuto", "NO_LINT_AVAILABLE" : "Žádný linter není dostupný pro {0}", "NOTHING_TO_LINT" : "Nic k lintování", @@ -241,6 +243,7 @@ define({ "CMD_SELECT_ALL" : "Vybrat vše", "CMD_SELECT_LINE" : "Vybrat řádek", "CMD_FIND" : "Najít", + "CMD_FIND_FIELD_PLACEHOLDER" : "Najít\u2026", "CMD_FIND_IN_FILES" : "Najít v souborech", "CMD_FIND_IN_SUBTREE" : "Najít v\u2026", "CMD_FIND_NEXT" : "Najít další", @@ -303,6 +306,7 @@ define({ "CMD_SHOW_EXTENSIONS_FOLDER" : "Zobrazit složku s doplňky", "CMD_TWITTER" : "{TWITTER_NAME} - Twitter", "CMD_ABOUT" : "O aplikaci {APP_TITLE}", + "CMD_OPEN_PREFERENCES" : "Otevřít soubor s preferencemi", // Řetězce pro main-view.html "EXPERIMENTAL_BUILD" : "experimentální verze", @@ -310,6 +314,8 @@ define({ "OK" : "OK", "DONT_SAVE" : "Neukládat", "SAVE" : "Uložit", + "SAVE_AS" : "Uložit jako\u2026", + "SAVE_AND_OVERWRITE" : "Přepsat", "CANCEL" : "Zrušit", "DELETE" : "Smazat", "RELOAD_FROM_DISK" : "Načíst z disku", @@ -347,6 +353,7 @@ define({ "OVERWRITE" : "Přepsat", "CANT_REMOVE_DEV" : "Doplněk v \"dev\" složce musí být smazán manuálně.", "CANT_UPDATE" : "Aktualizace není kompatibilní s touto verzí {APP_NAME}.", + "CANT_UPDATE_DEV" : "Doplňky ve složce \"dev\" nemohou být aktualizovány automaticky.", "INSTALL_EXTENSION_TITLE" : "Instalovat doplněk", "UPDATE_EXTENSION_TITLE" : "Aktualizovat doplněk", "INSTALL_EXTENSION_LABEL" : "URL adresa doplňku", @@ -406,11 +413,12 @@ define({ "UNDO_REMOVE" : "Zpět", "MARKED_FOR_UPDATE" : "Označeno pro aktualizaci", "UNDO_UPDATE" : "Zpět", - "CHANGE_AND_QUIT_TITLE" : "Změnit doplněk", - "CHANGE_AND_QUIT_MESSAGE" : "Pro aktualizaci nebo odstranění označených doplňků musíte ukončit a restartovat aplikaci {APP_NAME}. Budete vyzváni k uložení změn.", - "REMOVE_AND_QUIT" : "Odstranit doplňky a ukončit program", - "CHANGE_AND_QUIT" : "Změnit doplňky a ukončit program", - "UPDATE_AND_QUIT" : "Aktualizovat doplňky a ukončit program", + "CHANGE_AND_RELOAD_TITLE" : "Změnit doplňky", + "CHANGE_AND_RELOAD_MESSAGE" : "Pro aktualizaci nebo odstranění označených doplňků je třeba restartovat aplikaci {APP_NAME}. Budete vyzváni k uložení změn.", + "REMOVE_AND_RELOAD" : "Odstranit doplňky a restartovat", + "CHANGE_AND_RELOAD" : "Změnit doplňky a restartovat", + "UPDATE_AND_RELOAD" : "Aktualizovat doplňky a restartovat", + "PROCESSING_EXTENSIONS" : "Zpracování změn doplňku\u2026", "EXTENSION_NOT_INSTALLED" : "Doplněk {{0}} nemohl být odstraněn, protože nebyl nainstalován.", "NO_EXTENSIONS" : "Žádný doplněk ještě nebyl nainstalován.
Klikněte na tlačítko Instalovat z URL pro zahájení instalace.", "NO_EXTENSION_MATCHES" : "Žádný doplněk neodpovídá hledání.", @@ -433,6 +441,7 @@ define({ "DEBUG_MENU" : "Nástroje", "CMD_SHOW_DEV_TOOLS" : "Zobrazit nástroje pro vývojáře", "CMD_REFRESH_WINDOW" : "Restartovat {APP_NAME}", + "CMD_RELOAD_WITHOUT_USER_EXTS" : "Restartovat bez doplňků", "CMD_NEW_BRACKETS_WINDOW" : "Nové okno {APP_NAME}", "CMD_SWITCH_LANGUAGE" : "Změnit jazyk", "CMD_RUN_UNIT_TESTS" : "Spustit testy", @@ -450,6 +459,8 @@ define({ // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Doba", "INLINE_TIMING_EDITOR_PROGRESSION" : "Postup", + "BEZIER_EDITOR_INFO" : "↑↓←→ Posunout vybraný bod
Shift Posunout o deset jednotek", + "STEPS_EDITOR_INFO" : "↑↓ Zvýšení nebo snížení kroků
←→ 'Start' nebo 'End'", // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Současná barva", From 40a77239fadf20a6538e46ab1d930613ab49061c Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Mon, 24 Feb 2014 17:48:43 -0800 Subject: [PATCH 55/55] Code review fixes --- src/nls/cs/strings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls/cs/strings.js b/src/nls/cs/strings.js index 325fa96c89c..0cc5d12d47b 100644 --- a/src/nls/cs/strings.js +++ b/src/nls/cs/strings.js @@ -36,7 +36,7 @@ define({ "NOT_READABLE_ERR" : "Soubor nelze číst.", "NO_MODIFICATION_ALLOWED_ERR" : "Cílová složka nemůže být změněna.", "NO_MODIFICATION_ALLOWED_ERR_FILE" : "Oprávnění neumožní provádět změny.", - "CONTENTS_MODIFIED_ERR" : "Soubor byl změněn mimo aplikaci {APP_NAME}.", + "CONTENTS_MODIFIED_ERR" : "Soubor byl změněn mimo aplikaci {APP_NAME}.", "FILE_EXISTS_ERR" : "Soubor již existuje.", "FILE" : "Soubor", "DIRECTORY" : "Složka", @@ -186,7 +186,7 @@ define({ "STATUSBAR_TAB_SIZE" : "Velikost tabulátoru:", "STATUSBAR_LINE_COUNT_SINGULAR" : "Řádek: {0}", "STATUSBAR_LINE_COUNT_PLURAL" : "Řádky: {0}", - "STATUSBAR_USER_EXTENSIONS_DISABLED" : "Doplňky zakázany", + "STATUSBAR_USER_EXTENSIONS_DISABLED" : "Doplňky zakázány", // CodeInspection: chyby/varování "ERRORS_PANEL_TITLE_MULTIPLE" : "{0} chyb",