From 012de0e91bb512e1feff7b0dcdde73ba8a9c5c52 Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Wed, 6 Mar 2013 16:53:42 -0800 Subject: [PATCH 0001/1140] Add way for plugin to specify label for quick open --- src/search/QuickOpen.js | 44 ++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/src/search/QuickOpen.js b/src/search/QuickOpen.js index 358bded1342..7e394a4f2fc 100644 --- a/src/search/QuickOpen.js +++ b/src/search/QuickOpen.js @@ -97,7 +97,7 @@ define(function (require, exports, module) { /** * Defines API for new QuickOpen plug-ins */ - function QuickOpenPlugin(name, fileTypes, done, search, match, itemFocus, itemSelect, resultsFormatter) { + function QuickOpenPlugin(name, fileTypes, done, search, match, itemFocus, itemSelect, resultsFormatter, label) { this.name = name; this.fileTypes = fileTypes; this.done = done; @@ -106,6 +106,7 @@ define(function (require, exports, module) { this.itemFocus = itemFocus; this.itemSelect = itemSelect; this.resultsFormatter = resultsFormatter; + this.label = label; } /** @@ -117,25 +118,27 @@ define(function (require, exports, module) { * search: function(string, !StringMatch.StringMatcher):Array., * match: function(string):boolean, * itemFocus: function(?SearchResult|string), - * itemSelect: funciton(?SearchResult|string), - * resultsFormatter: ?function(SearchResult|string, string):string + * itemSelect: function(?SearchResult|string), + * resultsFormatter: ?function(SearchResult|string, string):string, + * label: ?string * } pluginDef * * Parameter Documentation: * * name - plug-in name, **must be unique** - * fileTypes - file types array. Example: ["js", "css", "txt"]. An empty array + * fileTypes - file types array. Example: ["js", "css", "txt"]. If unspecified or empty array, * indicates all file types. - * done - called when quick open is complete. Plug-in should clear its internal state. - * search - takes a query string and a StringMatcher (the use of which is optional but can speed up your searches) and returns an array of strings that match the query. + * done - called when quick open is complete. Plug-in should clear its internal state. Optional. + * search - takes a query string and a StringMatcher (the use of which is optional but can speed up your searches) and returns an array of strings that match the query. Required. * match - takes a query string and returns true if this plug-in wants to provide - * results for this query. + * results for this query. Required. * itemFocus - performs an action when a result has been highlighted (via arrow keys, mouseover, etc.). - * The highlighted search result item (as returned by search()) is passed as an argument. + * The highlighted search result item (as returned by search()) is passed as an argument. Optional. * itemSelect - performs an action when a result is chosen. - * The selected search result item (as returned by search()) is passed as an argument. + * The selected search result item (as returned by search()) is passed as an argument. Required. * resultFormatter - takes a query string and an item string and returns * a
  • item to insert into the displayed search results. If null, default is provided. + * label - if provided, the label to show before the query field. * * If itemFocus() makes changes to the current document or cursor/scroll position and then the user * cancels Quick Open (via Esc), those changes are automatically reverted. @@ -143,13 +146,14 @@ define(function (require, exports, module) { function addQuickOpenPlugin(pluginDef) { plugins.push(new QuickOpenPlugin( pluginDef.name, - pluginDef.fileTypes, + pluginDef.fileTypes || [], pluginDef.done, pluginDef.search, pluginDef.match, pluginDef.itemFocus, pluginDef.itemSelect, - pluginDef.resultsFormatter + pluginDef.resultsFormatter, + pluginDef.label )); } @@ -311,7 +315,7 @@ define(function (require, exports, module) { QuickNavigateDialog.prototype._handleItemFocus = function (e, selectedDOMItem) { var selectedItem = domItemToSearchResult(selectedDOMItem); - if (currentPlugin) { + if (currentPlugin && currentPlugin.itemFocus) { currentPlugin.itemFocus(selectedItem); } // TODO: Disable opening files on focus for now since this causes focus related bugs between @@ -420,7 +424,9 @@ define(function (require, exports, module) { var i; for (i = 0; i < plugins.length; i++) { var plugin = plugins[i]; - plugin.done(); + if (plugin.done) { + plugin.done(); + } } // Ty TODO: disabled for now while file switching is disabled in _handleItemFocus @@ -517,9 +523,6 @@ define(function (require, exports, module) { return getLastFilterResult(); } - // Reflect current search mode in UI - this._updateDialogLabel(query); - // "Go to line" mode is special-cased var gotoLine = extractLineNumber(query); if (!isNaN(gotoLine)) { @@ -548,11 +551,20 @@ define(function (require, exports, module) { matcher = new StringMatch.StringMatcher(); this._matchers[currentPlugin.name] = matcher; } + if (plugin.label) { + $(".find-dialog-label", this.dialog).text(plugin.label); + } else { + // Use default dialog label for the given query. + this._updateDialogLabel(query); + } return plugin.search(query, matcher); } } } + // Reflect current search mode in UI + this._updateDialogLabel(query); + // No matching plugin: use default file search mode currentPlugin = null; return searchFileList(query, this._filenameMatcher); From d36c1e9dcbd2548263cdde169f06807761d03863 Mon Sep 17 00:00:00 2001 From: sathyamoorthi Date: Sun, 28 Jul 2013 22:13:33 +0530 Subject: [PATCH 0002/1140] "close others" extension. --- src/document/DocumentCommandHandlers.js | 17 ++-- src/extensions/default/CloseOthers/main.js | 87 +++++++++++++++++++ .../default/CloseOthers/settings.json | 5 ++ 3 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 src/extensions/default/CloseOthers/main.js create mode 100644 src/extensions/default/CloseOthers/settings.json diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index d516ae11010..27cf9cf6b55 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -917,12 +917,17 @@ define(function (require, exports, module) { promptOnly = commandData && commandData.promptOnly; var unsavedDocs = []; - DocumentManager.getWorkingSet().forEach(function (file) { - var doc = DocumentManager.getOpenDocumentForPath(file.fullPath); - if (doc && doc.isDirty) { - unsavedDocs.push(doc); - } - }); + + if (commandData.unsavedDocs) { + unsavedDocs = commandData.unsavedDocs; + } else { + DocumentManager.getWorkingSet().forEach(function (file) { + var doc = DocumentManager.getOpenDocumentForPath(file.fullPath); + if (doc && doc.isDirty) { + unsavedDocs.push(doc); + } + }); + } if (unsavedDocs.length === 0) { // No unsaved changes, so we can proceed without a prompt diff --git a/src/extensions/default/CloseOthers/main.js b/src/extensions/default/CloseOthers/main.js new file mode 100644 index 00000000000..ae708456e84 --- /dev/null +++ b/src/extensions/default/CloseOthers/main.js @@ -0,0 +1,87 @@ +/* + * 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, regexp: true, indent: 4, maxerr: 50 */ +/*global define, $, brackets, window, document */ + +define(function (require, exports, module) { + "use strict"; + + var Menus = brackets.getModule("command/Menus"), + CommandManager = brackets.getModule("command/CommandManager"), + Commands = brackets.getModule("command/Commands"), + dm = brackets.getModule("document/DocumentManager"), + settings = JSON.parse(require("text!settings.json")), + working_set_cmenu = Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_MENU); + + function handleClose(mode) { + + var targetIndex = dm.findInWorkingSet(dm.getCurrentDocument().file.fullPath), + workingSet = dm.getWorkingSet().slice(0), + start = (mode === "close_below") ? (targetIndex + 1) : 0, + end = (mode === "close_above") ? (targetIndex) : (workingSet.length), + unsavedDocs = [], + doc, + i; + + if (mode === "close_others") { + end--; + workingSet.splice(targetIndex, 1); + } + + for (i = start; i < end; i++) { + doc = dm.getOpenDocumentForPath(workingSet[i].fullPath); + + if (doc && doc.isDirty) { + unsavedDocs.push(doc); + } + } + + CommandManager.execute(Commands.FILE_CLOSE_ALL, {promptOnly: true, unsavedDocs: unsavedDocs}).done(function () { + for (i = start; i < end; i++) { + dm.removeFromWorkingSet(workingSet[i]); + } + }); + } + + if (settings.close_below) { + CommandManager.register("Close Others Below", "file.close_below", function () { + handleClose("close_below"); + }); + working_set_cmenu.addMenuItem("file.close_below", "", Menus.AFTER, Commands.FILE_CLOSE); + } + + if (settings.close_others) { + CommandManager.register("Close Others", "file.close_others", function () { + handleClose("close_others"); + }); + working_set_cmenu.addMenuItem("file.close_others", "", Menus.AFTER, Commands.FILE_CLOSE); + } + + if (settings.close_above) { + CommandManager.register("Close Others Above", "file.close_above", function () { + handleClose("close_above"); + }); + working_set_cmenu.addMenuItem("file.close_above", "", Menus.AFTER, Commands.FILE_CLOSE); + } +}); \ No newline at end of file diff --git a/src/extensions/default/CloseOthers/settings.json b/src/extensions/default/CloseOthers/settings.json new file mode 100644 index 00000000000..5c12eb088a1 --- /dev/null +++ b/src/extensions/default/CloseOthers/settings.json @@ -0,0 +1,5 @@ +{ + "close_others": true, + "close_above": false, + "close_below": false +} \ No newline at end of file From 01c33fb4299637413bb05d29d4ff1d94896d7697 Mon Sep 17 00:00:00 2001 From: sathyamoorthi Date: Wed, 31 Jul 2013 12:30:12 +0530 Subject: [PATCH 0003/1140] file close functions to handle list of files. --- src/document/DocumentCommandHandlers.js | 78 +++++++++-------- src/document/DocumentManager.js | 86 ++++++++++--------- src/extensions/default/CloseOthers/main.js | 46 +++++----- .../default/CloseOthers/settings.json | 4 +- src/nls/root/strings.js | 3 + 5 files changed, 113 insertions(+), 104 deletions(-) diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index 27cf9cf6b55..e3e3f2fb0b5 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -715,20 +715,12 @@ define(function (require, exports, module) { return $.Deferred().reject().promise(); } - /** - * Saves all unsaved documents. Returns a Promise that will be resolved once ALL the save - * operations have been completed. If ANY save operation fails, an error dialog is immediately - * shown and the other files wait to save until it is dismissed; after all files have been - * processed, the Promise is rejected if any ONE save operation failed. - * - * @return {$.Promise} - */ - function saveAll() { + function _saveFileList(fileList) { // Do in serial because doSave shows error UI for each file, and we don't want to stack // multiple dialogs on top of each other var userCanceled = false; return Async.doSequentially( - DocumentManager.getWorkingSet(), + fileList, function (file) { // Abort remaining saves if user canceled any Save dialog if (userCanceled) { @@ -753,6 +745,18 @@ define(function (require, exports, module) { ); } + /** + * Saves all unsaved documents. Returns a Promise that will be resolved once ALL the save + * operations have been completed. If ANY save operation fails, an error dialog is immediately + * shown and the other files wait to save until it is dismissed; after all files have been + * processed, the Promise is rejected if any ONE save operation failed. + * + * @return {$.Promise} + */ + function saveAll() { + return _saveFileList(DocumentManager.getWorkingSet()); + } + /** * Prompts user with save as dialog and saves document. * @return {$.Promise} a promise that is resolved once the save has been completed @@ -903,31 +907,17 @@ define(function (require, exports, module) { } return promise; } - - /** - * Closes all open documents; equivalent to calling handleFileClose() for each document, except - * that unsaved changes are confirmed once, in bulk. - * @param {?{promptOnly: boolean}} If true, only displays the relevant confirmation UI and does NOT - * actually close any documents. This is useful when chaining close-all together with - * other user prompts that may be cancelable. - * @return {$.Promise} a promise that is resolved when all files are closed - */ - function handleFileCloseAll(commandData) { - var result = new $.Deferred(), - promptOnly = commandData && commandData.promptOnly; - var unsavedDocs = []; + function _doCloseDocumentList(list, promptOnly) { + var result = new $.Deferred(), + unsavedDocs = []; - if (commandData.unsavedDocs) { - unsavedDocs = commandData.unsavedDocs; - } else { - DocumentManager.getWorkingSet().forEach(function (file) { - var doc = DocumentManager.getOpenDocumentForPath(file.fullPath); - if (doc && doc.isDirty) { - unsavedDocs.push(doc); - } - }); - } + list.forEach(function (file) { + var doc = DocumentManager.getOpenDocumentForPath(file.fullPath); + if (doc && doc.isDirty) { + unsavedDocs.push(doc); + } + }); if (unsavedDocs.length === 0) { // No unsaved changes, so we can proceed without a prompt @@ -985,7 +975,7 @@ define(function (require, exports, module) { result.reject(); } else if (id === Dialogs.DIALOG_BTN_OK) { // Save all unsaved files, then if that succeeds, close all - saveAll().done(function () { + _saveFileList(list).done(function () { result.resolve(); }).fail(function () { result.reject(); @@ -1002,13 +992,29 @@ define(function (require, exports, module) { // guarantees that handlers run in the order they are added. result.done(function () { if (!promptOnly) { - DocumentManager.closeAll(); + DocumentManager.closeDocuments(list); } }); return result.promise(); } + /** + * Closes all open documents; equivalent to calling handleFileClose() for each document, except + * that unsaved changes are confirmed once, in bulk. + * @param {?{promptOnly: boolean}} If true, only displays the relevant confirmation UI and does NOT + * actually close any documents. This is useful when chaining close-all together with + * other user prompts that may be cancelable. + * @return {$.Promise} a promise that is resolved when all files are closed + */ + function handleFileCloseAll(commandData) { + return _doCloseDocumentList(DocumentManager.getWorkingSet(), (commandData && commandData.promptOnly)); + } + + function handleFileCloseList(documentList) { + return _doCloseDocumentList(documentList); + } + /** * @private - tracks our closing state if we get called again */ @@ -1187,6 +1193,8 @@ define(function (require, exports, module) { // Exported for unit testing only exports._parseDecoratedPath = _parseDecoratedPath; + + exports.handleFileCloseList = handleFileCloseList; // Register global commands CommandManager.register(Strings.CMD_FILE_OPEN, Commands.FILE_OPEN, handleFileOpen); diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 30523bf82a5..51b75206c31 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -316,19 +316,12 @@ define(function (require, exports, module) { // Dispatch event $(exports).triggerHandler("workingSetAddList", [uniqueFileList]); } - - /** - * Warning: low level API - use FILE_CLOSE command in most cases. - * Removes the given file from the working set list, if it was in the list. Does not change - * the current editor even if it's for this file. Does not prompt for unsaved changes. - * @param {!FileEntry} file - * @param {boolean=} true to suppress redraw after removal - */ - function removeFromWorkingSet(file, suppressRedraw) { + + function _removeFromArrays(file) { // If doc isn't in working set, do nothing var index = findInWorkingSet(file.fullPath); if (index === -1) { - return; + return false; } // Remove @@ -336,9 +329,29 @@ define(function (require, exports, module) { _workingSetMRUOrder.splice(findInWorkingSet(file.fullPath, _workingSetMRUOrder), 1); _workingSetAddedOrder.splice(findInWorkingSet(file.fullPath, _workingSetAddedOrder), 1); + return true; + } + + function removeFromWorkingSet(file, suppressRedraw) { + if (_removeFromArrays(file)) { + $(exports).triggerHandler("workingSetRemove", [file, suppressRedraw]); + } + } + + function closeDocuments(fileList) { + + if (!fileList) { + return; + } + + fileList.forEach(function (file) { + _removeFromArrays(file); + }); + // Dispatch event - $(exports).triggerHandler("workingSetRemove", [file, suppressRedraw]); + $(exports).triggerHandler("workingSetRemoveList", [fileList]); } + /** * Removes all files from the working set list. @@ -569,7 +582,6 @@ define(function (require, exports, module) { _removeAllFromWorkingSet(); } - /** * Cleans up any loose Documents whose only ref is its own master Editor, and that Editor is not * rooted in the UI anywhere. This can happen if the Editor is auto-created via Document APIs that @@ -817,43 +829,32 @@ define(function (require, exports, module) { * @param {boolean} isFolder True if path is a folder; False if it is a file. */ function notifyPathNameChanged(oldName, newName, isFolder) { - var i, path; - // Update open documents. This will update _currentDocument too, since // the current document is always open. var keysToDelete = []; - for (path in _openDocuments) { - if (_openDocuments.hasOwnProperty(path)) { - if (FileUtils.isAffectedWhenRenaming(path, oldName, newName, isFolder)) { - var doc = _openDocuments[path]; - - // Copy value to new key - var newKey = path.replace(oldName, newName); - _openDocuments[newKey] = doc; - - keysToDelete.push(path); - - // Update document file - FileUtils.updateFileEntryPath(doc.file, oldName, newName, isFolder); - doc._notifyFilePathChanged(); - - if (!isFolder) { - // If the path name is a file, there can only be one matched entry in the open document - // list, which we just updated. Break out of the for .. in loop. - break; - } - } + CollectionUtils.forEach(_openDocuments, function (doc, path) { + if (FileUtils.isAffectedWhenRenaming(path, oldName, newName, isFolder)) { + // Copy value to new key + var newKey = path.replace(oldName, newName); + _openDocuments[newKey] = doc; + + keysToDelete.push(path); + + // Update document file + FileUtils.updateFileEntryPath(doc.file, oldName, newName, isFolder); + doc._notifyFilePathChanged(); } - } + }); + // Delete the old keys - for (i = 0; i < keysToDelete.length; i++) { - delete _openDocuments[keysToDelete[i]]; - } + keysToDelete.forEach(function (fullPath) { + delete _openDocuments[fullPath]; + }); // Update working set - for (i = 0; i < _workingSet.length; i++) { - FileUtils.updateFileEntryPath(_workingSet[i], oldName, newName, isFolder); - } + _workingSet.forEach(function (fileEntry) { + FileUtils.updateFileEntryPath(fileEntry, oldName, newName, isFolder); + }); // Send a "fileNameChanged" event. This will trigger the views to update. $(exports).triggerHandler("fileNameChange", [oldName, newName]); @@ -951,6 +952,7 @@ define(function (require, exports, module) { exports.addToWorkingSet = addToWorkingSet; exports.addListToWorkingSet = addListToWorkingSet; exports.removeFromWorkingSet = removeFromWorkingSet; + exports.closeDocuments = closeDocuments; exports.getNextPrevFile = getNextPrevFile; exports.swapWorkingSetIndexes = swapWorkingSetIndexes; exports.sortWorkingSet = sortWorkingSet; diff --git a/src/extensions/default/CloseOthers/main.js b/src/extensions/default/CloseOthers/main.js index ae708456e84..66d1028d20d 100644 --- a/src/extensions/default/CloseOthers/main.js +++ b/src/extensions/default/CloseOthers/main.js @@ -31,57 +31,53 @@ define(function (require, exports, module) { CommandManager = brackets.getModule("command/CommandManager"), Commands = brackets.getModule("command/Commands"), dm = brackets.getModule("document/DocumentManager"), + docCH = brackets.getModule("document/DocumentCommandHandlers"), + strings = brackets.getModule("i18n!nls/strings"), settings = JSON.parse(require("text!settings.json")), - working_set_cmenu = Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_MENU); + working_set_cmenu = Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_MENU), + close_others = "file.close_others", + close_above = "file.close_above", + close_below = "file.close_below"; function handleClose(mode) { var targetIndex = dm.findInWorkingSet(dm.getCurrentDocument().file.fullPath), workingSet = dm.getWorkingSet().slice(0), - start = (mode === "close_below") ? (targetIndex + 1) : 0, - end = (mode === "close_above") ? (targetIndex) : (workingSet.length), - unsavedDocs = [], - doc, + start = (mode === close_below) ? (targetIndex + 1) : 0, + end = (mode === close_above) ? (targetIndex) : (workingSet.length), + docList = [], i; - if (mode === "close_others") { + if (mode === close_others) { end--; workingSet.splice(targetIndex, 1); } for (i = start; i < end; i++) { - doc = dm.getOpenDocumentForPath(workingSet[i].fullPath); - - if (doc && doc.isDirty) { - unsavedDocs.push(doc); - } + docList.push(workingSet[i]); } - CommandManager.execute(Commands.FILE_CLOSE_ALL, {promptOnly: true, unsavedDocs: unsavedDocs}).done(function () { - for (i = start; i < end; i++) { - dm.removeFromWorkingSet(workingSet[i]); - } - }); + docCH.handleFileCloseList(docList); } if (settings.close_below) { - CommandManager.register("Close Others Below", "file.close_below", function () { - handleClose("close_below"); + CommandManager.register(strings.CMD_FILE_CLOSE_BELOW, close_below, function () { + handleClose(close_below); }); - working_set_cmenu.addMenuItem("file.close_below", "", Menus.AFTER, Commands.FILE_CLOSE); + working_set_cmenu.addMenuItem(close_below, "", Menus.AFTER, Commands.FILE_CLOSE); } if (settings.close_others) { - CommandManager.register("Close Others", "file.close_others", function () { - handleClose("close_others"); + CommandManager.register(strings.CMD_FILE_CLOSE_OTHERS, close_others, function () { + handleClose(close_others); }); - working_set_cmenu.addMenuItem("file.close_others", "", Menus.AFTER, Commands.FILE_CLOSE); + working_set_cmenu.addMenuItem(close_others, "", Menus.AFTER, Commands.FILE_CLOSE); } if (settings.close_above) { - CommandManager.register("Close Others Above", "file.close_above", function () { - handleClose("close_above"); + CommandManager.register(strings.CMD_FILE_CLOSE_ABOVE, close_above, function () { + handleClose(close_above); }); - working_set_cmenu.addMenuItem("file.close_above", "", Menus.AFTER, Commands.FILE_CLOSE); + working_set_cmenu.addMenuItem(close_above, "", Menus.AFTER, Commands.FILE_CLOSE); } }); \ No newline at end of file diff --git a/src/extensions/default/CloseOthers/settings.json b/src/extensions/default/CloseOthers/settings.json index 5c12eb088a1..d2250e6e2a6 100644 --- a/src/extensions/default/CloseOthers/settings.json +++ b/src/extensions/default/CloseOthers/settings.json @@ -1,5 +1,5 @@ { "close_others": true, - "close_above": false, - "close_below": false + "close_above": true, + "close_below": true } \ No newline at end of file diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 51ea079cd54..d14f35930b1 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -179,6 +179,9 @@ define({ "CMD_OPEN_FOLDER" : "Open Folder\u2026", "CMD_FILE_CLOSE" : "Close", "CMD_FILE_CLOSE_ALL" : "Close All", + "CMD_FILE_CLOSE_OTHERS" : "Close Others", + "CMD_FILE_CLOSE_ABOVE" : "Close Others Above", + "CMD_FILE_CLOSE_BELOW" : "Close Others Below", "CMD_FILE_SAVE" : "Save", "CMD_FILE_SAVE_ALL" : "Save All", "CMD_FILE_SAVE_AS" : "Save As\u2026", From 0f0d60e2b19698c8b79bd9f45007ee6debc57c61 Mon Sep 17 00:00:00 2001 From: larz0 Date: Sat, 24 Aug 2013 10:48:25 -0700 Subject: [PATCH 0004/1140] Applied tweaks. --- src/styles/brackets_colors.less | 3 +- src/styles/brackets_patterns_override.less | 38 ++++++++++++++++------ 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/styles/brackets_colors.less b/src/styles/brackets_colors.less index 9d851701399..b5cc3a7900a 100644 --- a/src/styles/brackets_colors.less +++ b/src/styles/brackets_colors.less @@ -70,6 +70,8 @@ @tc-icon-down: 0.5; @tc-disabled-opacity: 0.3; +@tc-link: #0083e8; +@tc-link-hover: #0083e8; @tc-dropdown-shadow: 0 3px 9px rgba(0, 0, 0, 0.24); @tc-gray-panel: #dfe2e2; @tc-gray-panel-border: rgba(0, 0, 0, 0.12); @@ -110,4 +112,3 @@ @tc-light-weight-quiet-text: #777; @tc-warning-background: #FDF5CC; @tc-warning-text: #635301; - diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 542ddad08cd..f8751673474 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -31,6 +31,20 @@ * */ +// Links +// ------------------------- + +a { + color: @tc-link; + text-decoration: none; +} + +a:hover, +a:focus { + color: @tc-link-hover; + text-decoration: underline; +} + .panel { .vbox; .box-flex(1); @@ -392,6 +406,7 @@ background-color: @tc-gray-panel; border-top: 1px solid @tc-gray-panel-separator; box-shadow: none; + padding: 10px 15px 12px; white-space: nowrap; } @@ -430,6 +445,7 @@ .modal-backdrop { opacity: 0; } + .modal-backdrop:last-child { /* Only show the last modal backdrop */ opacity: 0.5; @@ -440,17 +456,17 @@ color: @tc-light-weight-text; margin-bottom: 0; margin-top: 0; - font-size: 26px; - line-height: 40px; - font-weight: @font-weight-light; + font-size: 22px; + line-height: 30px; + font-weight: normal; } .dialog-message { - color: @tc-light-weight-text; + color: @tc-text; font-size: 14px; line-height: 20px; margin-bottom: 20px; - font-weight: @font-weight-light; + font-weight: normal; } .dialog-message li { @@ -658,16 +674,16 @@ width: 220px; } .ext-name { - color: #000; + color: @tc-text; display: block; font-size: 15px; - font-weight: @font-weight-light; + font-weight: normal; .user-select(text); cursor: text; } .ext-desc { - color: #000; - font-weight: @font-weight-light; + color: @tc-text; + font-weight: normal; width: auto; .user-select(text); cursor: text; @@ -727,7 +743,7 @@ } .about-contributors { min-height: 100px; - + a { text-decoration: none; } @@ -778,6 +794,8 @@ input[type="color"], border: 1px solid @tc-input-border; color: @tc-text; font-size: @baseFontSize + 1px; + font-weight: @font-weight-semibold; + -webkit-font-smoothing: antialiased; .border-radius(@tc-control-border-radius); .box-shadow(@tc-input-inner-shadow); .transition(~"border linear 0s, box-shadow linear 0s"); From 969a4f920b6ddd7a49bbafa2bda0a570c8382858 Mon Sep 17 00:00:00 2001 From: larz0 Date: Sat, 24 Aug 2013 10:52:39 -0700 Subject: [PATCH 0005/1140] Made comment consistent with rest of the coments. --- src/styles/brackets_patterns_override.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index f8751673474..64678845820 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -31,8 +31,7 @@ * */ -// Links -// ------------------------- +/* Links */ a { color: @tc-link; From e9153193d5abd90715fef6f95a5246f795d0bb60 Mon Sep 17 00:00:00 2001 From: larz0 Date: Sat, 24 Aug 2013 11:08:45 -0700 Subject: [PATCH 0006/1140] Styled link focus state. --- src/styles/brackets_patterns_override.less | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 64678845820..a3f0d2455e5 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -38,12 +38,19 @@ a { text-decoration: none; } -a:hover, -a:focus { +a:hover { color: @tc-link-hover; text-decoration: underline; } +a:focus { + color: @tc-link-hover; + outline: 0; + border-radius: 3px; + box-shadow: @tc-input-glow; + text-decoration: none; +} + .panel { .vbox; .box-flex(1); From e8fae975c2ec09c6452f1a15574c3a178fd850ec Mon Sep 17 00:00:00 2001 From: sathyamoorthi Date: Sun, 25 Aug 2013 09:54:50 +0530 Subject: [PATCH 0007/1140] naming convention changes --- src/document/DocumentCommandHandlers.js | 2 +- src/document/DocumentManager.js | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index e3e3f2fb0b5..6a4d805d772 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -992,7 +992,7 @@ define(function (require, exports, module) { // guarantees that handlers run in the order they are added. result.done(function () { if (!promptOnly) { - DocumentManager.closeDocuments(list); + DocumentManager.removeFilesFromWorkingSet(list); } }); diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 51b75206c31..6d7179a18fe 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -317,7 +317,7 @@ define(function (require, exports, module) { $(exports).triggerHandler("workingSetAddList", [uniqueFileList]); } - function _removeFromArrays(file) { + function _internalRemoveFromWorkingSet(file) { // If doc isn't in working set, do nothing var index = findInWorkingSet(file.fullPath); if (index === -1) { @@ -333,19 +333,18 @@ define(function (require, exports, module) { } function removeFromWorkingSet(file, suppressRedraw) { - if (_removeFromArrays(file)) { + if (_internalRemoveFromWorkingSet(file)) { $(exports).triggerHandler("workingSetRemove", [file, suppressRedraw]); } } - function closeDocuments(fileList) { - + function removeFilesFromWorkingSet(fileList) { if (!fileList) { return; } fileList.forEach(function (file) { - _removeFromArrays(file); + _internalRemoveFromWorkingSet(file); }); // Dispatch event @@ -952,7 +951,7 @@ define(function (require, exports, module) { exports.addToWorkingSet = addToWorkingSet; exports.addListToWorkingSet = addListToWorkingSet; exports.removeFromWorkingSet = removeFromWorkingSet; - exports.closeDocuments = closeDocuments; + exports.removeFilesFromWorkingSet = removeFilesFromWorkingSet; exports.getNextPrevFile = getNextPrevFile; exports.swapWorkingSetIndexes = swapWorkingSetIndexes; exports.sortWorkingSet = sortWorkingSet; From 9e412f06ca2145dc67d048e3397fadaf17c86d80 Mon Sep 17 00:00:00 2001 From: sathyamoorthi Date: Wed, 28 Aug 2013 12:22:18 +0530 Subject: [PATCH 0008/1140] removeFromWrokingSet() changed to handle array of files. --- src/document/DocumentCommandHandlers.js | 2 +- src/document/DocumentManager.js | 32 ++++++++++--------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index 63d34c5f416..7e7347523b6 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -992,7 +992,7 @@ define(function (require, exports, module) { // guarantees that handlers run in the order they are added. result.done(function () { if (!promptOnly) { - DocumentManager.removeFilesFromWorkingSet(list); + DocumentManager.removeFromWorkingSet(list); } }); diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 6d7179a18fe..b5337ffc5a2 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -331,26 +331,21 @@ define(function (require, exports, module) { return true; } - - function removeFromWorkingSet(file, suppressRedraw) { - if (_internalRemoveFromWorkingSet(file)) { - $(exports).triggerHandler("workingSetRemove", [file, suppressRedraw]); - } - } - - function removeFilesFromWorkingSet(fileList) { - if (!fileList) { - return; - } - - fileList.forEach(function (file) { - _internalRemoveFromWorkingSet(file); - }); - // Dispatch event - $(exports).triggerHandler("workingSetRemoveList", [fileList]); + function removeFromWorkingSet(content, suppressRedraw) { + if (content) { + if ($.isArray(content)) { + content.forEach(function (file) { + _internalRemoveFromWorkingSet(file); + }); + + $(exports).triggerHandler("workingSetRemoveList", [content]); + + } else if (_internalRemoveFromWorkingSet(content)) { + $(exports).triggerHandler("workingSetRemove", [content, suppressRedraw]); + } + } } - /** * Removes all files from the working set list. @@ -951,7 +946,6 @@ define(function (require, exports, module) { exports.addToWorkingSet = addToWorkingSet; exports.addListToWorkingSet = addListToWorkingSet; exports.removeFromWorkingSet = removeFromWorkingSet; - exports.removeFilesFromWorkingSet = removeFilesFromWorkingSet; exports.getNextPrevFile = getNextPrevFile; exports.swapWorkingSetIndexes = swapWorkingSetIndexes; exports.sortWorkingSet = sortWorkingSet; From 6594993b51f972d55a258e20b89e80974ff4becc Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Wed, 28 Aug 2013 13:47:22 -0700 Subject: [PATCH 0009/1140] Fixed conflicts. --- src/styles/brackets_patterns_override.less | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index fe90b6f6e51..2abb5f8e983 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -701,31 +701,18 @@ a:focus { width: 220px; } .ext-name { -<<<<<<< HEAD color: @tc-text; -======= ->>>>>>> 60dc6b72ff1ffb22b3382475a9ffebacc1364fed display: block; - color: #000; font-size: 15px; -<<<<<<< HEAD font-weight: normal; -======= - font-weight: @font-weight-light; .less-faint-on-win(); ->>>>>>> 60dc6b72ff1ffb22b3382475a9ffebacc1364fed .user-select(text); cursor: text; } .ext-desc { -<<<<<<< HEAD color: @tc-text; font-weight: normal; -======= - color: #000; - font-weight: @font-weight-light; .less-faint-on-win(); ->>>>>>> 60dc6b72ff1ffb22b3382475a9ffebacc1364fed width: auto; .user-select(text); cursor: text; From 574b63c3d1df976760b143d04e853081f97662f4 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Wed, 28 Aug 2013 13:48:16 -0700 Subject: [PATCH 0010/1140] Cleaned up spaces. --- src/styles/brackets.less | 194 ++++++++++----------- src/styles/brackets_patterns_override.less | 8 +- 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/src/styles/brackets.less b/src/styles/brackets.less index b38e9dd477b..3e3968a8633 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -1,28 +1,28 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /* - * This file first imports all of the shared LESS/CSS, and then defines + * This file first imports all of the shared LESS/CSS, and then defines * version-specific layout (e.g. layout for the App shell, or layout for * the In-Browser version on Firefox). * @@ -31,7 +31,7 @@ * * Anything that is general/reusable should be pushed up into a LESS file * in the "styles" directory. See "brackets_shared.less" for the organization - * + * * Date: @DATE */ @@ -46,16 +46,16 @@ html, body { height: 100%; overflow: hidden; - + /* Turn off selection for UI elements */ .user-select(none); - + /* And make sure we get a pointer cursor even over text */ cursor: default; - + /* Turn off subpixel antialiasing on Mac since it flickers during animations. */ -webkit-font-smoothing: antialiased; - + /* This is a hack to avoid flicker when animations (like inline editors) that use the GPU complete. It seems that we have to put it here rather than on the animated element in order to prevent the entire window from flashing. @@ -75,11 +75,11 @@ body { width: 100%; height: 100%; z-index: @z-index-brackets-panel-resizer; - + &.horz-resizing { cursor: col-resize; } - + &.vert-resizing { cursor: row-resize; } @@ -115,7 +115,7 @@ a, img { #titlebar, .modal-bar { border-bottom: 1px solid @tc-gray-panel-border; box-shadow: @tc-small-shadow-bottom; - + // Make sure the bottom box-shadow goes above the editor (position: relative needed to start a new stacking group) position: relative; z-index: @z-index-brackets-toolbar; @@ -133,17 +133,17 @@ a, img { color: @tc-text; font-family: @sansFontFamily; font-size: 11px; - line-height: 25px; + line-height: 25px; height: 26px; overflow: hidden; } - + #status-info { color: @tc-text; left: 10px; position: absolute; white-space: nowrap; - + div { display: inline; } @@ -160,7 +160,7 @@ a, img { right: 0; text-align: right; white-space: nowrap; - + > div { border-left: 1px solid rgba(0, 0, 0, 0.1); float: right; @@ -171,7 +171,7 @@ a, img { margin: 6px 10px; padding: 0; } - + #status-language { border-right: 1px solid rgba(0, 0, 0, 0.1); } @@ -230,7 +230,7 @@ a, img { #editor-holder { position: relative; - + /* Placeholder shown when there is no editor open */ #not-editor { height: 100%; @@ -266,7 +266,7 @@ a, img { border-top-style: solid; border-width: 1px; border-color: @tc-gray-panel-border; - + .toolbar { background-color: @tc-gray-panel-top-bar; border-bottom: @tc-gray-panel-top-bar-shadow; @@ -286,7 +286,7 @@ a, img { top: 6px; } } - + .table-container { height: 170px; overflow: auto; @@ -296,12 +296,12 @@ a, img { padding-left: @base-padding; padding-right: @base-padding; } - + .highlight { background: #fff; border-radius: 2px; } - + tr.selected td { background-color: @tc-highlight; } @@ -313,7 +313,7 @@ a, img { } #toolbar-go-live { - // background-position is 0 0 for 24x24 icons + // background-position is 0 0 for 24x24 icons // Default icon is for the 'disconnected' state // The 'connecting failed' (.warning) state also maps here .sprite-icon(0, 0, 24px, 24px, "images/live_development_sprites.svg"); @@ -358,7 +358,7 @@ a, img { opacity: 0; cursor: col-resize; } - + #project-files-header { border-top: 1px solid #56595a; padding: 8px 0 9px 12px; @@ -372,48 +372,48 @@ a, img { padding: 0px; max-height: 200px; // TODO (Issue #276): it would be nicer to have this be 50%, but that doesn't seem to work - + ul { list-style-type: none; margin: 0; padding-bottom: 23px; } - + li { position: relative; // so that children can be positioned absolute line-height: 18px; padding: 0 0 0 8px; min-height: 18px; vertical-align: baseline; - + &.selected a { color: @open-working-file-name-highlight; } - + &.selected .extension { color: @open-working-file-ext-highlight; } } - + a { color: #fff; - + font-size: 13px; text-decoration: none; - + display: block; height: 16px; line-height: 15px; margin-left: 18px; padding: 3px (@sidebar-triangle-size * 2) 3px 0; - + cursor: default; .directory { font-size: 11px; } } - + .extension, .directory { color: @project-panel-text-2; } @@ -436,18 +436,18 @@ a, img { .sidebar-selection-triangle.triangle-visible:before { content: ""; - + border-top: @sidebar-triangle-size solid transparent; - border-bottom: (@sidebar-triangle-size - 1) solid transparent; + border-bottom: (@sidebar-triangle-size - 1) solid transparent; border-left: @sidebar-triangle-size solid #2D2E30; - + display: block; position: absolute; top: -1px; right: -9px; width: 0; height: 0; - + .scale-x(0.8, right, top); } @@ -458,15 +458,15 @@ a, img { #project-files-container { .box-flex(1); - + .jstree-brackets li > a { padding-right: @sidebar-triangle-size * 2; } - + ul { padding-left: 8px; } - + > ul { padding-bottom: 24px; } @@ -478,13 +478,13 @@ a, img { height: 5px; position: fixed; z-index: @z-index-brackets-scroller-shadow; - + &.top { #gradient > .vertical(rgba(0,0,0,0.1), rgba(0,0,0,0)); background-position: 0 -5px; background-color: transparent; /* override background-color: @endColor from #gradient.vertical */ } - + &.bottom { #gradient > .vertical(rgba(0,0,0,0), rgba(0,0,0,0.1)); background-position: 0 5px; @@ -495,7 +495,7 @@ a, img { @jstree-sprite-size: 18px; // this is hardcoded in jsTree's JS code -/** Classes for icons from jsTreeSprites.svg +/** Classes for icons from jsTreeSprites.svg */ .jstree-sprite { background-image: url("images/jsTreeSprites.svg"); @@ -520,7 +520,7 @@ a, img { -webkit-filter: drop-shadow(0 1px 1px rgba(0, 0, 0, 0.36)); } -/** Classes for icons from bracketSprites.png +/** Classes for icons from bracketSprites.png */ .bracket-sprite { background-image: url("images/close_btn.svg"); @@ -539,19 +539,19 @@ a, img { position: absolute; left: 0px; top: 1px; - + &.dirty { background-position: -30px 0; } - + &.can-close { background-position: 0 0; } - + &.can-close:hover { background-position: -15px 0; } - + &.can-close:active { background-position: -15px 0; opacity: @tc-icon-down; @@ -571,7 +571,7 @@ a, img { // Make the animation use the GPU--especially important for retina. -webkit-transform: translateZ(0); transform: translateZ(0); - + transition: height 250ms cubic-bezier(0, 1.02, 0.6, 1); } @@ -579,32 +579,32 @@ a, img { /* remove CodeMirror default height: 300px */ height: auto; } - + .inline-editor-header { padding: 10px 10px 0px 10px; - + .filename { font-family: @sansFontFamily; font-size: 1.1em; color: @inline-color-1; - + // Filename header is clickable (it's an tag, so we get underscore on hover by // default; but the hand cursor is shut off by Bootstrap's reset stylesheet) cursor: pointer; - + .dirty-indicator { .bracket-sprite; display: inline-block; background-position: -32px 0; padding-top: 3px; } - + .line-number { color: @inline-color-2; } } } - + .shadow { display: block; height: 4px; @@ -614,20 +614,20 @@ a, img { left: 0; z-index: @z-index-brackets-inline-editor-shadow; } - + .shadow.top { top: 0px; background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0)); } - + .shadow.bottom { bottom: 0px; background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1)); } - + .CodeMirror-scroll { background-color: transparent; - + .CodeMirror-linenumbers { background-color: @inline-background-color-1; } @@ -637,7 +637,7 @@ a, img { /* CSSInlineEditor rule list */ .related-container { @top-margin: 12px; - + float: right; position: relative; min-height: 100%; @@ -646,7 +646,7 @@ a, img { max-width: 50%; overflow: hidden; background: @inline-background-color-2; - + .selection { width: 100%; background: #d0d5d5; @@ -654,12 +654,12 @@ a, img { border-top: 1px solid darken(@inline-background-color-3, @bc-color-step-size); border-bottom: 1px solid lighten(@inline-background-color-3, @bc-color-step-size); top: @top-margin; - + &.animate { transition: top 0.1s ease-out; } } - + /* * CSS triangle hack with anti-alias workarounds: * (a) Use selection-background-color instead of transparent. @@ -677,20 +677,20 @@ a, img { top: 50%; .scale-x(0.9, left, top); } - + .related { font-size: 12px; position: absolute; top: 0; left: 1px; width: 100%; - + ul { margin: 0; padding: @top-margin 0px; list-style: none; } - + li { color: @inline-color-2; margin: 0; @@ -699,7 +699,7 @@ a, img { text-overflow: ellipsis; white-space: nowrap; } - + .selected { color: @inline-color-3; transition: color 0.1s ease-out .15s; @@ -828,32 +828,32 @@ a, img { position: absolute; left: 0; right: 0; - top: 0; + top: 0; -webkit-transform: translate(0, -44px); transform: translate(0, -44px); transition: -webkit-transform 266ms cubic-bezier(0, 0.56, 0, 1); transition: transform 266ms cubic-bezier(0, 0.56, 0, 1); - + body:not(.has-appshell-menus) & { top: 37px; - } + } } .modal-bar { display: block; text-align: left; - + font-family: @sansFontFamily; font-size: 14px; color: @tc-text; background: @tc-gray-panel; - overflow: hidden; + overflow: hidden; padding: 5px 4px 4px 14px; - + -webkit-transform: translate(0, 0); // Prefix still required. transition: -webkit-transform 66ms cubic-bezier(0, 0.62, 0.04, 0.99); - z-index: @z-index-brackets-modalbar; - + z-index: @z-index-brackets-modalbar; + body.in-browser &, body:not(.has-appshell-menus) & { // Separator line between us and the HTML menu/titlebar above @@ -867,10 +867,10 @@ a, img { width: 20em; margin: 5px 5px 0; position: relative; - top: -3px; + top: -3px; &.no-results { border: 1px solid #bc0023; - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.12), 0 0 0 2px rgba(255, 0, 120, 0.5); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.12), 0 0 0 2px rgba(255, 0, 120, 0.5); } } @@ -879,7 +879,7 @@ a, img { } .modal-bar .error { display: none; - + .alert { padding-top: 4px; padding-bottom: 4px; @@ -910,19 +910,19 @@ a, img { /* Quick Open search bar & dropdown */ .smart_autocomplete_container { - + // the borders show up even if the container is empty, must set height to zero using JS. border: 1px solid @tc-gray-panel-border; - + background-color: @tc-gray-panel; border-radius: 0 0 4px 4px; box-shadow: @tc-normal-shadow-bottom; - + // so that border won't show when height is 0. - box-sizing: border-box; - + box-sizing: border-box; + // using this to fix the spacing that breaks item seperators and had to use !important to override inline css - width: 434px !important; + width: 434px !important; /* smart auto complete doesn't correctly position the container * so these specific padding and margin values are necessary*/ @@ -943,11 +943,11 @@ a, img { cursor: default; padding: 6px 10px; } - + li:nth-child(odd) { background-color: #e6e9e9; } - + li.smart_autocomplete_highlight { background-color: @tc-highlight; } @@ -978,7 +978,7 @@ a, img { -webkit-animation: spinner-sprites-12 1.2s steps(10) infinite; visibility: visible; } - + &.large { width: 36px; height: 36px; @@ -991,7 +991,7 @@ a, img { } } // Retina versions -@media only screen and (-webkit-min-device-pixel-ratio: 2), +@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) { .spinner { background-image: url("images/spinner_small_sprites12@2x.png"); diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 2abb5f8e983..046c9fd46f2 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -44,7 +44,7 @@ a:hover { } a:focus { - color: @tc-link-hover; + color: @tc-link-hover; outline: 0; border-radius: 3px; box-shadow: @tc-input-glow; @@ -163,8 +163,8 @@ a:focus { > a:active { background-color: rgba(0, 0, 0, 0.66) !important; } - } - + } + .bottom-buttons { position: absolute; bottom: 5px; @@ -503,7 +503,7 @@ a:focus { .dialog-filename { word-wrap: break-word; - + font-weight: normal; body.platform-win & { // maintain contrast next to ".less-faint-on-win()" workaround font-weight: @font-weight-semibold; From 3078fcfb8676cfba20b1e7a6370d7e7c784b422c Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Fri, 6 Sep 2013 14:37:43 -0700 Subject: [PATCH 0011/1140] Fixed SHAs. --- src/extensions/default/JavaScriptCodeHints/thirdparty/acorn | 2 +- src/extensions/default/JavaScriptCodeHints/thirdparty/tern | 2 +- src/thirdparty/CodeMirror2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn b/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn index a84e21e0ffc..c152be4a2e8 160000 --- a/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn +++ b/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn @@ -1 +1 @@ -Subproject commit a84e21e0ffc415e2eb729aad88097a1c7ecdb568 +Subproject commit c152be4a2e8383a21c573ba0b2495afc9ae84643 diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern index fb2bb83134c..21c9f963b94 160000 --- a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern +++ b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern @@ -1 +1 @@ -Subproject commit fb2bb83134c1a1dec46459da7d22189974ea1ec5 +Subproject commit 21c9f963b94f6ad077f95d182e9b4568c0d3874d diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2 index a71f5fced23..c8c7fc18af5 160000 --- a/src/thirdparty/CodeMirror2 +++ b/src/thirdparty/CodeMirror2 @@ -1 +1 @@ -Subproject commit a71f5fced2348a617e49a84e3252feb8702e43f6 +Subproject commit c8c7fc18af5f025733a930fea202d98e54e12a5e From 5f406fc78f663a59c4b7177daf1d308ad5c98176 Mon Sep 17 00:00:00 2001 From: Mohammad Yaghobi Date: Tue, 10 Sep 2013 19:11:32 +0430 Subject: [PATCH 0012/1140] Persian language Translated to Persian language --- src/nls/fa-ir/strings.js | 476 +++++++++++++++++++++++++++++++++++++++ src/nls/fa-ir/urls.js | 32 +++ src/nls/strings.js | 1 + 3 files changed, 509 insertions(+) create mode 100644 src/nls/fa-ir/strings.js create mode 100644 src/nls/fa-ir/urls.js diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js new file mode 100644 index 00000000000..7eac7d73d48 --- /dev/null +++ b/src/nls/fa-ir/strings.js @@ -0,0 +1,476 @@ +/* + * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ +/*global define */ +//********************* Translated by: Mohammad.Yaghobi +//********************* info@pgrammer.com --- m.yaghobi.abc@gmail.com + +define({ + + /** + * Errors + */ + + // General file io error strings + "APP_NAME" : "براکتس", + "GENERIC_ERROR" : "(خطا {0})", + "NOT_FOUND_ERR" : "پرونده پیدا نشد.", + "NOT_READABLE_ERR" : "فایل قابل خواندن نیست.", + "NO_MODIFICATION_ALLOWED_ERR" : "دایرکتوری هدف قابل ویرایش نیست.", + "NO_MODIFICATION_ALLOWED_ERR_FILE" : "دسترسی های تعریف شده برای شما اجازه تغییرات را نمی دهند.", + "FILE_EXISTS_ERR" : "پرونده یا پوشه مد نظر موجود می باشد.", + "FILE" : "پرونده", + "DIRECTORY" : "پوشه", + + // Project error strings + "ERROR_LOADING_PROJECT" : "خطا در بارگذاری پروژه", + "OPEN_DIALOG_ERROR" : "خطا در بازکردن پرونده خوان. (خطا {0})", + "REQUEST_NATIVE_FILE_SYSTEM_ERROR" : "خطا بهنگام بارگذاری پوشه {0}. (خطا {1})", + "READ_DIRECTORY_ENTRIES_ERROR" : "بروز خطا در خواندن اطلاعات پوشه {0}. (خطا {1})", + + // File open/save error string + "ERROR_OPENING_FILE_TITLE" : "خطا در بازکردن پرونده", + "ERROR_OPENING_FILE" : "خطا بهنگام تلاش برای باز کردن پرونده {0}. {1}", + "ERROR_OPENING_FILES" : "خطا بهنگام بارگذاری پرونده های زیر:", + "ERROR_RELOADING_FILE_TITLE" : "خطا در بارگذاری تغییرات از حافظه", + "ERROR_RELOADING_FILE" : "بروز خطا بهنگام تلاش برای بارگذاری پرونده {0}. {1}", + "ERROR_SAVING_FILE_TITLE" : "خطا در ذخیره سازی پرونده", + "ERROR_SAVING_FILE" : "بروز خطا بهنگام تلاش جهت ذخیره پرونده {0}. {1}", + "ERROR_RENAMING_FILE_TITLE" : "خطا در تغییر نام پرونده", + "ERROR_RENAMING_FILE" : "بروز خطا بهنگام تلاش برای تغییر نام پرونده {0}. {1}", + "ERROR_DELETING_FILE_TITLE" : "خطا در حذف پرونده", + "ERROR_DELETING_FILE" : "بروز خطا بهنگام تلاش برای جذف پرونده {0}. {1}", + "INVALID_FILENAME_TITLE" : "مقدار وارد شده {0} معتبر نمی باشد", + "INVALID_FILENAME_MESSAGE" : "نام پرونده نمی تواند شامل مقادیر زیر باشد: /?*:;{}<>\\| or use any system reserved words.", + "FILE_ALREADY_EXISTS" : "پرونده ای با نام {0} {1} وجود دارد.", + "ERROR_CREATING_FILE_TITLE" : "خطا در ایجاد {0}", + "ERROR_CREATING_FILE" : "بروز خطا بهنگام ایجاد {0} {1}. {2}", + + // Application error strings + "ERROR_IN_BROWSER_TITLE" : "!!! {APP_NAME} در مرورگرها اجرا نمی شود.", + "ERROR_IN_BROWSER" : "{APP_NAME} با HTML ساخته شده, ولی هم اکنون بعنوان یک برنامه رومیزی(desktop) اجرا می شود و شما می توانید از آن جهت ویرایش پرونده های خود استفاده نمایید.", + + // FileIndexManager error string + "ERROR_MAX_FILES_TITLE" : "خطا در فهرست بندی پرونده ها", + "ERROR_MAX_FILES" : "مقدار پرونده های قابل فهرست بندی به حداکثر رسیده بهمین علیت عملگر بهنگام فهرست بندی با خطا مواجه می شود.", + + // Live Development error strings + "ERROR_LAUNCHING_BROWSER_TITLE" : "خطا در اجرای مرورگر", + "ERROR_CANT_FIND_CHROME" : "مرورگر Google Chrome پیدا نشد. لطفا از نصب بودن آن اطمینان حاصل کنید.", + "ERROR_LAUNCHING_BROWSER" : "بروز خطا بهنگام اجرای مرورگر. (error {0})", + + "LIVE_DEVELOPMENT_ERROR_TITLE" : "خطا در پیشنمایش زنده", + "LIVE_DEVELOPMENT_RELAUNCH_TITLE" : "درحال اتصال به مرورگر", + "LIVE_DEVELOPMENT_ERROR_MESSAGE" : "به هر صورت بهنگام اتصال به حالت پیش نمایش, مرورگر Chrome احتیاج دارد به فعال بودن اشکال زدای راه دور(خطایابی راه دور).

    آیا تمایل دارید به اجرای دوباره Chrome و فعال سازی اشکال زدای راه دور(remote debugging)?", + "LIVE_DEV_LOADING_ERROR_MESSAGE" : "ناتوان در بارگذاری صفحه توسعه زنده", + "LIVE_DEV_NEED_HTML_MESSAGE" : "باز کردن پرونده HTML به منظور راه اندازی پیش نمایش زنده.", + "LIVE_DEV_NEED_BASEURL_MESSAGE" : "جهت اجرای پیش نمایش زنده بصورت پرونده در سمت سرور(server-side), می بایست یک URL پایه برای پروژه تعریف نمایید.", + "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "خطا در اجرای سرویس دهنده HTTP برای توسعه زنده پرونده ها. لطفا دوباره تلاش کنید.", + "LIVE_DEVELOPMENT_INFO_TITLE" : "به بخش پیش نمایش زنده خوش آمدید!", + "LIVE_DEVELOPMENT_INFO_MESSAGE" : "پیش نمایش زنده {APP_NAME} به مرورگر متصل شده و یک پیش نمایش از پرونده HTML شما در مرورگرتان نشان خواهد داد, و هرگونه تغییری در کدهایتان را فورا در پیش نمایش اعمال خواهد نمود.

    در این نسخه موجود {APP_NAME}, پیش نمایش تنها با مرورگر Google Chrome برای اعمال فوری مقادیر CSS files برای حالت پیش نمایش کار خواهد کرد. هرگونه تغییری در پرونده های HTML یا JavaScript بصورت خودکار بعد از ذخیر بارگذاری خواهد شد.

    (شما این پیغام را برای بار دیگر مشاهده نخواهید کرد.)", + "LIVE_DEVELOPMENT_TROUBLESHOOTING" : "برای اطلاع بیشتر, به پیوند روبرو مراجعه کنید     Troubleshooting Live Development connection errors.", + + "LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "پیش نمایش زنده", + "LIVE_DEV_STATUS_TIP_PROGRESS1" : "پیش نمایش زنده: درحال اتصال\u2026", + "LIVE_DEV_STATUS_TIP_PROGRESS2" : "پیش نمایش زنده: درحال مقدار دهی اولیه\u2026", + "LIVE_DEV_STATUS_TIP_CONNECTED" : "قطع اتصال از پیش نمایش زنده", + "LIVE_DEV_STATUS_TIP_OUT_OF_SYNC" : "پیش نمایش زنده: جهت قطع اتصال کلیک کنید (ذخیره پرونده ها جهت بروز رسانی)", + + "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS" : "پیش نمایش زنده لغو شد زیرا از برخی از ابزارهای توسعه مختص مرورگرتان استفاده کرده اید.", + "LIVE_DEV_DETACHED_TARGET_CLOSED" : "پیش نمایش زنده لغو شد زیرا پنجره یا زبانه مربوط به صفحه در مرورگر بسته شده.", + "LIVE_DEV_NAVIGATED_AWAY" : "پیش نمایش زنده لغو شد زیرا پنجره یا زبانه موجود در مرورگر آدرس دیگری را پیمایش کرده است.", + "LIVE_DEV_CLOSED_UNKNOWN_REASON" : "پیش نمایش زنده بدلیل نامشخصی لغو شد ({0})", + + "SAVE_CLOSE_TITLE" : "ذخیره تغییرات", + "SAVE_CLOSE_MESSAGE" : "آیا مایلید تغییرات داده شده در سند ذخیره گردند {0}?", + "SAVE_CLOSE_MULTI_MESSAGE" : "آیا مایلید تغییرات داده شده در پرونده های زیر، ذخیره گردند?", + "EXT_MODIFIED_TITLE" : "تغییرات خارجی", + "CONFIRM_FOLDER_DELETE_TITLE" : "تائید حذف", + "CONFIRM_FOLDER_DELETE" : "آیا مطمئنید می خواهید این پوشه حذف گردد {0}?", + "FILE_DELETED_TITLE" : "پرونده حذف گردید", + "EXT_MODIFIED_MESSAGE" : "{0} تغییراتی بر روی دیسک انجام شده, ولی تغییرات بر روی {APP_NAME} ذخیره نگردیده.

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

    آیا می خواهید تغییرات را حفظ کنید?", + + // Find, Replace, Find in Files + "SEARCH_REGEXP_INFO" : "برای جستجوی regexp از /re/ استفاده کنید", + "FIND_RESULT_COUNT" : "{0} نتایج", + "FIND_RESULT_COUNT_SINGLE" : "1 نتیجه", + "FIND_NO_RESULTS" : "بی نتیجه", + "WITH" : "با", + "BUTTON_YES" : "بله", + "BUTTON_NO" : "خیر", + "BUTTON_REPLACE_ALL" : "همه موارد\u2026", + "BUTTON_STOP" : "ایست", + "BUTTON_REPLACE" : "جایگزینی", + + "OPEN_FILE" : "باز کردن پرونده", + "SAVE_FILE_AS" : "ذخیره پرونده", + "CHOOSE_FOLDER" : "انتخاب پوشه", + + "RELEASE_NOTES" : "نکات و یادداشت های انتشار", + "NO_UPDATE_TITLE" : "بروز هستید!", + "NO_UPDATE_MESSAGE" : "شما درحال استفاده از آخرین نسخه {APP_NAME} هستید.", + + "FIND_REPLACE_TITLE_PART1" : "جایگزینی \"", + "FIND_REPLACE_TITLE_PART2" : "\" با \"", + "FIND_REPLACE_TITLE_PART3" : "\" — {2} {0} {1}", + + "FIND_IN_FILES_TITLE_PART1" : "\"", + "FIND_IN_FILES_TITLE_PART2" : "\" پیدا شد", + "FIND_IN_FILES_TITLE_PART3" : "— {0} {1} in {2} {3}", + "FIND_IN_FILES_SCOPED" : "در {0}", + "FIND_IN_FILES_NO_SCOPE" : "در پروژ]", + "FIND_IN_FILES_FILE" : "پرونده", + "FIND_IN_FILES_FILES" : "پرونده ها", + "FIND_IN_FILES_MATCH" : "تطبیق", + "FIND_IN_FILES_MATCHES" : "تطبیق ها", + "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" : "خطا بهنگام دریافت آخرین اطلاعات بروزرسانی از سرویس دهنده رخ داده. اطمینان حاصل کنید که به اینترنت متصلید و سپس دوباره تلاش کنید.", + + /** + * ProjectManager + */ + "PROJECT_LOADING" : "درحال بارگذاری\u2026", + "UNTITLED" : "عنوان گذاری نشده", + "WORKING_FILES" : "پرونده های کاری", + + /** + * Keyboard modifier names + */ + "KEYBOARD_CTRL" : "Ctrl", + "KEYBOARD_SHIFT" : "Shift", + "KEYBOARD_SPACE" : "Space", + + /** + * StatusBar strings + */ + "STATUSBAR_CURSOR_POSITION" : "خط {0}, ستون {1}", + "STATUSBAR_SELECTION_CH_SINGULAR" : " \u2014 {0} ستون انتخاب شده", + "STATUSBAR_SELECTION_CH_PLURAL" : " \u2014 {0} ستون انتخاب شده", + "STATUSBAR_SELECTION_LINE_SINGULAR" : " \u2014 {0} خط انتخاب شده", + "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_TABS" : "کلیک کنید تا طول زبانه کاراکتر ها تغییر کند", + "STATUSBAR_SPACES" : "فاصله", + "STATUSBAR_TAB_SIZE" : "اندازه زبانه", + "STATUSBAR_LINE_COUNT_SINGULAR" : "\u2014 {0} خط", + "STATUSBAR_LINE_COUNT_PLURAL" : "\u2014 {0} خط ها", + + /** + * Command Name Constants + */ + + // File menu commands + "FILE_MENU" : "پرونده", + "CMD_FILE_NEW_UNTITLED" : "جدید", + "CMD_FILE_NEW" : "پرونده جدید", + "CMD_FILE_NEW_FOLDER" : "پوشه جدید", + "CMD_FILE_OPEN" : "باز کردن\u2026", + "CMD_ADD_TO_WORKING_SET" : "افزودن به محیط کاری", + "CMD_OPEN_FOLDER" : "باز کردن پوشه\u2026", + "CMD_FILE_CLOSE" : "بستن", + "CMD_FILE_CLOSE_ALL" : "بستن همه", + "CMD_FILE_SAVE" : "ذخیره", + "CMD_FILE_SAVE_ALL" : "ذخیره همه", + "CMD_FILE_SAVE_AS" : "ذخیره همه\u2026", + "CMD_LIVE_FILE_PREVIEW" : "پیش نمایش زنده", + "CMD_LIVE_HIGHLIGHT" : "نشانه گذاری پیش نمایش", + "CMD_PROJECT_SETTINGS" : "تنظیمات پروژه\u2026", + "CMD_FILE_RENAME" : "تغییر نام", + "CMD_FILE_DELETE" : "حذف", + "CMD_INSTALL_EXTENSION" : "نصب افزونه ها\u2026", + "CMD_EXTENSION_MANAGER" : "مدیریت افزونه ها\u2026", + "CMD_FILE_REFRESH" : "تازه سازی درختی پرونده", + "CMD_QUIT" : "رها سازی", + // Used in native File menu on Windows + "CMD_EXIT" : "خروج", + + // Edit menu commands + "EDIT_MENU" : "ویرایش", + "CMD_UNDO" : "Undo", + "CMD_REDO" : "Redo", + "CMD_CUT" : "بریدن", + "CMD_COPY" : "رونوشت", + "CMD_PASTE" : "چسباندن رو نوشت", + "CMD_SELECT_ALL" : "انتخاب همه", + "CMD_SELECT_LINE" : "انتخاب خط", + "CMD_FIND" : "جستجو", + "CMD_FIND_IN_FILES" : "جستجو در پرونده ها", + "CMD_FIND_IN_SUBTREE" : "جستجو در\u2026", + "CMD_FIND_NEXT" : "بعدی", + "CMD_FIND_PREVIOUS" : "قبلی", + "CMD_REPLACE" : "جایگزینی", + "CMD_INDENT" : "برجسته سازی", + "CMD_UNINDENT" : "حذف برجستگی", + "CMD_DUPLICATE" : "دو نسخه کردن", + "CMD_DELETE_LINES" : "حذف خط", + "CMD_COMMENT" : "تعویض خط نظر", + "CMD_BLOCK_COMMENT" : "تعویض قالب نظر", + "CMD_LINE_UP" : "خط را یکی به بالا ببر", + "CMD_LINE_DOWN" : "خط را یکی به پایین ببر", + "CMD_OPEN_LINE_ABOVE" : "باز کردن خط بالا", + "CMD_OPEN_LINE_BELOW" : "باز کردن خط زیرین", + "CMD_TOGGLE_CLOSE_BRACKETS" : "پرانتزها را خودکار ببند", + "CMD_SHOW_CODE_HINTS" : "نمایش نکات کد", + + // View menu commands + "VIEW_MENU" : "نمایش", + "CMD_HIDE_SIDEBAR" : "پنهان کردن نوار", + "CMD_SHOW_SIDEBAR" : "نمایش نوار", + "CMD_INCREASE_FONT_SIZE" : "افزایش سایز نوشته ها", + "CMD_DECREASE_FONT_SIZE" : "کاهش سایز نوشته ها", + "CMD_RESTORE_FONT_SIZE" : "پیشفرض سایز نوشته ها", + "CMD_SCROLL_LINE_UP" : "حرکت به بالا", + "CMD_SCROLL_LINE_DOWN" : "حرکت به پایین", + "CMD_TOGGLE_LINE_NUMBERS" : "شماره سطرها/خط ها", + "CMD_TOGGLE_ACTIVE_LINE" : "نشانه گذاری خط/سطر فعال", + "CMD_TOGGLE_WORD_WRAP" : "شکستن کلمات", + "CMD_SORT_WORKINGSET_BY_ADDED" : "مرتب سازی بر اساس ترتیب افزودن", + "CMD_SORT_WORKINGSET_BY_NAME" : "مرتب سازی بر اساس نام", + "CMD_SORT_WORKINGSET_BY_TYPE" : "مرتب سازی بر اساس نوع", + "CMD_SORT_WORKINGSET_AUTO" : "مرتب سازی خودکار", + + // Navigate menu Commands + "NAVIGATE_MENU" : "انتقال", + "CMD_QUICK_OPEN" : "باز کردن سریع", + "CMD_GOTO_LINE" : "برو به خط", + "CMD_GOTO_DEFINITION" : "تعریف جستجوی سریع", + "CMD_TOGGLE_QUICK_EDIT" : "ویرایش سریع", + "CMD_TOGGLE_QUICK_DOCS" : "مستند گزاری سریع", + "CMD_QUICK_EDIT_PREV_MATCH" : "تطبیق یافته قبلی", + "CMD_QUICK_EDIT_NEXT_MATCH" : "تطبیق یافته بعدی", + "CMD_NEXT_DOC" : "سند بعدی", + "CMD_PREV_DOC" : "سند قبلی", + "CMD_SHOW_IN_TREE" : "نمایش در پرونده درختی", + "CMD_SHOW_IN_OS" : "نمایش در OS", + + // Help menu commands + "HELP_MENU" : "راهنما", + "CMD_CHECK_FOR_UPDATE" : "برسی برای بروزرسانی", + "CMD_HOW_TO_USE_BRACKETS" : "چگونه از {APP_NAME} استفاده کنم", + "CMD_FORUM" : "{APP_NAME} انجمن گفت گو", + "CMD_RELEASE_NOTES" : "نکات انتشار", + "CMD_REPORT_AN_ISSUE" : "گذارش یک مورد", + "CMD_SHOW_EXTENSIONS_FOLDER" : "نمایش پوشه افزونه ها", + "CMD_TWITTER" : "{TWITTER_NAME} در تویتر", + "CMD_ABOUT" : "پیرامون {APP_TITLE}", + + + // Special commands invoked by the native shell + "CMD_CLOSE_WINDOW" : "بستن پنجره", + "CMD_ABORT_QUIT" : "لغو ترک", + "CMD_BEFORE_MENUPOPUP" : "قبل از منوی Popup", + + // 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" : "بستن(بدون ذخیرهسازی)", + "RELAUNCH_CHROME" : "اجرای دوباره Chrome", + "ABOUT" : "پیرامون", + "CLOSE" : "بستن", + "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_LINE3" : "
    یادداشتهای ها، شرایط و ضوابط مربوط به نرم افزار شخص ثالث در آدرسhttp://www.adobe.com/go/thirdparty/ جهت تلفیق و بعنوان مرجع قرار داده شده.", + "ABOUT_TEXT_LINE4" : "اسناد و منابع نرم افزار در پیوند https://github.com/adobe/brackets/ در دسترس می باشد.
    ترجمه توسط: محمد یعقوبی
    info@pgrammer.com
    ", + "ABOUT_TEXT_LINE5" : "ساخته شده با \u2764 و JavaScript بدست:", + "ABOUT_TEXT_LINE6" : "بسیاری از مردم", + "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs and the Web Platform graphical logo are licensed under a Creative Commons Attribution license, CC-BY 3.0 Unported.", + "UPDATE_NOTIFICATION_TOOLTIP" : "Build جدیدی از{APP_NAME} هم اکنون در دسترس است! جهت مشاهده جزئیات کلیک کنید.", + "UPDATE_AVAILABLE_TITLE" : "بروزرسانی در دسترس است", + "UPDATE_MESSAGE" : "نسخه جدیدی از {APP_NAME} هم اکنون در دسترس است. برخی از مشخصه های آن:", + "GET_IT_NOW" : "هم اکنون دانلود کنید!", + "PROJECT_SETTINGS_TITLE" : "تنظیمات پروژه برای: {0}", + "PROJECT_SETTING_BASE_URL" : "پیش نمایش URL اصلی/پایه", + "PROJECT_SETTING_BASE_URL_HINT" : "جهت استفاده از سرویس دهنده داخلی, از url بمانند http://localhost:8000/ استفاده کنید.", + "BASEURL_ERROR_INVALID_PROTOCOL" : "پروتکول {0} با پیش نمایش زنده پشتیبانی نمی شود—لطفا از http: یا https: استفاده نمایید.", + "BASEURL_ERROR_SEARCH_DISALLOWED" : "URL اصلی نمی تواند شامل پارامترهای جستجو بمانند \"{0}\" باشد.", + "BASEURL_ERROR_HASH_DISALLOWED" : "URL اصلی نمی تواند hashes مشابه \"{0}\" داشته باشد.", + "BASEURL_ERROR_INVALID_CHAR" : "برخی کاراکتر های خاص شبیه '{0}' می بایست %-encoded.", + "BASEURL_ERROR_UNKOWN_ERROR" : "خطای ناشناخته در URL اصلی/پایه", + + // Extension Management strings + "INSTALL" : "نصب", + "UPDATE" : "بروزرسانی", + "REMOVE" : "حذف", + "OVERWRITE" : "دوباره نویسی", + "CANT_REMOVE_DEV" : "افزونه های موجود در پوشه \"dev\" می بایست بصورت دستی حذف گردند.", + "CANT_UPDATE" : "بروز رسانی سازگار با این نسخه از {APP_NAME} نیست.", + "INSTALL_EXTENSION_TITLE" : "نصب افزونه", + "UPDATE_EXTENSION_TITLE" : "بروز رسانی افزونه", + "INSTALL_EXTENSION_LABEL" : "URL افزونه", + "INSTALL_EXTENSION_HINT" : "URL افزونه های دارای پرونده zip یا مخازن Github", + "INSTALLING_FROM" : "نصب افزونه ها از {0}\u2026", + "INSTALL_SUCCEEDED" : "نصب با موفقیت به اتمام رسید!", + "INSTALL_FAILED" : "نصب نا موفق.", + "CANCELING_INSTALL" : "درحال لغو\u2026", + "CANCELING_HUNG" : "عملیات لغو نصب زمان طولانیی به طول خواهد کشید. خطا یا خطا های داخلی ممکن است رخ دهد.", + "INSTALL_CANCELED" : "فرایند نصب لفو گردید.", + // These must match the error codes in ExtensionsDomain.Errors.* : + "INVALID_ZIP_FILE" : "محتوای دانلود شده دارای پرونده zip معتبر نمی باشد.", + "INVALID_PACKAGE_JSON" : "پرونده package.json معتبر نمی باشد (error was: {0}).", + "MISSING_PACKAGE_NAME" : "پرونده package.json دارای خطا در نام می باشد.", + "BAD_PACKAGE_NAME" : "نام بسته {0} نامعتبر می باشد.", + "MISSING_PACKAGE_VERSION" : "پرونده package.json دارای خطا در نسخه می باشد.", + "INVALID_VERSION_NUMBER" : "عدد نسخه این بسته ({0}) نا معتبر می باشد.", + "INVALID_BRACKETS_VERSION" : "خطا در سازگاری {APP_NAME} با رشته نامعتبر({0}).", + "DISALLOWED_WORDS" : "عبارت ({1}) اجازه وارد سازی در این فیلد را ندارد {0}.", + "API_NOT_COMPATIBLE" : "افزونه با این نسخه از برنامه {APP_NAME} سازگار نیست. در پوشه افزونه های قابل نمایش نصب نشد.", + "MISSING_MAIN" : "بسته حاوی پرونده main.js نیست.", + "EXTENSION_ALREADY_INSTALLED" : "نصب این بسته سبب دوباره نویسی پرونده های افزونه قبلی می شود. دوباره نویسی صورت گیرد?", + "EXTENSION_SAME_VERSION" : "نسخه این بسته با نسخه بسته ای که هم اکنون نصب می باشد برابر است. آیا افزونه دوباره نویسی گردد?", + "EXTENSION_OLDER_VERSION" : "این بسته نسخه {0} هست قبل تر نصب شده({1}). آیا این افزونه دوباره نویسی گردد?", + "DOWNLOAD_ID_IN_USE" : "خطای داخلی: این ID دانلود هم اکنون درحال استفاده است.", + "NO_SERVER_RESPONSE" : "ناتوان در اتصال به سرویس دهنده.", + "BAD_HTTP_STATUS" : "پرونده در سرویس دهنده یافت نشد (HTTP {0}).", + "CANNOT_WRITE_TEMP" : "ناتوان در ذخیره دانلود در یک پرونده خالی.", + "ERROR_LOADING" : "این افزونه بهنگام شروع با خطا مواجه می شود.", + "MALFORMED_URL" : "آدرس URL نا معتبر است. لطفا آن را برسی کرده و آدرس معتبر وارد سازید.", + "UNSUPPORTED_PROTOCOL" : "آدرس URL می بایست http یا https باشد.", + "UNKNOWN_ERROR" : "خطای داخلی نامشخص.", + // For NOT_FOUND_ERR, see generic strings above + "EXTENSION_MANAGER_TITLE" : "مدیریت افزونه ها", + "EXTENSION_MANAGER_ERROR_LOAD" : "ناتوان در دسترسی به افزونه های ثبت شده. لطفا بعدا تلاش کنید.", + "INSTALL_FROM_URL" : "نصب از URL\u2026", + "EXTENSION_AUTHOR" : "مولف", + "EXTENSION_DATE" : "تاریخ", + "EXTENSION_INCOMPATIBLE_NEWER" : "این افزونه احتیاج به نسخه جدیدی از {APP_NAME} دارد.", + "EXTENSION_INCOMPATIBLE_OLDER" : "نسخه فعلی این افزونه فقط با نسخه های قبلی {APP_NAME} سازگار است.", + "EXTENSION_NO_DESCRIPTION" : "بدون شرح", + "EXTENSION_MORE_INFO" : "اطلاعات بیشتر...", + "EXTENSION_ERROR" : "خطای افزونه", + "EXTENSION_KEYWORDS" : "کلمات کلیدی", + "EXTENSION_INSTALLED" : "نصب شده", + "EXTENSION_UPDATE_INSTALLED" : "این افزونه دریافت شده و بعد از ترک {APP_NAME} نصب خواهد شد.", + "EXTENSION_SEARCH_PLACEHOLDER" : "جستجو", + "EXTENSION_MORE_INFO_LINK" : "بیشتر", + "BROWSE_EXTENSIONS" : "پیمایش افزونه ها", + "EXTENSION_MANAGER_REMOVE" : "حذف افزونه", + "EXTENSION_MANAGER_REMOVE_ERROR" : "ناتوان در حذف یک یا برخی از افزونه ها: {0}. {APP_NAME} درحال ترک.", + "EXTENSION_MANAGER_UPDATE" : "بروزرسانی افزونه", + "EXTENSION_MANAGER_UPDATE_ERROR" : "ناتوان در بروزرسانی یک یا برخی از افزونه ها: {0}. {APP_NAME} درحال ترک.", + "MARKED_FOR_REMOVAL" : "نشانه گذاری جهت حذف", + "UNDO_REMOVE" : "Undo", + "MARKED_FOR_UPDATE" : "انتخاب شده برای بروزرسانی", + "UNDO_UPDATE" : "Undo", + "CHANGE_AND_QUIT_TITLE" : "تغییر در افزونه ها", + "CHANGE_AND_QUIT_MESSAGE" : "جهت بروزرسانی یا حذف افزونه ها می بایست {APP_NAME} را ترک و دوباره اجرا کنید. شما می بایست تغییرات ذخیره نشده را ذخیره نمایید.", + "REMOVE_AND_QUIT" : "حذف افزونه ها و ترک(خروج)", + "CHANGE_AND_QUIT" : "تغییر افزونه ها و ترک", + "UPDATE_AND_QUIT" : "بروزرسانی افزونه ها و ترک", + "EXTENSION_NOT_INSTALLED" : "ناتوان در حذف افزونه {0} زیرا این افزونه بدرستی نصب نشده.", + "NO_EXTENSIONS" : "هیچ افزونه ای نصب نشده.
    جهت شروع بر روی زبانه در درسترس بالا کلیک کنید.", + "NO_EXTENSION_MATCHES" : "هیچ افزونه ای منطبق با جستجوی شما پیدا نشد.", + "REGISTRY_SANITY_CHECK_WARNING" : "بموقع نصب افزونه ها احتیاط جهت نصب افزونه های با منبع نا مشخص ضروری است.", + "EXTENSIONS_INSTALLED_TITLE" : "نصب شده", + "EXTENSIONS_AVAILABLE_TITLE" : "در دسترس", + "EXTENSIONS_UPDATES_TITLE" : "بروزرسانی ها", + + /** + * Unit names + */ + + "UNIT_PIXELS" : "pixels", + + // extensions/default/DebugCommands + "DEBUG_MENU" : "خطا یابی", + "CMD_SHOW_DEV_TOOLS" : "نمایش ابزار های توسعه دهندگان", + "CMD_REFRESH_WINDOW" : "بارگذاری مجدد {APP_NAME}", + "CMD_NEW_BRACKETS_WINDOW" : "پنجره {APP_NAME} جدید", + "CMD_SWITCH_LANGUAGE" : "انتخاب زبان", + "CMD_RUN_UNIT_TESTS" : "اجرای test", + "CMD_SHOW_PERF_DATA" : "نمایش داده های عملکردی", + "CMD_ENABLE_NODE_DEBUGGER" : "فعال سازی اشکال زدای گرهی", + "CMD_LOG_NODE_STATE" : "ورود گره به حالت کنسول", + "CMD_RESTART_NODE" : "شروع دوباره گره", + + "LANGUAGE_TITLE" : "انتخاب زبان", + "LANGUAGE_MESSAGE" : "زبان:", + "LANGUAGE_SUBMIT" : "بارگذاری مجدد {APP_NAME}", + "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" : "رنگ اصلی", + "COLOR_EDITOR_RGBA_BUTTON_TIP" : "RGBa قالب", + "COLOR_EDITOR_HEX_BUTTON_TIP" : "Hex قالب", + "COLOR_EDITOR_HSLA_BUTTON_TIP" : "HSLa قالب", + "COLOR_EDITOR_USED_COLOR_TIP_SINGULAR" : "{0} ({1} بار استفاده شده)", + "COLOR_EDITOR_USED_COLOR_TIP_PLURAL" : "{0} ({1} بار استفاده شده)", + + // extensions/default/JavaScriptCodeHints + "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 یا نافعال است و یا برای پرونده فعلی کار نمی کند", + + // extensions/default/QuickView + "CMD_ENABLE_QUICK_VIEW" : "نمایش سریع با اشاره", + + // extensions/default/WebPlatformDocs + "DOCS_MORE_LINK" : "بیشتر بخوانید" +}); diff --git a/src/nls/fa-ir/urls.js b/src/nls/fa-ir/urls.js new file mode 100644 index 00000000000..4882f8b76d2 --- /dev/null +++ b/src/nls/fa-ir/urls.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ +/*global define */ + +define({ + // Relative to the samples folder + "GETTING_STARTED" : "root/Getting Started", + "ADOBE_THIRD_PARTY" : "http://www.adobe.com/go/thirdparty/", + "WEB_PLATFORM_DOCS_LICENSE" : "http://creativecommons.org/licenses/by/3.0/", +}); diff --git a/src/nls/strings.js b/src/nls/strings.js index 0fde19effa6..24c4119e08a 100644 --- a/src/nls/strings.js +++ b/src/nls/strings.js @@ -39,6 +39,7 @@ define(function (require, exports, module) { root: true, "cs": true, "de": true, + "fa-ir": true, "fr": true, "nb": true, "es": true, From 06a626aea57b0a4be44c5139a17b6fd861630756 Mon Sep 17 00:00:00 2001 From: Rodrigo Tavares Date: Tue, 10 Sep 2013 11:54:51 -0400 Subject: [PATCH 0013/1140] Updating and improving Brazilian Portuguese translation --- src/nls/pt-br/strings.js | 440 +++++++++++++++++++++++++++++---------- 1 file changed, 335 insertions(+), 105 deletions(-) diff --git a/src/nls/pt-br/strings.js b/src/nls/pt-br/strings.js index 332d9e7c93c..1472fe1cbad 100644 --- a/src/nls/pt-br/strings.js +++ b/src/nls/pt-br/strings.js @@ -25,231 +25,461 @@ /*global define */ define({ + /** * Errors */ // General file io error strings - "GENERIC_ERROR" : "(error {0})", + "GENERIC_ERROR" : "(erro {0})", "NOT_FOUND_ERR" : "O arquivo não pôde ser encontrado.", "NOT_READABLE_ERR" : "O arquivo não pôde ser lido.", "NO_MODIFICATION_ALLOWED_ERR" : "O diretório de destino não pode ser modificado.", "NO_MODIFICATION_ALLOWED_ERR_FILE" : "As permissões não permitem que você faça modificações.", - "FILE_EXISTS_ERR" : "O arquivo já existe.", + "FILE_EXISTS_ERR" : "Arquivo ou pasta já existe.", + "FILE" : "arquivo", + "DIRECTORY" : "diretório", // Project error strings "ERROR_LOADING_PROJECT" : "Erro ao carregar o projeto", - "OPEN_DIALOG_ERROR" : "Ocorreu um erro ao mostrar o diálogo de abertura de arquivo. (error {0})", - "REQUEST_NATIVE_FILE_SYSTEM_ERROR" : "Ocorreu um erro ao tentar carregar a pasta {0}. (error {1})", - "READ_DIRECTORY_ENTRIES_ERROR" : "Ocorreu um erro ao ler o conteúdo da pasta {0}. (error {1})", + "OPEN_DIALOG_ERROR" : "Ocorreu um erro ao mostrar o diálogo de abertura de arquivo. (erro {0})", + "REQUEST_NATIVE_FILE_SYSTEM_ERROR" : "Ocorreu um erro ao tentar carregar a pasta {0}. (erro {1})", + "READ_DIRECTORY_ENTRIES_ERROR" : "Ocorreu um erro ao ler o conteúdo da pasta {0}. (erro {1})", // File open/save error string "ERROR_OPENING_FILE_TITLE" : "Erro ao abrir arquivo", "ERROR_OPENING_FILE" : "Ocorreu um erro ao tentar abrir o arquivo {0}. {1}", - "ERROR_RELOADING_FILE_TITLE" : "Erro recarregando as mudanças a partir do disco", + "ERROR_OPENING_FILES" : "Ocorreu um erro ao tentar abrir os seguintes arquivos:", + "ERROR_RELOADING_FILE_TITLE" : "Erro ao recarregar as mudanças a partir do disco", "ERROR_RELOADING_FILE" : "Ocorreu um erro ao tentar recarregar o arquivo {0}. {1}", "ERROR_SAVING_FILE_TITLE" : "Erro ao salvar arquivo", "ERROR_SAVING_FILE" : "Ocorreu um erro ao tentar salvar o arquivo {0}. {1}", "ERROR_RENAMING_FILE_TITLE" : "Erro ao renomear arquivo", "ERROR_RENAMING_FILE" : "Ocorreu um erro ao tentar renomear o arquivo {0}. {1}", - "INVALID_FILENAME_TITLE" : "Nome de arquivo inválido", - "INVALID_FILENAME_MESSAGE" : "Nomes de arquivos não podem conter os seguintes caracteres: /?*:;{}<>\\|", - "FILE_ALREADY_EXISTS" : "O arquivo {0} já existe.", - "ERROR_CREATING_FILE_TITLE" : "Erro ao criar arquivo", - "ERROR_CREATING_FILE" : "Ocorreu um erro ao tentar criar o arquivo {0}. {1}", + "ERROR_DELETING_FILE_TITLE" : "Erro ao excluir arquivo", + "ERROR_DELETING_FILE" : "Ocorreu um erro ao tentar excluir o arquivo {0}. {1}", + "INVALID_FILENAME_TITLE" : "Nome de {0} inválido", + "INVALID_FILENAME_MESSAGE" : "Nomes de arquivos não podem conter os seguintes caracteres: /?*:;{}<>\\| nem usar palavras reservadas do sistema.", + "FILE_ALREADY_EXISTS" : "Já existe um {0} chamado {1}.", + "ERROR_CREATING_FILE_TITLE" : "Erro ao criar {0}", + "ERROR_CREATING_FILE" : "Ocorreu um erro ao tentar criar o {0} {1}. {2}", // Application error strings - "ERROR_IN_BROWSER_TITLE" : "Opa! {APP_NAME} não funciona em navegadores ainda.", - "ERROR_IN_BROWSER" : "{APP_NAME} é criado em HTML, mas no momento ele é executado como um aplicativo de desktop para que você possa usá-lo para editar arquivos locais. Por favor, use o shell da aplicação no github.com/adobe/brackets-shell repo para executar {APP_NAME}.", + "ERROR_IN_BROWSER_TITLE" : "Opa! O {APP_NAME} não funciona em navegadores ainda.", + "ERROR_IN_BROWSER" : "O {APP_NAME} é criado em HTML, mas no momento ele é executado como um aplicativo de desktop para que você possa usá-lo para editar arquivos locais. Por favor, use o shell da aplicação do repositório github.com/adobe/brackets-shell para executar {APP_NAME}.", // FileIndexManager error string - "ERROR_MAX_FILES_TITLE" : "Erro indexando Arquivos", + "ERROR_MAX_FILES_TITLE" : "Erro ao indexar arquivos", "ERROR_MAX_FILES" : "O número máximo de arquivos foi indexado. Ações que procuram no índice de arquivos podem funcionar incorretamente.", // Live Development error strings - "ERROR_LAUNCHING_BROWSER_TITLE" : "Erro abrindo o navegador", + "ERROR_LAUNCHING_BROWSER_TITLE" : "Erro ao abrir o navegador", "ERROR_CANT_FIND_CHROME" : "O navegador Google Chrome não pôde ser encontrado. Por favor, verifique se ele está instalado.", - "ERROR_LAUNCHING_BROWSER" : "Ocorreu um erro ao iniciar o navegador. (error {0})", + "ERROR_LAUNCHING_BROWSER" : "Ocorreu um erro ao iniciar o navegador. (erro {0})", - "LIVE_DEVELOPMENT_ERROR_TITLE" : "Erro de Live Preview", - "LIVE_DEVELOPMENT_RELAUNCH_TITLE" : "Conectando ao navegador", - "LIVE_DEVELOPMENT_ERROR_MESSAGE" : "Para que a Live Preview conecte, Chrome deve ser aberto com a opção de depuração remota ativada.

    Gostaria de reabrir Chrome e permitir a depuração remota?", - "LIVE_DEV_NEED_HTML_MESSAGE" : "Abra um arquivo HTML a fim de lançar Live Preview.", + "LIVE_DEVELOPMENT_ERROR_TITLE" : "Erro no Live Preview", + "LIVE_DEVELOPMENT_RELAUNCH_TITLE" : "Conectando-se ao navegador", + "LIVE_DEVELOPMENT_ERROR_MESSAGE" : "Para que o Live Preview conecte-se, o Chrome deve ser reiniciado com a opção de depuração remota ativada.

    Gostaria de abrir o Chrome novamente e permitir a depuração remota?", + "LIVE_DEV_LOADING_ERROR_MESSAGE" : "Não foi possível carregar a página de Live Development", + "LIVE_DEV_NEED_HTML_MESSAGE" : "Abra um arquivo HTML para iniciar Live Preview.", + "LIVE_DEV_NEED_BASEURL_MESSAGE" : "Para iniciar um live preview com um arquivo server-side, é preciso especificar uma URL Base para este projeto.", + "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Erro ao iniciar o servidor HTTP para os arquivos do desenvolvimento em tempo real. Por favor, tente novamente.", "LIVE_DEVELOPMENT_INFO_TITLE" : "Bem-vindo à Live Preview!", - "LIVE_DEVELOPMENT_INFO_MESSAGE" : "Live Preview se conecta {APP_NAME} ao seu navegador. Ele lança uma prévia do seu arquivo HTML no navegador, em seguida atualiza a visualização de imediato, quando você editar o código.

    Nesta versão inicial de {APP_NAME}, Live Preview só funciona para as edições de arquivos CSS e apenas com Google Chrome. Nós iremos implementá-lo para HTML e JavaScript em breve!

    (Você só vai ver esta mensagem uma vez.)", + "LIVE_DEVELOPMENT_INFO_MESSAGE" : "O Live Preview conecta o {APP_NAME} ao seu navegador. Ele abre uma prévia do seu arquivo HTML no navegador e atualiza a visualização em tempo real, enquanto você edita o código.

    Nesta versão inicial do {APP_NAME}, o Live Preview só funciona com o Google Chrome e atualiza em tempo real enquanto você edita arquivos CSS. Alterações em arquivos HTML ou JavaScript são automaticamente recarregados ao salvar.

    (Você só verá esta mensagem uma vez.)", + "LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Para mais informações, veja Solucionando erros de conexão com Live Development.", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "Live Preview", "LIVE_DEV_STATUS_TIP_PROGRESS1" : "Live Preview: Connectando\u2026", "LIVE_DEV_STATUS_TIP_PROGRESS2" : "Live Preview: Inicializando\u2026", - "LIVE_DEV_STATUS_TIP_CONNECTED" : "Desconectando do Live Preview", + "LIVE_DEV_STATUS_TIP_CONNECTED" : "Desconectar Live Preview", "LIVE_DEV_STATUS_TIP_OUT_OF_SYNC" : "Live Preview: Clique para desconectar (Salve o arquivo para atualizar)", + "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS" : "O Live Preview foi cancelado pois as ferramentas de desenvolvedor do navegador foram abertas", + "LIVE_DEV_DETACHED_TARGET_CLOSED" : "O Live Preview foi cancelado pois a página foi fechada no navegador", + "LIVE_DEV_NAVIGATED_AWAY" : "O Live Preview foi cancelado pois o navegador foi para uma página que não pertence a este projeto atual", + "LIVE_DEV_CLOSED_UNKNOWN_REASON" : "O Live Preview foi cancelado por uma razão desconhecida ({0})", + "SAVE_CLOSE_TITLE" : "Salvar alterações", "SAVE_CLOSE_MESSAGE" : "Você quer salvar as alterações feitas no documento {0}?", - "SAVE_CLOSE_MULTI_MESSAGE" : "Você quer salvar as alterações para os seguintes arquivos?", + "SAVE_CLOSE_MULTI_MESSAGE" : "Você quer salvar as alterações feitas aos seguintes arquivos?", "EXT_MODIFIED_TITLE" : "Mudanças externas", - "EXT_MODIFIED_MESSAGE" : "{0} foi modificado no disco, mas também tem alterações não salvadas em {APP_NAME}.

    Qual versão você quer manter?", - "EXT_DELETED_MESSAGE" : "{0} foi deletado no disco, mas tem alterações não salvadas em {APP_NAME}.

    Você quer manter as suas alterações?", + "CONFIRM_FOLDER_DELETE_TITLE" : "Confirmar exclusão", + "CONFIRM_FOLDER_DELETE" : "Tem certeza que deseja excluir a pasta {0}?", + "FILE_DELETED_TITLE" : "Arquivo excluído", + "EXT_MODIFIED_MESSAGE" : "{0} foi modificado no disco, mas também tem alterações não salvas em {APP_NAME}.

    Qual versão você quer manter?", + "EXT_DELETED_MESSAGE" : "{0} foi excluído no disco, mas tem alterações não salvas em {APP_NAME}.

    Deseja manter suas alterações?", // Find, Replace, Find in Files - "SEARCH_REGEXP_INFO" : "Use /re/ sintaxe para usar regexp na pesquisa", + "SEARCH_REGEXP_INFO" : "Use a sintaxe /re/ para pesquisas com regexp", + "FIND_RESULT_COUNT" : "{0} resultados", + "FIND_RESULT_COUNT_SINGLE" : "1 resultado", + "FIND_NO_RESULTS" : "Nenhum resultado", "WITH" : "Com", "BUTTON_YES" : "Sim", "BUTTON_NO" : "Não", + "BUTTON_REPLACE_ALL" : "Todos\u2026", "BUTTON_STOP" : "Pare", + "BUTTON_REPLACE" : "Substituir", + + "BUTTON_NEXT" : "\u25B6", + "BUTTON_PREV" : "\u25C0", + "BUTTON_NEXT_HINT" : "Resultado seguinte", + "BUTTON_PREV_HINT" : "Resultado ", - "OPEN_FILE" : "Abrir Arquivo", + "OPEN_FILE" : "Abrir arquivo", + "SAVE_FILE_AS" : "Savar arquivo", "CHOOSE_FOLDER" : "Escolha uma pasta", - "RELEASE_NOTES" : "Notas de Lançamento", + "RELEASE_NOTES" : "Notas da Versão", "NO_UPDATE_TITLE" : "Você está atualizado!", - "NO_UPDATE_MESSAGE" : "Você está executando a versão mais recente de {APP_NAME}.", + "NO_UPDATE_MESSAGE" : "Você está executando a versão mais recente do {APP_NAME}.", + + "FIND_REPLACE_TITLE_PART1" : "Substituir \"", + "FIND_REPLACE_TITLE_PART2" : "\" com \"", + "FIND_REPLACE_TITLE_PART3" : "\" — {2} {0} {1}", - "FIND_IN_FILES_TITLE" : "- {0} {1} em {2} {3}", + "FIND_IN_FILES_TITLE_PART1" : "\"", + "FIND_IN_FILES_TITLE_PART2" : "\" encontrado(s)", + "FIND_IN_FILES_TITLE_PART3" : "— {0} {1} em {2} {3}", + "FIND_IN_FILES_SCOPED" : "em {0}", + "FIND_IN_FILES_NO_SCOPE" : "no projeto", "FIND_IN_FILES_FILE" : "arquivo", "FIND_IN_FILES_FILES" : "arquivos", "FIND_IN_FILES_MATCH" : "resultado", "FIND_IN_FILES_MATCHES" : "resultados", - "FIND_IN_FILES_MAX" : " (Mostrando os primeiros {0} resultados)", - "FIND_IN_FILES_FILE_PATH" : "Arquivo: {0}", - "FIND_IN_FILES_LINE" : "linha: {0}", + "FIND_IN_FILES_MORE_THAN" : "Mais de ", + "FIND_IN_FILES_PAGING" : "{0}—{1}", + "FIND_IN_FILES_FILE_PATH" : "{0} {2} {1}", // We shoudl use normal dashes on Windows instead of em dash eventually + "FIND_IN_FILES_LINE" : "linha: {0}", - "ERROR_FETCHING_UPDATE_INFO_TITLE" : "Erro recebendo informações atualizadas", - "ERROR_FETCHING_UPDATE_INFO_MSG" : "Houve um problema obtendo a informação de atualização mais recente a partir do servidor. Por favor, verifique se você está conectado à Internet e tente novamente.", + "ERROR_FETCHING_UPDATE_INFO_TITLE" : "Erro ao receber informações de atualização", + "ERROR_FETCHING_UPDATE_INFO_MSG" : "Houve um problema ao obter informações sobre a última atualização do servidor. Por favor, certifique-se de estar conectado à Internet e tente novamente.", /** * ProjectManager */ - - "UNTITLED" : "Sem título", + "PROJECT_LOADING" : "Carregando\u2026", + "UNTITLED" : "Sem título", + "WORKING_FILES" : "Arquivos de trabalho", /** * Keyboard modifier names */ - "KEYBOARD_CTRL" : "Ctrl", "KEYBOARD_SHIFT" : "Shift", - "KEYBOARD_SPACE" : "Space", + "KEYBOARD_SPACE" : "Espaço", /** * StatusBar strings */ "STATUSBAR_CURSOR_POSITION" : "Linha {0}, Coluna {1}", + "STATUSBAR_SELECTION_CH_SINGULAR" : " \u2014 {0} coluna selecionada", + "STATUSBAR_SELECTION_CH_PLURAL" : " \u2014 {0} colunas selecionadas", + "STATUSBAR_SELECTION_LINE_SINGULAR" : " \u2014 {0} linha selecionada", + "STATUSBAR_SELECTION_LINE_PLURAL" : " \u2014 {0} linhas selecionadas", "STATUSBAR_INDENT_TOOLTIP_SPACES" : "Clique para alterar a indentação para espaços", "STATUSBAR_INDENT_TOOLTIP_TABS" : "Clique para alterar a indentação para tabulação", "STATUSBAR_INDENT_SIZE_TOOLTIP_SPACES" : "Clique para alterar o número de espaços usados ao indentar", "STATUSBAR_INDENT_SIZE_TOOLTIP_TABS" : "Clique para alterar a largura do caractere de tabulação", - "STATUSBAR_SPACES" : "Espaços", - "STATUSBAR_TAB_SIZE" : "Tamanho da Tabulação", - "STATUSBAR_LINE_COUNT" : "{0} Linhas", + "STATUSBAR_SPACES" : "Espaços:", + "STATUSBAR_TAB_SIZE" : "Tamanho da tabulação:", + "STATUSBAR_LINE_COUNT_SINGULAR" : "\u2014 {0} linha", + "STATUSBAR_LINE_COUNT_PLURAL" : "\u2014 {0} linhas", + // CodeInspection: errors/warnings + "ERRORS_PANEL_TITLE" : "Erros {0}", + "SINGLE_ERROR" : "1 erro {0}", + "MULTIPLE_ERRORS" : "{1} erros {0}", + "NO_ERRORS" : "Nenhum erro {0} - bom trabalho!", + "LINT_DISABLED" : "A análise de código está desativada", + "NO_LINT_AVAILABLE" : "Nenhum analisador de código disponível para {0}", + "NOTHING_TO_LINT" : "Nada para analisar", + + /** * Command Name Constants */ // File menu commands "FILE_MENU" : "Arquivo", - "CMD_FILE_NEW" : "Novo", - "CMD_FILE_NEW_FOLDER" : "Nova Pasta", + "CMD_FILE_NEW_UNTITLED" : "Novo", + "CMD_FILE_NEW" : "Novo arquivo", + "CMD_FILE_NEW_FOLDER" : "Nova pasta", "CMD_FILE_OPEN" : "Abrir\u2026", - "CMD_ADD_TO_WORKING_SET" : "Adicionar Para Conjunto de Trabalho", + "CMD_ADD_TO_WORKING_SET" : "Adicionar ao Conjunto de Trabalho", "CMD_OPEN_FOLDER" : "Abrir pasta\u2026", "CMD_FILE_CLOSE" : "Fechar", - "CMD_FILE_CLOSE_ALL" : "Fechar Tudo", + "CMD_FILE_CLOSE_ALL" : "Fechar tudo", "CMD_FILE_SAVE" : "Salvar", - "CMD_FILE_SAVE_ALL" : "Salvar Tudo", + "CMD_FILE_SAVE_ALL" : "Salvar tudo", + "CMD_FILE_SAVE_AS" : "Salvar como\u2026", "CMD_LIVE_FILE_PREVIEW" : "Live Preview", + "CMD_PROJECT_SETTINGS" : "Configurações do projeto\u2026", "CMD_FILE_RENAME" : "Renomear", - "CMD_FILE_REFRESH" : "Atualizar", + "CMD_FILE_DELETE" : "Excluir", + "CMD_INSTALL_EXTENSION" : "Instalar extensão\u2026", + "CMD_EXTENSION_MANAGER" : "Gerenciador de extensões\u2026", + "CMD_FILE_REFRESH" : "Recarregar árvore de arquivos", "CMD_QUIT" : "Sair", + // Used in native File menu on Windows + "CMD_EXIT" : "Sair", // Edit menu commands "EDIT_MENU" : "Editar", - "CMD_SELECT_ALL" : "Selecionar Tudo", - "CMD_FIND" : "Encontrar", - "CMD_FIND_IN_FILES" : "Encontrar em Arquivos", - "CMD_FIND_NEXT" : "Encontrar Próximo", - "CMD_FIND_PREVIOUS" : "Encontrar Anterior", + "CMD_UNDO" : "Desfazer", + "CMD_REDO" : "Refazer", + "CMD_CUT" : "Recortar", + "CMD_COPY" : "Copiar", + "CMD_PASTE" : "Colar", + "CMD_SELECT_ALL" : "Selecionar tudo", + "CMD_SELECT_LINE" : "Selecionar linha", + "CMD_FIND" : "Localizar", + "CMD_FIND_IN_FILES" : "Localizar em arquivos", + "CMD_FIND_IN_SUBTREE" : "Localizar em \u2026", + "CMD_FIND_NEXT" : "Localizar Próximo", + "CMD_FIND_PREVIOUS" : "Localizar Anterior", "CMD_REPLACE" : "Substituir", - "CMD_INDENT" : "Recuar", - "CMD_UNINDENT" : "Desfazer Recuo", + "CMD_INDENT" : "Indentar", + "CMD_UNINDENT" : "Diminuir indentação", "CMD_DUPLICATE" : "Duplicar", - "CMD_DELETE_LINES" : "Deletar Linha(s) Selecionadas", - "CMD_COMMENT" : "Comentar/Descomentar Linhas", - "CMD_LINE_UP" : "Mover Linha(s) para Cima", - "CMD_LINE_DOWN" : "Mover Linha(s) para Baixo", + "CMD_DELETE_LINES" : "Excluir linha", + "CMD_COMMENT" : "Alternar comentário de linha", + "CMD_BLOCK_COMMENT" : "Alternar comentário de bloco", + "CMD_LINE_UP" : "Mover linha para cima", + "CMD_LINE_DOWN" : "Mover linha para baixo", + "CMD_OPEN_LINE_ABOVE" : "Abrir linha acima", + "CMD_OPEN_LINE_BELOW" : "Abrir linha abaixo", + "CMD_TOGGLE_CLOSE_BRACKETS" : "Fechar chaves automaticamente", + "CMD_SHOW_CODE_HINTS" : "Mostrar dicas de código", // View menu commands "VIEW_MENU" : "Ver", "CMD_HIDE_SIDEBAR" : "Esconder Barra Lateral", "CMD_SHOW_SIDEBAR" : "Mostrar Barra Lateral", - "CMD_INCREASE_FONT_SIZE" : "Aumentar Tamanho da Fonte", - "CMD_DECREASE_FONT_SIZE" : "Diminuir Tamanho da Fonte", - "CMD_RESTORE_FONT_SIZE" : "Restaurar Tamanho da Fonte", + "CMD_INCREASE_FONT_SIZE" : "Aumentar tamanho da fonte", + "CMD_DECREASE_FONT_SIZE" : "Diminuir tamanho da fonte", + "CMD_RESTORE_FONT_SIZE" : "Restaurar tamanho da fonte", + "CMD_SCROLL_LINE_UP" : "Rolar linha para cima", + "CMD_SCROLL_LINE_DOWN" : "Rolar linha para baixo", + "CMD_TOGGLE_LINE_NUMBERS" : "Números de linha", + "CMD_TOGGLE_ACTIVE_LINE" : "Destacar linha ativa", + "CMD_TOGGLE_WORD_WRAP" : "Quebra automática de linha", + "CMD_LIVE_HIGHLIGHT" : "Destacar Live Preview", + "CMD_VIEW_TOGGLE_INSPECTION" : "Analisar arquivos ao salvar", + "CMD_SORT_WORKINGSET_BY_ADDED" : "Ordenar por Data de Adição", + "CMD_SORT_WORKINGSET_BY_NAME" : "Ordenar por Nome", + "CMD_SORT_WORKINGSET_BY_TYPE" : "Ordenar por Tipo", + "CMD_SORT_WORKINGSET_AUTO" : "Ordenação automática", // Navigate menu Commands "NAVIGATE_MENU" : "Navegar", - "CMD_QUICK_OPEN" : "Abertura Rápida", - "CMD_GOTO_LINE" : "Ir para a Linha", - "CMD_GOTO_DEFINITION" : "Ir para Definição", - "CMD_TOGGLE_QUICK_EDIT" : "Edição Rápida", - "CMD_QUICK_EDIT_PREV_MATCH" : "Resultado Anterior", - "CMD_QUICK_EDIT_NEXT_MATCH" : "Resultado Seguinte", - "CMD_NEXT_DOC" : "Documento Seguinte", - "CMD_PREV_DOC" : "Documento Anterior", + "CMD_QUICK_OPEN" : "Abertura rápida", + "CMD_GOTO_LINE" : "Ir para linha", + "CMD_GOTO_DEFINITION" : "Encontrar definição", + "CMD_GOTO_FIRST_PROBLEM" : "Ir ao primeiro Erro/Aviso", + "CMD_TOGGLE_QUICK_EDIT" : "Edição rápida", + "CMD_TOGGLE_QUICK_DOCS" : "Documentação rápida", + "CMD_QUICK_EDIT_PREV_MATCH" : "Resultado anterior", + "CMD_QUICK_EDIT_NEXT_MATCH" : "Resultado seguinte", + "CMD_NEXT_DOC" : "Documento seguinte", + "CMD_PREV_DOC" : "Documento anterior", + "CMD_SHOW_IN_TREE" : "Mostrar na árvore de arquivos", + "CMD_SHOW_IN_OS" : "Mostrar no sistema operacional", // Help menu commands "HELP_MENU" : "Ajuda", - "CMD_CHECK_FOR_UPDATE" : "Verificar Atualizações", - "CMD_SHOW_EXTENSIONS_FOLDER" : "Mostrar Pasta de Extensões", - "CMD_FORUM" : "{APP_NAME} Forum", - "CMD_ABOUT" : "Sobre", + "CMD_CHECK_FOR_UPDATE" : "Verificar atualizações", + "CMD_HOW_TO_USE_BRACKETS" : "Como usar o {APP_NAME}", + "CMD_FORUM" : "Fórum do {APP_NAME}", + "CMD_RELEASE_NOTES" : "Notas da versão", + "CMD_REPORT_AN_ISSUE" : "Relatar um problema", + "CMD_SHOW_EXTENSIONS_FOLDER" : "Mostrar pasta de extensões", + "CMD_TWITTER" : "{TWITTER_NAME} no Twitter", + "CMD_ABOUT" : "Sobre o {APP_TITLE}", + // Special commands invoked by the native shell - "CMD_CLOSE_WINDOW" : "Fechar Janela", - "CMD_ABORT_QUIT" : "Abortar Saída", + "CMD_CLOSE_WINDOW" : "Fechar janela", + "CMD_ABORT_QUIT" : "Abortar saída", + "CMD_BEFORE_MENUPOPUP" : "Antes do popup do menu", // Strings for main-view.html - "EXPERIMENTAL_BUILD" : "Versão Experimental", - "SEARCH_RESULTS" : "Resultados da Pesquisa", + "EXPERIMENTAL_BUILD" : "versão experimental", + "DEVELOPMENT_BUILD" : "versão de desenvolvimento", "OK" : "OK", - "DONT_SAVE" : "Não Salvar", + "DONT_SAVE" : "Não salvar", "SAVE" : "Salvar", "CANCEL" : "Cancelar", - "RELOAD_FROM_DISK" : "Atualizar a Partir do Disco", - "KEEP_CHANGES_IN_EDITOR" : "Manter Mudanças no Editor", - "CLOSE_DONT_SAVE" : "Fechar (Não Salvar)", - "RELAUNCH_CHROME" : "Abrir Chrome Novamente", + "DELETE" : "Excluir", + "RELOAD_FROM_DISK" : "Recarregar do disco", + "KEEP_CHANGES_IN_EDITOR" : "Manter alterações no editor", + "CLOSE_DONT_SAVE" : "Fechar (não salvar)", + "RELAUNCH_CHROME" : "Abrir Chrome novamente", "ABOUT" : "Sobre", "CLOSE" : "Fechar", - "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} versão experimental {VERSION}", - "ABOUT_TEXT_LINE3" : "Avisos, termos e condições de softwares de terceiros estão localizados em http://www.adobe.com/go/thirdparty/ e aqui incorporados por referência.", - "ABOUT_TEXT_LINE4" : "Documentação e fontes https://github.com/adobe/brackets/", - "UPDATE_NOTIFICATION_TOOLTIP" : "Há uma nova versão de {APP_NAME} disponível! Clique aqui para mais detalhes.", + "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_LINE3" : "Avisos, termos e condições de softwares de terceiros estão localizados em {ADOBE_THIRD_PARTY} e aqui incorporados por referência.", + "ABOUT_TEXT_LINE4" : "Documentação e código-fonte em https://github.com/adobe/brackets/", + "ABOUT_TEXT_LINE5" : "Feito com \u2764 e JavaScript por:", + "ABOUT_TEXT_LINE6" : "Várias pessoas (mas não estamos conseguindo carregar estes dados no momento).", + "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs e logo gráfico Web Platform são licenciados sob a licença Creative Commons Attribution, CC-BY 3.0 Unported.", + "UPDATE_NOTIFICATION_TOOLTIP" : "Há uma nova versão do {APP_NAME} disponível! Clique aqui para mais detalhes.", "UPDATE_AVAILABLE_TITLE" : "Atualização Disponível", - "UPDATE_MESSAGE" : "Opa, há uma nova versão de {APP_NAME} disponível. Aqui estão alguns dos novos recursos:", + "UPDATE_MESSAGE" : "Ei, há uma nova versão do {APP_NAME} disponível. Aqui estão alguns dos novos recursos:", "GET_IT_NOW" : "Obtenha agora!", + "PROJECT_SETTINGS_TITLE" : "Configurações do projeto para: {0}", + "PROJECT_SETTING_BASE_URL" : "URL base do Live Preview", + "PROJECT_SETTING_BASE_URL_HINT" : "Para usar um servidor local, insira uma url como http://localhost:8000/", + "BASEURL_ERROR_INVALID_PROTOCOL" : "O protocolo {0} não é suportado pelo Live Preview—por favor, use http: ou https: .", + "BASEURL_ERROR_SEARCH_DISALLOWED" : "A URL base não pode conter parâmetros de busca como \"{0}\".", + "BASEURL_ERROR_HASH_DISALLOWED" : "A URL base não pode conter hashes como \"{0}\".", + "BASEURL_ERROR_INVALID_CHAR" : "Caracteres especiais como '{0}' devem ser codificados para URL encoding.", + "BASEURL_ERROR_UNKNOWN_ERROR" : "Erro desconhecido ao parsear URL base", + + // Extension Management strings + "INSTALL" : "Instalar", + "UPDATE" : "Atualizar", + "REMOVE" : "Remover", + "OVERWRITE" : "Sobrescrever", + "CANT_REMOVE_DEV" : "Extensões na pasta \"dev\" devem ser excluídas manualmente.", + "CANT_UPDATE" : "A atualização não é compatível com esta versão do {APP_NAME}.", + "INSTALL_EXTENSION_TITLE" : "Instalar extensão", + "UPDATE_EXTENSION_TITLE" : "Atualizar extensão", + "INSTALL_EXTENSION_LABEL" : "URL da extensão", + "INSTALL_EXTENSION_HINT" : "URL do zip ou repositório GitHub da extensão", + "INSTALLING_FROM" : "Instalando extensão de {0}\u2026", + "INSTALL_SUCCEEDED" : "Instalada com sucesso!", + "INSTALL_FAILED" : "Falha na instalação.", + "CANCELING_INSTALL" : "Cancelando\u2026", + "CANCELING_HUNG" : "Cancelar a instalação está demorando muito. Um erro interno deve ter ocorrido.", + "INSTALL_CANCELED" : "Instalação cancelada.", + // These must match the error codes in ExtensionsDomain.Errors.* : + "INVALID_ZIP_FILE" : "O conteúdo baixado não é um arquivo zip válido.", + "INVALID_PACKAGE_JSON" : "O arquivo package.json não é válido (o erro foi: {0}).", + "MISSING_PACKAGE_NAME" : "O arquivo package.json não especifica um nome de pacote.", + "BAD_PACKAGE_NAME" : "{0} é um nome de pacote inválido.", + "MISSING_PACKAGE_VERSION" : "O arquivo package.json não especifica uma versão de pacote.", + "INVALID_VERSION_NUMBER" : "O número da versão do pacote ({0}) é inválido.", + "INVALID_BRACKETS_VERSION" : "A string de compatibilidade com o {APP_NAME} ({0}) é inválida.", + "DISALLOWED_WORDS" : "As palavras ({1}) não são permitidas no campo {0}.", + "API_NOT_COMPATIBLE" : "A extensão não é compatível com esta versão do {APP_NAME}. Está instalada na sua pasta de extensões desativadas.", + "MISSING_MAIN" : "O pacote não tem um arquivo main.js.", + "EXTENSION_ALREADY_INSTALLED" : "Instalar este pacote irá substituir uma extensão instalada anteriormente. Sobrescrever a exensão antiga?", + "EXTENSION_SAME_VERSION" : "Este pacote está na mesma versão que o instalado atualmente. Sobrescrever a instalação existente?", + "EXTENSION_OLDER_VERSION" : "Este pacote está na versão {0}, que é mais antiga que a instalada atualmente ({1}). Sobrescrever a instalação existente?", + "DOWNLOAD_ID_IN_USE" : "Erro interno: ID de download já em uso.", + "NO_SERVER_RESPONSE" : "Não foi possível conectar-se ao servidor.", + "BAD_HTTP_STATUS" : "Aquivo não encontrado no servidor (HTTP {0}).", + "CANNOT_WRITE_TEMP" : "Não foi possível salvar o download em um arquivo temporário.", + "ERROR_LOADING" : "A extensão encontrou um erro ao inicializar.", + "MALFORMED_URL" : "A URL é inválida. Por favor, verifique se você a inseriu corretamente.", + "UNSUPPORTED_PROTOCOL" : "A URL precisa ser um endereço http ou https.", + "UNKNOWN_ERROR" : "Erro interno desconhecido.", + // For NOT_FOUND_ERR, see generic strings above + "EXTENSION_MANAGER_TITLE" : "Gerenciador de Extensões", + "EXTENSION_MANAGER_ERROR_LOAD" : "Não foi possível acessar o registro de extensões. Por favor,tente novamente mais tarde.", + "INSTALL_FROM_URL" : "Instalar a partir de URL\u2026", + "EXTENSION_AUTHOR" : "Autor", + "EXTENSION_DATE" : "Data", + "EXTENSION_INCOMPATIBLE_NEWER" : "Esta extensão requer uma versão mais recente do {APP_NAME}.", + "EXTENSION_INCOMPATIBLE_OLDER" : "Esta extensão atualmente só funciona com versões antigas do {APP_NAME}.", + "EXTENSION_NO_DESCRIPTION" : "Sem descrição", + "EXTENSION_MORE_INFO" : "Mais informações...", + "EXTENSION_ERROR" : "Erro na extensão", + "EXTENSION_KEYWORDS" : "Palavras-chave", + "EXTENSION_INSTALLED" : "Instalada", + "EXTENSION_UPDATE_INSTALLED" : "Esta atualização foi baixada e será instalada quando você sair do {APP_NAME}.", + "EXTENSION_SEARCH_PLACEHOLDER" : "Pesquisar", + "EXTENSION_MORE_INFO_LINK" : "Mais", + "BROWSE_EXTENSIONS" : "Procurar extensões", + "EXTENSION_MANAGER_REMOVE" : "Remover extensão", + "EXTENSION_MANAGER_REMOVE_ERROR" : "Não foi possível remover uma ou mais extensões: {0}. O {APP_NAME} será encerrado mesmo assim.", + "EXTENSION_MANAGER_UPDATE" : "Atualizar extensão", + "EXTENSION_MANAGER_UPDATE_ERROR" : "Não foi possível atualizar uma ou mais extensões: {0}. O {APP_NAME} será encerrado mesmo assim.", + "MARKED_FOR_REMOVAL" : "Marcada para remoção", + "UNDO_REMOVE" : "Desfazer", + "MARKED_FOR_UPDATE" : "Marcada para atualização", + "UNDO_UPDATE" : "Desfazer", + "CHANGE_AND_QUIT_TITLE" : "Alterar extensões", + "CHANGE_AND_QUIT_MESSAGE" : "Para atualizar ou remover as extensões marcadas, você deve sair e reiniciar o {APP_NAME}. Você será solicitado a salvar alterações.", + "REMOVE_AND_QUIT" : "Remover extensões e sair", + "CHANGE_AND_QUIT" : "Alterar extensões e sair", + "UPDATE_AND_QUIT" : "Atualizar extensões e sair", + "EXTENSION_NOT_INSTALLED" : "Não foi possível remover a extensão {0} porque não estava instalada.", + "NO_EXTENSIONS" : "Nenhuma extensão instalada ainda.
    Clique na aba Disponíveis acima para começar.", + "NO_EXTENSION_MATCHES" : "Nenhuma extensão corresponde à sua pesquisa.", + "REGISTRY_SANITY_CHECK_WARNING" : "Tenha cuidado ao instalar extensões de fontes desconhecidas.", + "EXTENSIONS_INSTALLED_TITLE" : "Instaladas", + "EXTENSIONS_AVAILABLE_TITLE" : "Disponíveis", + "EXTENSIONS_UPDATES_TITLE" : "Atualizações", + + /** + * Unit names + */ + + "UNIT_PIXELS" : "pixels", // extensions/default/DebugCommands - "DEBUG_MENU" : "Depurar", - "CMD_SHOW_DEV_TOOLS" : "Mostrar Ferramentas de Desenvolvimento", - "CMD_REFRESH_WINDOW" : "Recarregar {APP_NAME}", - "CMD_NEW_BRACKETS_WINDOW" : "Nova Janela {APP_NAME}", - "CMD_SWITCH_LANGUAGE" : "Trocar Linguagem", - "CMD_RUN_UNIT_TESTS" : "Executar Testes", - "CMD_SHOW_PERF_DATA" : "Mostrar Dados de Desempenho", + "DEBUG_MENU" : "Depurar", + "CMD_SHOW_DEV_TOOLS" : "Mostrar Ferramentas do Desenvolvedor", + "CMD_REFRESH_WINDOW" : "Recarregar {APP_NAME}", + "CMD_NEW_BRACKETS_WINDOW" : "Nova janela do {APP_NAME}", + "CMD_SWITCH_LANGUAGE" : "Trocar idioma", + "CMD_RUN_UNIT_TESTS" : "Executar testes", + "CMD_SHOW_PERF_DATA" : "Mostrar dados de desempenho", + "CMD_ENABLE_NODE_DEBUGGER" : "Habilitar Depurador Node", + "CMD_LOG_NODE_STATE" : "Registrar estado do Node no Console", + "CMD_RESTART_NODE" : "Reiniciar Node", + + "LANGUAGE_TITLE" : "Trocar idioma", + "LANGUAGE_MESSAGE" : "Idioma:", + "LANGUAGE_SUBMIT" : "Recarregar {APP_NAME}", + "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", - "LANGUAGE_TITLE" : "Trocar Idioma", - "LANGUAGE_MESSAGE" : "Por favor, selecione o idioma desejado na lista abaixo:", - "LANGUAGE_SUBMIT" : "Recarregar {APP_NAME}", - "LANGUAGE_CANCEL" : "Cancelar", + // extensions/default/InlineColorEditor + "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Cor atual", + "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "Cor original", + "COLOR_EDITOR_RGBA_BUTTON_TIP" : "Formato RGBa", + "COLOR_EDITOR_HEX_BUTTON_TIP" : "Formato Hex", + "COLOR_EDITOR_HSLA_BUTTON_TIP" : "Formato HSLa", + "COLOR_EDITOR_USED_COLOR_TIP_SINGULAR" : "{0} (Usada {1} vez)", + "COLOR_EDITOR_USED_COLOR_TIP_PLURAL" : "{0} (Usada {1} vezes)", + + // extensions/default/JavaScriptCodeHints + "CMD_JUMPTO_DEFINITION" : "Pular para definição", + "CMD_SHOW_PARAMETER_HINT" : "Mostrar dica de parâmetro", + "NO_ARGUMENTS" : "", // extensions/default/JSLint - "CMD_JSLINT" : "Habilitar JSLint", - "JSLINT_ERRORS" : "Erros JSLint", - "JSLINT_ERROR_INFORMATION" : "1 Erro JSLint", - "JSLINT_ERRORS_INFORMATION" : "{0} Erros JSLint", - "JSLINT_NO_ERRORS" : "Sem erros JSLint - bom trabalho!", - "JSLINT_DISABLED" : "JSLint desabilitado ou não funcionando para o arquivo atual" + "JSLINT_NAME" : "JSLint", + + // extensions/default/QuickView + "CMD_ENABLE_QUICK_VIEW" : "Quick View ao passar o mouse", + + // extensions/default/RecentProjects + "CMD_TOGGLE_RECENT_PROJECTS" : "Projetos Recentes", + + // extensions/default/WebPlatformDocs + "DOCS_MORE_LINK" : "Leia mais" }); From f3ece443888036b7f22eb208a28ee47a66da6a68 Mon Sep 17 00:00:00 2001 From: Mohammad Yaghobi Date: Wed, 11 Sep 2013 11:53:25 +0430 Subject: [PATCH 0014/1140] Persian translated Some improvement in translation --- src/nls/fa-ir/strings.js | 68 +++++++++++++--------------------------- src/nls/fa-ir/urls.js | 24 -------------- 2 files changed, 22 insertions(+), 70 deletions(-) diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index 7eac7d73d48..53ca6cde517 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -1,28 +1,4 @@ -/* - * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - */ -/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define */ //********************* Translated by: Mohammad.Yaghobi //********************* info@pgrammer.com --- m.yaghobi.abc@gmail.com @@ -68,8 +44,8 @@ define({ "ERROR_CREATING_FILE" : "بروز خطا بهنگام ایجاد {0} {1}. {2}", // Application error strings - "ERROR_IN_BROWSER_TITLE" : "!!! {APP_NAME} در مرورگرها اجرا نمی شود.", - "ERROR_IN_BROWSER" : "{APP_NAME} با HTML ساخته شده, ولی هم اکنون بعنوان یک برنامه رومیزی(desktop) اجرا می شود و شما می توانید از آن جهت ویرایش پرونده های خود استفاده نمایید.", + "ERROR_IN_BROWSER_TITLE" : "!!! برکتس در مرورگرها اجرا نمی شود.", + "ERROR_IN_BROWSER" : "برکتس با HTML ساخته شده, ولی هم اکنون بعنوان یک برنامه رومیزی(desktop) اجرا می شود و شما می توانید از آن جهت ویرایش پرونده های خود استفاده نمایید.", // FileIndexManager error string "ERROR_MAX_FILES_TITLE" : "خطا در فهرست بندی پرونده ها", @@ -88,7 +64,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE" : "جهت اجرای پیش نمایش زنده بصورت پرونده در سمت سرور(server-side), می بایست یک URL پایه برای پروژه تعریف نمایید.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "خطا در اجرای سرویس دهنده HTTP برای توسعه زنده پرونده ها. لطفا دوباره تلاش کنید.", "LIVE_DEVELOPMENT_INFO_TITLE" : "به بخش پیش نمایش زنده خوش آمدید!", - "LIVE_DEVELOPMENT_INFO_MESSAGE" : "پیش نمایش زنده {APP_NAME} به مرورگر متصل شده و یک پیش نمایش از پرونده HTML شما در مرورگرتان نشان خواهد داد, و هرگونه تغییری در کدهایتان را فورا در پیش نمایش اعمال خواهد نمود.

    در این نسخه موجود {APP_NAME}, پیش نمایش تنها با مرورگر Google Chrome برای اعمال فوری مقادیر CSS files برای حالت پیش نمایش کار خواهد کرد. هرگونه تغییری در پرونده های HTML یا JavaScript بصورت خودکار بعد از ذخیر بارگذاری خواهد شد.

    (شما این پیغام را برای بار دیگر مشاهده نخواهید کرد.)", + "LIVE_DEVELOPMENT_INFO_MESSAGE" : "پیش نمایش زنده برکتس به مرورگر متصل شده و یک پیش نمایش از پرونده HTML شما در مرورگرتان نشان خواهد داد, و هرگونه تغییری در کدهایتان را فورا در پیش نمایش اعمال خواهد نمود.

    در این نسخه موجود برکتس, پیش نمایش تنها با مرورگر Google Chrome برای اعمال فوری مقادیر CSS files برای حالت پیش نمایش کار خواهد کرد. هرگونه تغییری در پرونده های HTML یا JavaScript بصورت خودکار بعد از ذخیر بارگذاری خواهد شد.

    (شما این پیغام را برای بار دیگر مشاهده نخواهید کرد.)", "LIVE_DEVELOPMENT_TROUBLESHOOTING" : "برای اطلاع بیشتر, به پیوند روبرو مراجعه کنید Troubleshooting Live Development connection errors.", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "پیش نمایش زنده", @@ -109,8 +85,8 @@ define({ "CONFIRM_FOLDER_DELETE_TITLE" : "تائید حذف", "CONFIRM_FOLDER_DELETE" : "آیا مطمئنید می خواهید این پوشه حذف گردد {0}?", "FILE_DELETED_TITLE" : "پرونده حذف گردید", - "EXT_MODIFIED_MESSAGE" : "{0} تغییراتی بر روی دیسک انجام شده, ولی تغییرات بر روی {APP_NAME} ذخیره نگردیده.

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

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

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

    آیا می خواهید تغییرات را حفظ کنید?", // Find, Replace, Find in Files "SEARCH_REGEXP_INFO" : "برای جستجوی regexp از /re/ استفاده کنید", @@ -130,7 +106,7 @@ define({ "RELEASE_NOTES" : "نکات و یادداشت های انتشار", "NO_UPDATE_TITLE" : "بروز هستید!", - "NO_UPDATE_MESSAGE" : "شما درحال استفاده از آخرین نسخه {APP_NAME} هستید.", + "NO_UPDATE_MESSAGE" : "شما درحال استفاده از آخرین نسخه برکتس هستید.", "FIND_REPLACE_TITLE_PART1" : "جایگزینی \"", "FIND_REPLACE_TITLE_PART2" : "\" با \"", @@ -275,8 +251,8 @@ define({ // Help menu commands "HELP_MENU" : "راهنما", "CMD_CHECK_FOR_UPDATE" : "برسی برای بروزرسانی", - "CMD_HOW_TO_USE_BRACKETS" : "چگونه از {APP_NAME} استفاده کنم", - "CMD_FORUM" : "{APP_NAME} انجمن گفت گو", + "CMD_HOW_TO_USE_BRACKETS" : "چگونه از برکتس استفاده کنم", + "CMD_FORUM" : "برکتس انجمن گفت گو", "CMD_RELEASE_NOTES" : "نکات انتشار", "CMD_REPORT_AN_ISSUE" : "گذارش یک مورد", "CMD_SHOW_EXTENSIONS_FOLDER" : "نمایش پوشه افزونه ها", @@ -309,9 +285,9 @@ define({ "ABOUT_TEXT_LINE5" : "ساخته شده با \u2764 و JavaScript بدست:", "ABOUT_TEXT_LINE6" : "بسیاری از مردم", "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs and the Web Platform graphical logo are licensed under a Creative Commons Attribution license, CC-BY 3.0 Unported.", - "UPDATE_NOTIFICATION_TOOLTIP" : "Build جدیدی از{APP_NAME} هم اکنون در دسترس است! جهت مشاهده جزئیات کلیک کنید.", + "UPDATE_NOTIFICATION_TOOLTIP" : "Build جدیدی ازبرکتس هم اکنون در دسترس است! جهت مشاهده جزئیات کلیک کنید.", "UPDATE_AVAILABLE_TITLE" : "بروزرسانی در دسترس است", - "UPDATE_MESSAGE" : "نسخه جدیدی از {APP_NAME} هم اکنون در دسترس است. برخی از مشخصه های آن:", + "UPDATE_MESSAGE" : "نسخه جدیدی از برکتس هم اکنون در دسترس است. برخی از مشخصه های آن:", "GET_IT_NOW" : "هم اکنون دانلود کنید!", "PROJECT_SETTINGS_TITLE" : "تنظیمات پروژه برای: {0}", "PROJECT_SETTING_BASE_URL" : "پیش نمایش URL اصلی/پایه", @@ -328,7 +304,7 @@ define({ "REMOVE" : "حذف", "OVERWRITE" : "دوباره نویسی", "CANT_REMOVE_DEV" : "افزونه های موجود در پوشه \"dev\" می بایست بصورت دستی حذف گردند.", - "CANT_UPDATE" : "بروز رسانی سازگار با این نسخه از {APP_NAME} نیست.", + "CANT_UPDATE" : "بروز رسانی سازگار با این نسخه از برکتس نیست.", "INSTALL_EXTENSION_TITLE" : "نصب افزونه", "UPDATE_EXTENSION_TITLE" : "بروز رسانی افزونه", "INSTALL_EXTENSION_LABEL" : "URL افزونه", @@ -346,9 +322,9 @@ define({ "BAD_PACKAGE_NAME" : "نام بسته {0} نامعتبر می باشد.", "MISSING_PACKAGE_VERSION" : "پرونده package.json دارای خطا در نسخه می باشد.", "INVALID_VERSION_NUMBER" : "عدد نسخه این بسته ({0}) نا معتبر می باشد.", - "INVALID_BRACKETS_VERSION" : "خطا در سازگاری {APP_NAME} با رشته نامعتبر({0}).", + "INVALID_BRACKETS_VERSION" : "خطا در سازگاری برکتس با رشته نامعتبر({0}).", "DISALLOWED_WORDS" : "عبارت ({1}) اجازه وارد سازی در این فیلد را ندارد {0}.", - "API_NOT_COMPATIBLE" : "افزونه با این نسخه از برنامه {APP_NAME} سازگار نیست. در پوشه افزونه های قابل نمایش نصب نشد.", + "API_NOT_COMPATIBLE" : "افزونه با این نسخه از برنامه برکتس سازگار نیست. در پوشه افزونه های قابل نمایش نصب نشد.", "MISSING_MAIN" : "بسته حاوی پرونده main.js نیست.", "EXTENSION_ALREADY_INSTALLED" : "نصب این بسته سبب دوباره نویسی پرونده های افزونه قبلی می شود. دوباره نویسی صورت گیرد?", "EXTENSION_SAME_VERSION" : "نسخه این بسته با نسخه بسته ای که هم اکنون نصب می باشد برابر است. آیا افزونه دوباره نویسی گردد?", @@ -367,27 +343,27 @@ define({ "INSTALL_FROM_URL" : "نصب از URL\u2026", "EXTENSION_AUTHOR" : "مولف", "EXTENSION_DATE" : "تاریخ", - "EXTENSION_INCOMPATIBLE_NEWER" : "این افزونه احتیاج به نسخه جدیدی از {APP_NAME} دارد.", - "EXTENSION_INCOMPATIBLE_OLDER" : "نسخه فعلی این افزونه فقط با نسخه های قبلی {APP_NAME} سازگار است.", + "EXTENSION_INCOMPATIBLE_NEWER" : "این افزونه احتیاج به نسخه جدیدی از برکتس دارد.", + "EXTENSION_INCOMPATIBLE_OLDER" : "نسخه فعلی این افزونه فقط با نسخه های قبلی برکتس سازگار است.", "EXTENSION_NO_DESCRIPTION" : "بدون شرح", "EXTENSION_MORE_INFO" : "اطلاعات بیشتر...", "EXTENSION_ERROR" : "خطای افزونه", "EXTENSION_KEYWORDS" : "کلمات کلیدی", "EXTENSION_INSTALLED" : "نصب شده", - "EXTENSION_UPDATE_INSTALLED" : "این افزونه دریافت شده و بعد از ترک {APP_NAME} نصب خواهد شد.", + "EXTENSION_UPDATE_INSTALLED" : "این افزونه دریافت شده و بعد از ترک برکتس نصب خواهد شد.", "EXTENSION_SEARCH_PLACEHOLDER" : "جستجو", "EXTENSION_MORE_INFO_LINK" : "بیشتر", "BROWSE_EXTENSIONS" : "پیمایش افزونه ها", "EXTENSION_MANAGER_REMOVE" : "حذف افزونه", - "EXTENSION_MANAGER_REMOVE_ERROR" : "ناتوان در حذف یک یا برخی از افزونه ها: {0}. {APP_NAME} درحال ترک.", + "EXTENSION_MANAGER_REMOVE_ERROR" : "ناتوان در حذف یک یا برخی از افزونه ها: {0}. برکتس درحال ترک.", "EXTENSION_MANAGER_UPDATE" : "بروزرسانی افزونه", - "EXTENSION_MANAGER_UPDATE_ERROR" : "ناتوان در بروزرسانی یک یا برخی از افزونه ها: {0}. {APP_NAME} درحال ترک.", + "EXTENSION_MANAGER_UPDATE_ERROR" : "ناتوان در بروزرسانی یک یا برخی از افزونه ها: {0}. برکتس درحال ترک.", "MARKED_FOR_REMOVAL" : "نشانه گذاری جهت حذف", "UNDO_REMOVE" : "Undo", "MARKED_FOR_UPDATE" : "انتخاب شده برای بروزرسانی", "UNDO_UPDATE" : "Undo", "CHANGE_AND_QUIT_TITLE" : "تغییر در افزونه ها", - "CHANGE_AND_QUIT_MESSAGE" : "جهت بروزرسانی یا حذف افزونه ها می بایست {APP_NAME} را ترک و دوباره اجرا کنید. شما می بایست تغییرات ذخیره نشده را ذخیره نمایید.", + "CHANGE_AND_QUIT_MESSAGE" : "جهت بروزرسانی یا حذف افزونه ها می بایست برکتس را ترک و دوباره اجرا کنید. شما می بایست تغییرات ذخیره نشده را ذخیره نمایید.", "REMOVE_AND_QUIT" : "حذف افزونه ها و ترک(خروج)", "CHANGE_AND_QUIT" : "تغییر افزونه ها و ترک", "UPDATE_AND_QUIT" : "بروزرسانی افزونه ها و ترک", @@ -408,8 +384,8 @@ define({ // extensions/default/DebugCommands "DEBUG_MENU" : "خطا یابی", "CMD_SHOW_DEV_TOOLS" : "نمایش ابزار های توسعه دهندگان", - "CMD_REFRESH_WINDOW" : "بارگذاری مجدد {APP_NAME}", - "CMD_NEW_BRACKETS_WINDOW" : "پنجره {APP_NAME} جدید", + "CMD_REFRESH_WINDOW" : "بارگذاری مجدد برکتس", + "CMD_NEW_BRACKETS_WINDOW" : "پنجره برکتس جدید", "CMD_SWITCH_LANGUAGE" : "انتخاب زبان", "CMD_RUN_UNIT_TESTS" : "اجرای test", "CMD_SHOW_PERF_DATA" : "نمایش داده های عملکردی", @@ -419,7 +395,7 @@ define({ "LANGUAGE_TITLE" : "انتخاب زبان", "LANGUAGE_MESSAGE" : "زبان:", - "LANGUAGE_SUBMIT" : "بارگذاری مجدد {APP_NAME}", + "LANGUAGE_SUBMIT" : "بارگذاری مجدد برکتس", "LANGUAGE_CANCEL" : "لغو", "LANGUAGE_SYSTEM_DEFAULT" : "زبان پیش فرض", diff --git a/src/nls/fa-ir/urls.js b/src/nls/fa-ir/urls.js index 4882f8b76d2..99d26fa439c 100644 --- a/src/nls/fa-ir/urls.js +++ b/src/nls/fa-ir/urls.js @@ -1,28 +1,4 @@ -/* - * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - */ -/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define */ define({ // Relative to the samples folder From 06816eb8f04dafea34a1185f0f0202a12b12eb97 Mon Sep 17 00:00:00 2001 From: Mohammad Yaghobi Date: Wed, 11 Sep 2013 12:05:58 +0430 Subject: [PATCH 0015/1140] Persian Translated Some improvement in translation --- src/nls/fa-ir/strings.js | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index 53ca6cde517..e647466af7c 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -44,8 +44,8 @@ define({ "ERROR_CREATING_FILE" : "بروز خطا بهنگام ایجاد {0} {1}. {2}", // Application error strings - "ERROR_IN_BROWSER_TITLE" : "!!! برکتس در مرورگرها اجرا نمی شود.", - "ERROR_IN_BROWSER" : "برکتس با HTML ساخته شده, ولی هم اکنون بعنوان یک برنامه رومیزی(desktop) اجرا می شود و شما می توانید از آن جهت ویرایش پرونده های خود استفاده نمایید.", + "ERROR_IN_BROWSER_TITLE" : "!!! براکتس در مرورگرها اجرا نمی شود.", + "ERROR_IN_BROWSER" : "براکتس با HTML ساخته شده, ولی هم اکنون بعنوان یک برنامه رومیزی(desktop) اجرا می شود و شما می توانید از آن جهت ویرایش پرونده های خود استفاده نمایید.", // FileIndexManager error string "ERROR_MAX_FILES_TITLE" : "خطا در فهرست بندی پرونده ها", @@ -64,7 +64,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE" : "جهت اجرای پیش نمایش زنده بصورت پرونده در سمت سرور(server-side), می بایست یک URL پایه برای پروژه تعریف نمایید.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "خطا در اجرای سرویس دهنده HTTP برای توسعه زنده پرونده ها. لطفا دوباره تلاش کنید.", "LIVE_DEVELOPMENT_INFO_TITLE" : "به بخش پیش نمایش زنده خوش آمدید!", - "LIVE_DEVELOPMENT_INFO_MESSAGE" : "پیش نمایش زنده برکتس به مرورگر متصل شده و یک پیش نمایش از پرونده HTML شما در مرورگرتان نشان خواهد داد, و هرگونه تغییری در کدهایتان را فورا در پیش نمایش اعمال خواهد نمود.

    در این نسخه موجود برکتس, پیش نمایش تنها با مرورگر Google Chrome برای اعمال فوری مقادیر CSS files برای حالت پیش نمایش کار خواهد کرد. هرگونه تغییری در پرونده های HTML یا JavaScript بصورت خودکار بعد از ذخیر بارگذاری خواهد شد.

    (شما این پیغام را برای بار دیگر مشاهده نخواهید کرد.)", + "LIVE_DEVELOPMENT_INFO_MESSAGE" : "پیش نمایش زنده براکتس به مرورگر متصل شده و یک پیش نمایش از پرونده HTML شما در مرورگرتان نشان خواهد داد, و هرگونه تغییری در کدهایتان را فورا در پیش نمایش اعمال خواهد نمود.

    در این نسخه موجود براکتس, پیش نمایش تنها با مرورگر Google Chrome برای اعمال فوری مقادیر CSS files برای حالت پیش نمایش کار خواهد کرد. هرگونه تغییری در پرونده های HTML یا JavaScript بصورت خودکار بعد از ذخیر بارگذاری خواهد شد.

    (شما این پیغام را برای بار دیگر مشاهده نخواهید کرد.)", "LIVE_DEVELOPMENT_TROUBLESHOOTING" : "برای اطلاع بیشتر, به پیوند روبرو مراجعه کنید Troubleshooting Live Development connection errors.", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "پیش نمایش زنده", @@ -85,8 +85,8 @@ define({ "CONFIRM_FOLDER_DELETE_TITLE" : "تائید حذف", "CONFIRM_FOLDER_DELETE" : "آیا مطمئنید می خواهید این پوشه حذف گردد {0}?", "FILE_DELETED_TITLE" : "پرونده حذف گردید", - "EXT_MODIFIED_MESSAGE" : "{0} تغییراتی بر روی دیسک انجام شده, ولی تغییرات بر روی برکتس ذخیره نگردیده.

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

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

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

    آیا می خواهید تغییرات را حفظ کنید?", // Find, Replace, Find in Files "SEARCH_REGEXP_INFO" : "برای جستجوی regexp از /re/ استفاده کنید", @@ -106,7 +106,7 @@ define({ "RELEASE_NOTES" : "نکات و یادداشت های انتشار", "NO_UPDATE_TITLE" : "بروز هستید!", - "NO_UPDATE_MESSAGE" : "شما درحال استفاده از آخرین نسخه برکتس هستید.", + "NO_UPDATE_MESSAGE" : "شما درحال استفاده از آخرین نسخه براکتس هستید.", "FIND_REPLACE_TITLE_PART1" : "جایگزینی \"", "FIND_REPLACE_TITLE_PART2" : "\" با \"", @@ -251,8 +251,8 @@ define({ // Help menu commands "HELP_MENU" : "راهنما", "CMD_CHECK_FOR_UPDATE" : "برسی برای بروزرسانی", - "CMD_HOW_TO_USE_BRACKETS" : "چگونه از برکتس استفاده کنم", - "CMD_FORUM" : "برکتس انجمن گفت گو", + "CMD_HOW_TO_USE_BRACKETS" : "چگونه از براکتس استفاده کنم", + "CMD_FORUM" : "براکتس انجمن گفت گو", "CMD_RELEASE_NOTES" : "نکات انتشار", "CMD_REPORT_AN_ISSUE" : "گذارش یک مورد", "CMD_SHOW_EXTENSIONS_FOLDER" : "نمایش پوشه افزونه ها", @@ -285,9 +285,9 @@ define({ "ABOUT_TEXT_LINE5" : "ساخته شده با \u2764 و JavaScript بدست:", "ABOUT_TEXT_LINE6" : "بسیاری از مردم", "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs and the Web Platform graphical logo are licensed under a Creative Commons Attribution license, CC-BY 3.0 Unported.", - "UPDATE_NOTIFICATION_TOOLTIP" : "Build جدیدی ازبرکتس هم اکنون در دسترس است! جهت مشاهده جزئیات کلیک کنید.", + "UPDATE_NOTIFICATION_TOOLTIP" : "Build جدیدی ازبراکتس هم اکنون در دسترس است! جهت مشاهده جزئیات کلیک کنید.", "UPDATE_AVAILABLE_TITLE" : "بروزرسانی در دسترس است", - "UPDATE_MESSAGE" : "نسخه جدیدی از برکتس هم اکنون در دسترس است. برخی از مشخصه های آن:", + "UPDATE_MESSAGE" : "نسخه جدیدی از براکتس هم اکنون در دسترس است. برخی از مشخصه های آن:", "GET_IT_NOW" : "هم اکنون دانلود کنید!", "PROJECT_SETTINGS_TITLE" : "تنظیمات پروژه برای: {0}", "PROJECT_SETTING_BASE_URL" : "پیش نمایش URL اصلی/پایه", @@ -304,7 +304,7 @@ define({ "REMOVE" : "حذف", "OVERWRITE" : "دوباره نویسی", "CANT_REMOVE_DEV" : "افزونه های موجود در پوشه \"dev\" می بایست بصورت دستی حذف گردند.", - "CANT_UPDATE" : "بروز رسانی سازگار با این نسخه از برکتس نیست.", + "CANT_UPDATE" : "بروز رسانی سازگار با این نسخه از براکتس نیست.", "INSTALL_EXTENSION_TITLE" : "نصب افزونه", "UPDATE_EXTENSION_TITLE" : "بروز رسانی افزونه", "INSTALL_EXTENSION_LABEL" : "URL افزونه", @@ -322,9 +322,9 @@ define({ "BAD_PACKAGE_NAME" : "نام بسته {0} نامعتبر می باشد.", "MISSING_PACKAGE_VERSION" : "پرونده package.json دارای خطا در نسخه می باشد.", "INVALID_VERSION_NUMBER" : "عدد نسخه این بسته ({0}) نا معتبر می باشد.", - "INVALID_BRACKETS_VERSION" : "خطا در سازگاری برکتس با رشته نامعتبر({0}).", + "INVALID_BRACKETS_VERSION" : "خطا در سازگاری براکتس با رشته نامعتبر({0}).", "DISALLOWED_WORDS" : "عبارت ({1}) اجازه وارد سازی در این فیلد را ندارد {0}.", - "API_NOT_COMPATIBLE" : "افزونه با این نسخه از برنامه برکتس سازگار نیست. در پوشه افزونه های قابل نمایش نصب نشد.", + "API_NOT_COMPATIBLE" : "افزونه با این نسخه از برنامه براکتس سازگار نیست. در پوشه افزونه های قابل نمایش نصب نشد.", "MISSING_MAIN" : "بسته حاوی پرونده main.js نیست.", "EXTENSION_ALREADY_INSTALLED" : "نصب این بسته سبب دوباره نویسی پرونده های افزونه قبلی می شود. دوباره نویسی صورت گیرد?", "EXTENSION_SAME_VERSION" : "نسخه این بسته با نسخه بسته ای که هم اکنون نصب می باشد برابر است. آیا افزونه دوباره نویسی گردد?", @@ -343,27 +343,27 @@ define({ "INSTALL_FROM_URL" : "نصب از URL\u2026", "EXTENSION_AUTHOR" : "مولف", "EXTENSION_DATE" : "تاریخ", - "EXTENSION_INCOMPATIBLE_NEWER" : "این افزونه احتیاج به نسخه جدیدی از برکتس دارد.", - "EXTENSION_INCOMPATIBLE_OLDER" : "نسخه فعلی این افزونه فقط با نسخه های قبلی برکتس سازگار است.", + "EXTENSION_INCOMPATIBLE_NEWER" : "این افزونه احتیاج به نسخه جدیدی از براکتس دارد.", + "EXTENSION_INCOMPATIBLE_OLDER" : "نسخه فعلی این افزونه فقط با نسخه های قبلی براکتس سازگار است.", "EXTENSION_NO_DESCRIPTION" : "بدون شرح", "EXTENSION_MORE_INFO" : "اطلاعات بیشتر...", "EXTENSION_ERROR" : "خطای افزونه", "EXTENSION_KEYWORDS" : "کلمات کلیدی", "EXTENSION_INSTALLED" : "نصب شده", - "EXTENSION_UPDATE_INSTALLED" : "این افزونه دریافت شده و بعد از ترک برکتس نصب خواهد شد.", + "EXTENSION_UPDATE_INSTALLED" : "این افزونه دریافت شده و بعد از ترک براکتس نصب خواهد شد.", "EXTENSION_SEARCH_PLACEHOLDER" : "جستجو", "EXTENSION_MORE_INFO_LINK" : "بیشتر", "BROWSE_EXTENSIONS" : "پیمایش افزونه ها", "EXTENSION_MANAGER_REMOVE" : "حذف افزونه", - "EXTENSION_MANAGER_REMOVE_ERROR" : "ناتوان در حذف یک یا برخی از افزونه ها: {0}. برکتس درحال ترک.", + "EXTENSION_MANAGER_REMOVE_ERROR" : "ناتوان در حذف یک یا برخی از افزونه ها: {0}. براکتس درحال ترک.", "EXTENSION_MANAGER_UPDATE" : "بروزرسانی افزونه", - "EXTENSION_MANAGER_UPDATE_ERROR" : "ناتوان در بروزرسانی یک یا برخی از افزونه ها: {0}. برکتس درحال ترک.", + "EXTENSION_MANAGER_UPDATE_ERROR" : "ناتوان در بروزرسانی یک یا برخی از افزونه ها: {0}. براکتس درحال ترک.", "MARKED_FOR_REMOVAL" : "نشانه گذاری جهت حذف", "UNDO_REMOVE" : "Undo", "MARKED_FOR_UPDATE" : "انتخاب شده برای بروزرسانی", "UNDO_UPDATE" : "Undo", "CHANGE_AND_QUIT_TITLE" : "تغییر در افزونه ها", - "CHANGE_AND_QUIT_MESSAGE" : "جهت بروزرسانی یا حذف افزونه ها می بایست برکتس را ترک و دوباره اجرا کنید. شما می بایست تغییرات ذخیره نشده را ذخیره نمایید.", + "CHANGE_AND_QUIT_MESSAGE" : "جهت بروزرسانی یا حذف افزونه ها می بایست براکتس را ترک و دوباره اجرا کنید. شما می بایست تغییرات ذخیره نشده را ذخیره نمایید.", "REMOVE_AND_QUIT" : "حذف افزونه ها و ترک(خروج)", "CHANGE_AND_QUIT" : "تغییر افزونه ها و ترک", "UPDATE_AND_QUIT" : "بروزرسانی افزونه ها و ترک", @@ -384,8 +384,8 @@ define({ // extensions/default/DebugCommands "DEBUG_MENU" : "خطا یابی", "CMD_SHOW_DEV_TOOLS" : "نمایش ابزار های توسعه دهندگان", - "CMD_REFRESH_WINDOW" : "بارگذاری مجدد برکتس", - "CMD_NEW_BRACKETS_WINDOW" : "پنجره برکتس جدید", + "CMD_REFRESH_WINDOW" : "بارگذاری مجدد براکتس", + "CMD_NEW_BRACKETS_WINDOW" : "پنجره براکتس جدید", "CMD_SWITCH_LANGUAGE" : "انتخاب زبان", "CMD_RUN_UNIT_TESTS" : "اجرای test", "CMD_SHOW_PERF_DATA" : "نمایش داده های عملکردی", @@ -395,7 +395,7 @@ define({ "LANGUAGE_TITLE" : "انتخاب زبان", "LANGUAGE_MESSAGE" : "زبان:", - "LANGUAGE_SUBMIT" : "بارگذاری مجدد برکتس", + "LANGUAGE_SUBMIT" : "بارگذاری مجدد براکتس", "LANGUAGE_CANCEL" : "لغو", "LANGUAGE_SYSTEM_DEFAULT" : "زبان پیش فرض", From a288ce1cbef9cf0f9aef58f52238a6544909c425 Mon Sep 17 00:00:00 2001 From: sathyamoorthi Date: Wed, 11 Sep 2013 22:32:40 +0530 Subject: [PATCH 0016/1140] Unit test added for close others --- .../default/CloseOthers/unittests.js | 174 ++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 src/extensions/default/CloseOthers/unittests.js diff --git a/src/extensions/default/CloseOthers/unittests.js b/src/extensions/default/CloseOthers/unittests.js new file mode 100644 index 00000000000..79691c73875 --- /dev/null +++ b/src/extensions/default/CloseOthers/unittests.js @@ -0,0 +1,174 @@ +/* + * 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, browser: true, nomen: true, indent: 4, maxerr: 50 */ +/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, brackets, waitsForDone, spyOn */ + +define(function (require, exports, module) { + "use strict"; + + var SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"), + FileUtils = brackets.getModule("file/FileUtils"), + CommandManager, + Commands, + Dialogs, + EditorManager, + DocumentManager; + + describe("CloseOthers", function () { + var extensionPath = FileUtils.getNativeModuleDirectoryPath(module), + testPath = extensionPath + "/unittest-files/", + testWindow, + $, + docSelectIndex, + cmdToRun, + brackets; + + function createUntitled(count) { + function doCreateUntitled(content) { + runs(function () { + var promise = CommandManager.execute(Commands.FILE_NEW_UNTITLED); + promise.done(function (untitledDoc) { + untitledDoc.replaceRange(content, {line: 0, ch: 0}); + }); + waitsForDone(promise, "FILE_NEW_UNTITLED"); + }); + } + + var i; + for (i = 0; i < count; i++) { + doCreateUntitled(String(i)); + } + } + + /** Expect a file to exist (failing test if not) and then delete it */ + function expectAndDelete(fullPath) { + runs(function () { + var promise = SpecRunnerUtils.resolveNativeFileSystemPath(fullPath); + waitsForDone(promise, "Verify file exists: " + fullPath); + }); + runs(function () { + var promise = SpecRunnerUtils.deletePath(fullPath); + waitsForDone(promise, "Remove testfile " + fullPath); + }); + } + + function getFilename(i) { + return testPath + "test_closeothers" + i + ".js"; + } + + beforeEach(function () { + + runs(function () { + SpecRunnerUtils.createTestWindowAndRun(this, function (w) { + testWindow = w; + $ = testWindow.$; + brackets = testWindow.brackets; + DocumentManager = testWindow.brackets.test.DocumentManager; + CommandManager = testWindow.brackets.test.CommandManager; + EditorManager = testWindow.brackets.test.EditorManager; + Dialogs = testWindow.brackets.test.Dialogs; + Commands = testWindow.brackets.test.Commands; + }); + }); + + runs(function () { + SpecRunnerUtils.loadProjectInTestWindow(testPath); + }); + + createUntitled(5); + + runs(function () { + var fileI = 0; + spyOn(testWindow.brackets.fs, 'showSaveDialog').andCallFake(function (dialogTitle, initialPath, proposedNewName, callback) { + callback(undefined, getFilename(fileI)); + fileI++; + }); + + var promise = CommandManager.execute(Commands.FILE_SAVE_ALL); + waitsForDone(promise, "FILE_SAVE_ALL"); + }); + }); + + afterEach(function () { + // Verify files exist & clean up + [0, 1, 2, 3, 4].forEach(function (i) { + expectAndDelete(getFilename(i)); + }); + + testWindow = null; + $ = null; + brackets = null; + EditorManager = null; + SpecRunnerUtils.closeTestWindow(); + }); + + + function runCloseOthers() { + var ws = DocumentManager.getWorkingSet(), + promise; + + if (ws.length > docSelectIndex) { + DocumentManager.getDocumentForPath(ws[docSelectIndex].fullPath).done(function (doc) { + DocumentManager.setCurrentDocument(doc); + }); + + promise = CommandManager.execute(cmdToRun); + waitsForDone(promise, cmdToRun); + } + } + + it("Close others", function () { + docSelectIndex = 2; + cmdToRun = "file.close_others"; + + runs(runCloseOthers); + + runs(function () { + expect(DocumentManager.getWorkingSet().length).toEqual(1); + }); + }); + + it("Close others above", function () { + docSelectIndex = 2; + cmdToRun = "file.close_above"; + + runs(runCloseOthers); + + runs(function () { + expect(DocumentManager.getWorkingSet().length).toEqual(3); + }); + }); + + it("Close others below", function () { + docSelectIndex = 1; + cmdToRun = "file.close_below"; + + runs(runCloseOthers); + + runs(function () { + expect(DocumentManager.getWorkingSet().length).toEqual(2); + }); + }); + }); +}); From 9086c1d1c1324c20f8548b05a22b55756b1fa1e8 Mon Sep 17 00:00:00 2001 From: sathyamoorthi Date: Wed, 11 Sep 2013 22:55:56 +0530 Subject: [PATCH 0017/1140] jsHint fixes --- src/extensions/default/CloseOthers/unittests.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/extensions/default/CloseOthers/unittests.js b/src/extensions/default/CloseOthers/unittests.js index 79691c73875..452388ea905 100644 --- a/src/extensions/default/CloseOthers/unittests.js +++ b/src/extensions/default/CloseOthers/unittests.js @@ -22,7 +22,7 @@ */ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, brackets, waitsForDone, spyOn */ +/*global define, describe, it, expect, beforeEach, afterEach, runs, brackets, waitsForDone, spyOn */ define(function (require, exports, module) { "use strict"; @@ -37,7 +37,7 @@ define(function (require, exports, module) { describe("CloseOthers", function () { var extensionPath = FileUtils.getNativeModuleDirectoryPath(module), - testPath = extensionPath + "/unittest-files/", + testPath = extensionPath + "/unittest-files/", testWindow, $, docSelectIndex, @@ -143,10 +143,10 @@ define(function (require, exports, module) { cmdToRun = "file.close_others"; runs(runCloseOthers); - - runs(function () { - expect(DocumentManager.getWorkingSet().length).toEqual(1); - }); + + runs(function () { + expect(DocumentManager.getWorkingSet().length).toEqual(1); + }); }); it("Close others above", function () { From df2c99ddd65f5bfa26c67391328cc2058e483f13 Mon Sep 17 00:00:00 2001 From: Mohammad Yaghobi Date: Thu, 12 Sep 2013 13:40:54 +0430 Subject: [PATCH 0018/1140] Fix translation to Persian --- src/nls/fa-ir/strings.js | 32 +++++++++++++++++++++++++++----- src/nls/fa-ir/urls.js | 30 ++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index e647466af7c..da0f3e6fbba 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -1,15 +1,37 @@ +/* + * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ -//********************* Translated by: Mohammad.Yaghobi -//********************* info@pgrammer.com --- m.yaghobi.abc@gmail.com +/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ +/*global define */ define({ - /** + /* * Errors */ // General file io error strings - "APP_NAME" : "براکتس", + "APP_NAME" : "براکتس", "GENERIC_ERROR" : "(خطا {0})", "NOT_FOUND_ERR" : "پرونده پیدا نشد.", "NOT_READABLE_ERR" : "فایل قابل خواندن نیست.", @@ -411,7 +433,7 @@ define({ "LOCALE_IT" : "Italian", "LOCALE_JA" : "Japanese", "LOCALE_NB" : "Norwegian", - "LOCALE_fa_ir" : "Persian-پارسی", + "LOCALE_fa_ir" : "Persian-پارسی", "LOCALE_PL" : "Polish", "LOCALE_PT_BR" : "Portuguese, Brazil", "LOCALE_PT_PT" : "Portuguese", diff --git a/src/nls/fa-ir/urls.js b/src/nls/fa-ir/urls.js index 99d26fa439c..db6c9ad6274 100644 --- a/src/nls/fa-ir/urls.js +++ b/src/nls/fa-ir/urls.js @@ -1,8 +1,30 @@ +/* + * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ +/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ +/*global define */ define({ - // Relative to the samples folder - "GETTING_STARTED" : "root/Getting Started", - "ADOBE_THIRD_PARTY" : "http://www.adobe.com/go/thirdparty/", - "WEB_PLATFORM_DOCS_LICENSE" : "http://creativecommons.org/licenses/by/3.0/", + // Relative to the samples folder + "WEB_PLATFORM_DOCS_LICENSE" : "http://creativecommons.org/licenses/by/3.0/deed.fa", }); From 31a1cfbbc32730d27be274778a60f8fecfc2df27 Mon Sep 17 00:00:00 2001 From: Mohammad Yaghobi Date: Fri, 13 Sep 2013 15:19:48 +0430 Subject: [PATCH 0019/1140] Improve Persian translation --- src/nls/fa-ir/strings.js | 38 +++++++++++++++++++------------------- src/nls/fa-ir/urls.js | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index da0f3e6fbba..2c6c7bdbb1e 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -130,7 +130,7 @@ define({ "NO_UPDATE_TITLE" : "بروز هستید!", "NO_UPDATE_MESSAGE" : "شما درحال استفاده از آخرین نسخه براکتس هستید.", - "FIND_REPLACE_TITLE_PART1" : "جایگزینی \"", + "FIND_REPLACE_TITLE_PART1" : "جستجو و جایگزینی \"", "FIND_REPLACE_TITLE_PART2" : "\" با \"", "FIND_REPLACE_TITLE_PART3" : "\" — {2} {0} {1}", @@ -225,13 +225,13 @@ define({ "CMD_FIND_IN_SUBTREE" : "جستجو در\u2026", "CMD_FIND_NEXT" : "بعدی", "CMD_FIND_PREVIOUS" : "قبلی", - "CMD_REPLACE" : "جایگزینی", + "CMD_REPLACE" : "جستجو و جایگزینی", "CMD_INDENT" : "برجسته سازی", "CMD_UNINDENT" : "حذف برجستگی", "CMD_DUPLICATE" : "دو نسخه کردن", "CMD_DELETE_LINES" : "حذف خط", - "CMD_COMMENT" : "تعویض خط نظر", - "CMD_BLOCK_COMMENT" : "تعویض قالب نظر", + "CMD_COMMENT" : "تعویض خط به نظر", + "CMD_BLOCK_COMMENT" : "تعویض نظر به خط", "CMD_LINE_UP" : "خط را یکی به بالا ببر", "CMD_LINE_DOWN" : "خط را یکی به پایین ببر", "CMD_OPEN_LINE_ABOVE" : "باز کردن خط بالا", @@ -241,16 +241,16 @@ define({ // View menu commands "VIEW_MENU" : "نمایش", - "CMD_HIDE_SIDEBAR" : "پنهان کردن نوار", + "CMD_HIDE_SIDEBAR" : "پنهان کردن نوار کاری", "CMD_SHOW_SIDEBAR" : "نمایش نوار", "CMD_INCREASE_FONT_SIZE" : "افزایش سایز نوشته ها", "CMD_DECREASE_FONT_SIZE" : "کاهش سایز نوشته ها", "CMD_RESTORE_FONT_SIZE" : "پیشفرض سایز نوشته ها", "CMD_SCROLL_LINE_UP" : "حرکت به بالا", "CMD_SCROLL_LINE_DOWN" : "حرکت به پایین", - "CMD_TOGGLE_LINE_NUMBERS" : "شماره سطرها/خط ها", - "CMD_TOGGLE_ACTIVE_LINE" : "نشانه گذاری خط/سطر فعال", - "CMD_TOGGLE_WORD_WRAP" : "شکستن کلمات", + "CMD_TOGGLE_LINE_NUMBERS" : "شماره گذاری خط ها", + "CMD_TOGGLE_ACTIVE_LINE" : "نشانه گذاری خط فعال", + "CMD_TOGGLE_WORD_WRAP" : "شکستن عبارات طولانی", "CMD_SORT_WORKINGSET_BY_ADDED" : "مرتب سازی بر اساس ترتیب افزودن", "CMD_SORT_WORKINGSET_BY_NAME" : "مرتب سازی بر اساس نام", "CMD_SORT_WORKINGSET_BY_TYPE" : "مرتب سازی بر اساس نوع", @@ -267,19 +267,19 @@ define({ "CMD_QUICK_EDIT_NEXT_MATCH" : "تطبیق یافته بعدی", "CMD_NEXT_DOC" : "سند بعدی", "CMD_PREV_DOC" : "سند قبلی", - "CMD_SHOW_IN_TREE" : "نمایش در پرونده درختی", + "CMD_SHOW_IN_TREE" : "نمایش پرونده در میان پرونده های کاری", "CMD_SHOW_IN_OS" : "نمایش در OS", // Help menu commands "HELP_MENU" : "راهنما", "CMD_CHECK_FOR_UPDATE" : "برسی برای بروزرسانی", "CMD_HOW_TO_USE_BRACKETS" : "چگونه از براکتس استفاده کنم", - "CMD_FORUM" : "براکتس انجمن گفت گو", + "CMD_FORUM" : "انجمن گفتگوی براکتس", "CMD_RELEASE_NOTES" : "نکات انتشار", - "CMD_REPORT_AN_ISSUE" : "گذارش یک مورد", + "CMD_REPORT_AN_ISSUE" : "گزارش یک مورد اشکال", "CMD_SHOW_EXTENSIONS_FOLDER" : "نمایش پوشه افزونه ها", "CMD_TWITTER" : "{TWITTER_NAME} در تویتر", - "CMD_ABOUT" : "پیرامون {APP_TITLE}", + "CMD_ABOUT" : "پیرامون براکتس", // Special commands invoked by the native shell @@ -297,18 +297,18 @@ define({ "DELETE" : "حذف", "RELOAD_FROM_DISK" : "دوباره بارگذاری کن از دیسک", "KEEP_CHANGES_IN_EDITOR" : "تغییرات در ویرایشگر را نگه دار", - "CLOSE_DONT_SAVE" : "بستن(بدون ذخیرهسازی)", + "CLOSE_DONT_SAVE" : "بستن(بدون ذخیره سازی)", "RELAUNCH_CHROME" : "اجرای دوباره Chrome", "ABOUT" : "پیرامون", "CLOSE" : "بستن", "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}", - "ABOUT_TEXT_LINE3" : "
    یادداشتهای ها، شرایط و ضوابط مربوط به نرم افزار شخص ثالث در آدرسhttp://www.adobe.com/go/thirdparty/ جهت تلفیق و بعنوان مرجع قرار داده شده.", - "ABOUT_TEXT_LINE4" : "اسناد و منابع نرم افزار در پیوند https://github.com/adobe/brackets/ در دسترس می باشد.
    ترجمه توسط: محمد یعقوبی
    info@pgrammer.com
    ", - "ABOUT_TEXT_LINE5" : "ساخته شده با \u2764 و JavaScript بدست:", + "ABOUT_TEXT_LINE3" : "
    یادداشتهای ها، شرایط و ضوابط مربوط به نرم افزار و حقوق شخص ثالث در آدرسhttp://www.adobe.com/go/thirdparty/ جهت تلفیق و بعنوان مرجع قرار داده شده.", + "ABOUT_TEXT_LINE4" : "اسناد، نکات و منابع نرم افزار در پیوند https://github.com/adobe/brackets/ در دسترس می باشد. می توانید جهت مشاهده سریع بروزرسانی های قبل از انتشار نرم افزار بهمین لینک مراجعه فرمایید.
    ترجمه توسط محمد یعقوبی", + "ABOUT_TEXT_LINE5" : "ساخته شده با \u2764 و JavaScript و بدست:", "ABOUT_TEXT_LINE6" : "بسیاری از مردم", "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs and the Web Platform graphical logo are licensed under a Creative Commons Attribution license, CC-BY 3.0 Unported.", "UPDATE_NOTIFICATION_TOOLTIP" : "Build جدیدی ازبراکتس هم اکنون در دسترس است! جهت مشاهده جزئیات کلیک کنید.", - "UPDATE_AVAILABLE_TITLE" : "بروزرسانی در دسترس است", + "UPDATE_AVAILABLE_TITLE" : "بروزرسانی جدید در دسترس است", "UPDATE_MESSAGE" : "نسخه جدیدی از براکتس هم اکنون در دسترس است. برخی از مشخصه های آن:", "GET_IT_NOW" : "هم اکنون دانلود کنید!", "PROJECT_SETTINGS_TITLE" : "تنظیمات پروژه برای: {0}", @@ -407,7 +407,7 @@ define({ "DEBUG_MENU" : "خطا یابی", "CMD_SHOW_DEV_TOOLS" : "نمایش ابزار های توسعه دهندگان", "CMD_REFRESH_WINDOW" : "بارگذاری مجدد براکتس", - "CMD_NEW_BRACKETS_WINDOW" : "پنجره براکتس جدید", + "CMD_NEW_BRACKETS_WINDOW" : "یک پنجره جدید از براکتس باز کنید", "CMD_SWITCH_LANGUAGE" : "انتخاب زبان", "CMD_RUN_UNIT_TESTS" : "اجرای test", "CMD_SHOW_PERF_DATA" : "نمایش داده های عملکردی", @@ -471,4 +471,4 @@ define({ // extensions/default/WebPlatformDocs "DOCS_MORE_LINK" : "بیشتر بخوانید" -}); +}); \ No newline at end of file diff --git a/src/nls/fa-ir/urls.js b/src/nls/fa-ir/urls.js index db6c9ad6274..5bd42f56dd3 100644 --- a/src/nls/fa-ir/urls.js +++ b/src/nls/fa-ir/urls.js @@ -27,4 +27,4 @@ define({ // Relative to the samples folder "WEB_PLATFORM_DOCS_LICENSE" : "http://creativecommons.org/licenses/by/3.0/deed.fa", -}); +}); \ No newline at end of file From 5f2c80926bcc4ccf17b619cf9aeb755c76f167bc Mon Sep 17 00:00:00 2001 From: sathyamoorthi Date: Wed, 18 Sep 2013 10:17:16 +0530 Subject: [PATCH 0020/1140] unnittest-files folder added. --- src/extensions/default/CloseOthers/unittest-files/dummy.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/extensions/default/CloseOthers/unittest-files/dummy.js diff --git a/src/extensions/default/CloseOthers/unittest-files/dummy.js b/src/extensions/default/CloseOthers/unittest-files/dummy.js new file mode 100644 index 00000000000..7ed0ff9bdbc --- /dev/null +++ b/src/extensions/default/CloseOthers/unittest-files/dummy.js @@ -0,0 +1 @@ +//This is dummy file. To commit unnittest-files folder git needs a file. \ No newline at end of file From 21bd1d431eabfbab0014451b7531d762b0850d84 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 21 Sep 2013 22:28:10 +0200 Subject: [PATCH 0021/1140] Remove the ability to switch language to the current language The "Restart brackets" button will be disabled if you select the current lang in the "Switch Language" dialog. Tested on Windows 8 with Brackets 0.32 master c05cfd5 --- src/extensions/default/DebugCommands/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index c28588bf8a0..328ab3a6bfe 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -150,9 +150,9 @@ define(function (require, exports, module) { languages = []; function setLanguage(event) { - locale = $select.val(); - $submit.prop("disabled", false); - } + locale = $select.val(); + $submit.prop("disabled", locale === (curLocale === null ? "" : curLocale)); + } // returns the localized label for the given locale // or the locale, if nothing found From 22d0c8d8f521821b681ebfe1b7951686159e43de Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 21 Sep 2013 22:30:07 +0200 Subject: [PATCH 0022/1140] Fixed indent --- src/extensions/default/DebugCommands/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index 328ab3a6bfe..dc753729414 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -150,9 +150,9 @@ define(function (require, exports, module) { languages = []; function setLanguage(event) { - locale = $select.val(); - $submit.prop("disabled", locale === (curLocale === null ? "" : curLocale)); - } + locale = $select.val(); + $submit.prop("disabled", locale === (curLocale === null ? "" : curLocale)); + } // returns the localized label for the given locale // or the locale, if nothing found From abf883ae3a19aba58c5aaa40ab9e60990217f931 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Mon, 23 Sep 2013 15:36:32 +0200 Subject: [PATCH 0023/1140] Fix #5275: $1 and so on now work with replacing with RegEx Fixes #5275 --- src/search/FindReplace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js index 89f88d3a799..4b49caff897 100644 --- a/src/search/FindReplace.js +++ b/src/search/FindReplace.js @@ -564,7 +564,7 @@ define(function (require, exports, module) { }; var doReplace = function (match) { cursor.replace(typeof query === "string" ? text : - text.replace(/\$(\d)/, fnMatch)); + text.replace(/\$(\d)/, function (w, i) { return match[i]; })); advance(); }; advance(); From 15db0a455fcee82a8e81563c500aeac22ac6df09 Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Mon, 23 Sep 2013 15:51:44 -0700 Subject: [PATCH 0024/1140] Don't allow drag-and-drop of files/folders when a modal dialog is showing. --- src/brackets.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/brackets.js b/src/brackets.js index a65ba1bd44e..f255e376bd3 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -299,7 +299,9 @@ define(function (require, exports, module) { if (event.originalEvent.dataTransfer.files) { event.stopPropagation(); event.preventDefault(); - if (DragAndDrop.isValidDrop(event.originalEvent.dataTransfer.items)) { + // Don't allow drag-and-drop of files/folders when a modal dialog is showing. + if ($(".modal.instance").length === 0 && + DragAndDrop.isValidDrop(event.originalEvent.dataTransfer.items)) { dropEffect = "copy"; } event.originalEvent.dataTransfer.dropEffect = dropEffect; From 3189d09b8fa6135691cb5f2ed4eb7e4b88a2c096 Mon Sep 17 00:00:00 2001 From: kvarel Date: Wed, 25 Sep 2013 00:01:59 +0200 Subject: [PATCH 0025/1140] czech language - sprint 31 updated --- src/nls/cs/strings.js | 63 ++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/src/nls/cs/strings.js b/src/nls/cs/strings.js index f5f629c8482..4bf9e39fba0 100644 --- a/src/nls/cs/strings.js +++ b/src/nls/cs/strings.js @@ -86,13 +86,14 @@ define({ "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Chyba při spouštění HTTP serveru pro soubory živého náhledu. Prosím, zkuste to znovu.", "LIVE_DEVELOPMENT_INFO_TITLE" : "Vítejte v živém náhledu!", "LIVE_DEVELOPMENT_INFO_MESSAGE" : "Živý náhled připojí {APP_NAME} k vašemu prohlížeči. Spustí náhled HTML souboru, který se aktualizuje pokaždé, kdy editujete svůj kód.

    V této verzi {APP_NAME}, živý náhled funguje pouze v Google Chrome a aktualizuje změny v CSS souborech. Změny v HTML nebo JavaScript souborech jsou automaticky načteny, když soubor uložíte.

    (Tato zpráva se zobrazí pouze jednou.)", - "LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Pro více informací navštivte Troubleshooting Live Development connection errors.", + "LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Pro více informací navštivte Troubleshooting Live Development connection errors.", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "Živý náhled", "LIVE_DEV_STATUS_TIP_PROGRESS1" : "Živý náhled: Připojování\u2026", "LIVE_DEV_STATUS_TIP_PROGRESS2" : "Živý náhled: Spouštění\u2026", "LIVE_DEV_STATUS_TIP_CONNECTED" : "Zrušit živý náhled", "LIVE_DEV_STATUS_TIP_OUT_OF_SYNC" : "Živý náhled: Klikněte pro odpojení (uložte soubor)", + "LIVE_DEV_STATUS_TIP_SYNC_ERROR" : "Živý náhled (neaktulalizuje se díky syntaxové chybě)", "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS" : "Živý náhled byl zrušen, protože byly otevřeny vývojářské nástroje prohlížeče", "LIVE_DEV_DETACHED_TARGET_CLOSED" : "Živý náhled byl zrušen, protože dokument byl zavřen v prohlížeči", @@ -112,10 +113,19 @@ define({ // Najít, Nahradit, Nahradit v souborech "SEARCH_REGEXP_INFO" : "Použijte /re/ syntax pro regexp hledání", "FIND_RESULT_COUNT" : "{0} výsledků", + "FIND_RESULT_COUNT_SINGLE" : "1 výsledek", + "FIND_NO_RESULTS" : "Žádné výsledky", "WITH" : "S", "BUTTON_YES" : "Ano", "BUTTON_NO" : "Ne", + "BUTTON_REPLACE_ALL" : "Vše\u2026", "BUTTON_STOP" : "Stop", + "BUTTON_REPLACE" : "Nahradit", + + "BUTTON_NEXT" : "\u25B6", + "BUTTON_PREV" : "\u25C0", + "BUTTON_NEXT_HINT" : "Další shoda", + "BUTTON_PREV_HINT" : "Předcházející shoda", "OPEN_FILE" : "Otevřít soubor", "SAVE_FILE_AS" : "Uložit soubor", @@ -125,19 +135,22 @@ define({ "NO_UPDATE_TITLE" : "Vše je aktuální!", "NO_UPDATE_MESSAGE" : "Verze {APP_NAME} je aktuální.", - "FIND_IN_FILES_TITLE" : "pro \"{4}\" {5} - {0} {1} v {2} {3}", + "FIND_REPLACE_TITLE_PART1" : "Nahradit \"", + "FIND_REPLACE_TITLE_PART2" : "\" s \"", + "FIND_REPLACE_TITLE_PART3" : "\" — {2} {0} {1}", + + "FIND_IN_FILES_TITLE_PART1" : "\"", + "FIND_IN_FILES_TITLE_PART2" : "\" nalezen", + "FIND_IN_FILES_TITLE_PART3" : "— {0} {1} v {2} {3}", "FIND_IN_FILES_SCOPED" : "v {0}", "FIND_IN_FILES_NO_SCOPE" : "v projektu", - "FIND_IN_FILES_FILE" : "soubor", + "FIND_IN_FILES_FILE" : "souboru", "FIND_IN_FILES_FILES" : "souborech", "FIND_IN_FILES_MATCH" : "výsledek", "FIND_IN_FILES_MATCHES" : "výsledků", "FIND_IN_FILES_MORE_THAN" : "více než ", "FIND_IN_FILES_PAGING" : "{0}—{1}", - "FIND_IN_FILES_LESS" : " Méně", - "FIND_IN_FILES_MORE" : " Více", "FIND_IN_FILES_FILE_PATH" : "Soubor: {0}", - "FIND_IN_FILES_LINE" : "řádek: {0}", "ERROR_FETCHING_UPDATE_INFO_TITLE" : "Chyba při získávání informací o aktualizaci", "ERROR_FETCHING_UPDATE_INFO_MSG" : "Nelze získat aktualizace. Ujistěte se, že máte připojení na internet a zkuste to znovu.", @@ -173,6 +186,15 @@ define({ "STATUSBAR_LINE_COUNT_SINGULAR" : "Řádek: {0}", "STATUSBAR_LINE_COUNT_PLURAL" : "Řádky: {0}", + // CodeInspection: chyby/varování + "ERRORS_PANEL_TITLE" : "{0} chyb", + "SINGLE_ERROR" : "1 {0} chyba", + "MULTIPLE_ERRORS" : "{1} {0} chyby", + "NO_ERRORS" : "Žádné {0} chyby - dobrá práce!", + "LINT_DISABLED" : "Lint je vypnutý", + "NO_LINT_AVAILABLE" : "Lint není dostupný pro {0}", + "NOTHING_TO_LINT" : "Nic pro lintování", + /** * Příkazy */ @@ -242,6 +264,7 @@ define({ "CMD_TOGGLE_LINE_NUMBERS" : "Čísla řádků", "CMD_TOGGLE_ACTIVE_LINE" : "Zvýraznit aktivní řádek", "CMD_TOGGLE_WORD_WRAP" : "Zalomit řádky", + "CMD_VIEW_TOGGLE_INSPECTION" : "Lint soubory pro uložení", "CMD_SORT_WORKINGSET_BY_ADDED" : "Řadit podle data", "CMD_SORT_WORKINGSET_BY_NAME" : "Řadit podle jména", "CMD_SORT_WORKINGSET_BY_TYPE" : "Řadit podle typu", @@ -252,6 +275,7 @@ define({ "CMD_QUICK_OPEN" : "Rychle otevřít", "CMD_GOTO_LINE" : "Přejít na řádek", "CMD_GOTO_DEFINITION" : "Přejít na funkci", + "CMD_GOTO_FIRST_PROBLEM" : "Přejít na první chybu/varování", "CMD_TOGGLE_QUICK_EDIT" : "Rychlá úprava", "CMD_TOGGLE_QUICK_DOCS" : "Rychlá dokumentace", "CMD_QUICK_EDIT_PREV_MATCH" : "Předchozí shoda", @@ -273,11 +297,6 @@ define({ "CMD_ABOUT" : "O aplikaci {APP_TITLE}", - // Speciální příkazy spustěné pomocí shell - "CMD_CLOSE_WINDOW" : "Zavřít okno", - "CMD_ABORT_QUIT" : "Zrušit", - "CMD_BEFORE_MENUPOPUP" : "Before Menu Popup", - // Řetězce pro main-view.html "EXPERIMENTAL_BUILD" : "experimentální verze", "DEVELOPMENT_BUILD" : "vývojová verze", @@ -293,11 +312,11 @@ define({ "ABOUT" : "O aplikaci", "CLOSE" : "Zavřít", "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}", - "ABOUT_TEXT_LINE3" : "Oznámení, podmínky týkající se software třetích stran jsou umístěny na {ADOBE_THIRD_PARTY} a začleněny prostřednictvím odkazu zde.", - "ABOUT_TEXT_LINE4" : "Dokumentace a zdrojový kód na https://github.com/adobe/brackets/.", + "ABOUT_TEXT_LINE3" : "Oznámení, podmínky týkající se software třetích stran jsou umístěny na http://www.adobe.com/go/thirdparty/ a začleněny prostřednictvím odkazu zde.", + "ABOUT_TEXT_LINE4" : "Dokumentace a zdrojový kód na https://github.com/adobe/brackets/.", "ABOUT_TEXT_LINE5" : "Vytvořeno s \u2764 a pomocí JavaScript těmito lidmi:", "ABOUT_TEXT_LINE6" : "Mnoho lidí (ale momentálně máme problém s načítáním dat).", - "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs a Web Platform logo využívají licenci Creative Commons Attribution, CC-BY 3.0 Unported.", + "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs a Web Platform logo využívají licenci Creative Commons Attribution, CC-BY 3.0 Unported.", "UPDATE_NOTIFICATION_TOOLTIP" : "Je dostupná nová verze {APP_NAME} ! Klikněte zde pro více informací.", "UPDATE_AVAILABLE_TITLE" : "Dostupná aktualizace", "UPDATE_MESSAGE" : "Nová verze {APP_NAME} je dostupná. Seznam některých vylepšení:", @@ -309,7 +328,7 @@ define({ "BASEURL_ERROR_SEARCH_DISALLOWED" : "URL nemůže obsahovat výrazy pro hledání jako \"{0}\".", "BASEURL_ERROR_HASH_DISALLOWED" : "URL nemůže obsahovat znaky jako \"{0}\".", "BASEURL_ERROR_INVALID_CHAR" : "Zvláštní znaky jako '{0}' musí být %-enkódovány.", - "BASEURL_ERROR_UNKNOWN_ERROR" : "Neznámá chyba při zpracování URL", + "BASEURL_ERROR_UNKNOWN_ERROR" : "Neznámá chyba při analýze URL", // Řetězce pro správce doplňků "INSTALL" : "Instalovat", @@ -427,6 +446,7 @@ define({ "LOCALE_PT_BR" : "Portugalsky, Brazílie", "LOCALE_PT_PT" : "Portugalsky", "LOCALE_RU" : "Rusky", + "LOCALE_SK" : "Slovensky", "LOCALE_SV" : "Švédsky", "LOCALE_TR" : "Turecky", "LOCALE_FI" : "Finsky", @@ -444,19 +464,18 @@ define({ // extensions/default/JavaScriptCodeHints "CMD_JUMPTO_DEFINITION" : "Přejít na definici", + "CMD_SHOW_PARAMETER_HINT" : "Zobrazit nápovědu parametru", + "NO_ARGUMENTS" : "<žádné parametry>", // extensions/default/JSLint - "CMD_JSLINT" : "Povolit JSLint", - "CMD_JSLINT_FIRST_ERROR" : "Přejít na první JSLint chybu", - "JSLINT_ERRORS" : "JSLint chyby", - "JSLINT_ERROR_INFORMATION" : "1 JSLint chyba", - "JSLINT_ERRORS_INFORMATION" : "{0} JSLint chyb", - "JSLINT_NO_ERRORS" : "Žádné JSLint chyby - výborně!", - "JSLINT_DISABLED" : "JSLint je vypnut nebo nefunguje s tímto souborem.", + "JSLINT_NAME" : "JSLint", // extensions/default/QuickView "CMD_ENABLE_QUICK_VIEW" : "Rychlý náhled", + // extensions/default/RecentProjects + "CMD_TOGGLE_RECENT_PROJECTS" : "Nedávné projekty", + // extensions/default/WebPlatformDocs "DOCS_MORE_LINK" : "Více" }); From 9b1149d1aae6da9a706ddcf66bf30775d1c714a3 Mon Sep 17 00:00:00 2001 From: RafaelOlivra Date: Wed, 25 Sep 2013 18:05:06 -0300 Subject: [PATCH 0026/1140] Update index.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Translated the alternative image text to pt_BR. From "A screenshot showing CSS Quick Edit" to the equivalent "Uma screenshot mostrando o editor rápido de CSS" --- samples/pt-br/Primeiros Passos/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/pt-br/Primeiros Passos/index.html b/samples/pt-br/Primeiros Passos/index.html index 4100d65e221..7a62521bce9 100644 --- a/samples/pt-br/Primeiros Passos/index.html +++ b/samples/pt-br/Primeiros Passos/index.html @@ -47,7 +47,7 @@

    Edição Rápida de CSS e JavaScript

    - A screenshot showing CSS Quick Edit + Uma screenshot mostrando o editor rápido de CSS \ No newline at end of file +--> From 7d5b253337eb1012cef8f78ccc7c262bc5ab0f62 Mon Sep 17 00:00:00 2001 From: sandeepjain88 Date: Thu, 26 Sep 2013 10:51:40 +0530 Subject: [PATCH 0027/1140] Recent Projects - Pressing delete key removes project from list --- src/extensions/default/RecentProjects/main.js | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/extensions/default/RecentProjects/main.js b/src/extensions/default/RecentProjects/main.js index 654cfad26e0..793dfbc9f2f 100644 --- a/src/extensions/default/RecentProjects/main.js +++ b/src/extensions/default/RecentProjects/main.js @@ -178,6 +178,35 @@ define(function (require, exports, module) { removeDeleteButton(); } + /** + * Deletes the selected item and + * move the focus to next item in list. + * + * @return {boolean} TRUE if project is removed + */ + function removeSelectedItem(e) { + var recentProjects = getRecentProjects(), + $cacheItem = $dropdownItem, + index = recentProjects.indexOf($cacheItem.data("path")); + + // When focus is not on project item + if (index === -1) { + return false; + } + + // remove project + recentProjects.splice(index, 1); + prefs.setValue("recentProjects", recentProjects); + checkHovers(e.pageX, e.pageY); + + if (recentProjects.length === 1) { + $dropdown.find(".divider").remove(); + } + selectNextItem(+1); + $cacheItem.closest("li").remove(); + return true; + } + /** * Handles the Key Down events * @param {KeyboardEvent} event @@ -202,6 +231,13 @@ define(function (require, exports, module) { } keyHandled = true; break; + case KeyEvent.DOM_VK_BACK_SPACE: + case KeyEvent.DOM_VK_DELETE: + keyHandled = true; + if ($dropdownItem) { + removeSelectedItem(event); + } + break; } if (keyHandled) { From b17c774fd6b8f9861eaa4369f65202e0f1f0a49b Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Thu, 26 Sep 2013 16:29:16 +0200 Subject: [PATCH 0028/1140] Update main.js Thanks for the tip ;) --- src/extensions/default/DebugCommands/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index dc753729414..de2b9cc5acb 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -151,7 +151,7 @@ define(function (require, exports, module) { function setLanguage(event) { locale = $select.val(); - $submit.prop("disabled", locale === (curLocale === null ? "" : curLocale)); + $submit.prop("disabled", locale === (curLocale || "")); } // returns the localized label for the given locale From 48202fddf2e3a4c40855856bf4b0dd462e3803df Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Fri, 27 Sep 2013 11:27:12 -0700 Subject: [PATCH 0029/1140] add missing timeout messages --- test/spec/LiveDevelopment-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/spec/LiveDevelopment-test.js b/test/spec/LiveDevelopment-test.js index 5f0029903cb..216077290bd 100644 --- a/test/spec/LiveDevelopment-test.js +++ b/test/spec/LiveDevelopment-test.js @@ -204,7 +204,7 @@ define(function (require, exports, module) { tryConnect(); }); - waitsFor(function () { return connected || failed; }, 10000); + waitsFor(function () { return connected || failed; }, "LiveDevelopmentModule.launcherUrl", 10000); runs(function () { expect(failed).toBe(false); @@ -216,7 +216,7 @@ define(function (require, exports, module) { waitsForDone(promise, "Inspector.Runtime.evaluate", 5000); }); - waitsFor(function () { return !InspectorModule.connected(); }, 10000); + waitsFor(function () { return !InspectorModule.connected(); }, "!InspectorModule.connected()", 10000); }); }); @@ -378,7 +378,7 @@ define(function (require, exports, module) { }); }); - waitsFor(function () { return (fileContent !== null); }, 1000); + waitsFor(function () { return (fileContent !== null); }, "Load fileContent", 1000); } } From 98f06b626dc12b3e55ab7d40c8285dbef8413349 Mon Sep 17 00:00:00 2001 From: Josh Parolin Date: Fri, 27 Sep 2013 22:35:49 -0700 Subject: [PATCH 0030/1140] Add Dust.js language support --- src/language/languages.json | 7 +++++++ tools/setup_for_hacking.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/language/languages.json b/src/language/languages.json index 4964f40021d..99c358510c0 100644 --- a/src/language/languages.json +++ b/src/language/languages.json @@ -46,6 +46,13 @@ "fileExtensions": ["ejs"], "blockComment": [""] }, + + "dust": { + "name": "Dust.js", + "mode": ["htmlembedded", "application/x-ejs"], + "fileExtensions": ["dust"], + "blockComment": [""] + }, "erb_html": { "name": "Embedded Ruby", diff --git a/tools/setup_for_hacking.sh b/tools/setup_for_hacking.sh index fcf85693184..050658f3688 100755 --- a/tools/setup_for_hacking.sh +++ b/tools/setup_for_hacking.sh @@ -8,7 +8,7 @@ if [[ "$platform" == 'Linux' ]]; then default_app_directory='/opt/brackets'; symlink='dev'; elif [[ "$platform" == 'Darwin' ]]; then # MAC OSX - default_app_directory='/Applications/Brackets Sprint 14.app'; + default_app_directory='/Applications/Brackets Sprint 31.app'; symlink='Contents/dev'; else # Warn for unknown operating system? From ef62848df923ef0d82bac421af5bcc592430de3e Mon Sep 17 00:00:00 2001 From: Work Date: Sat, 28 Sep 2013 14:42:01 +0200 Subject: [PATCH 0031/1140] Added Dutch strings --- src/nls/nl/strings.js | 480 ++++++++++++++++++++++++++++++++++++++++ src/nls/root/strings.js | 1 + src/nls/strings.js | 1 + 3 files changed, 482 insertions(+) create mode 100644 src/nls/nl/strings.js diff --git a/src/nls/nl/strings.js b/src/nls/nl/strings.js new file mode 100644 index 00000000000..078a8a485cd --- /dev/null +++ b/src/nls/nl/strings.js @@ -0,0 +1,480 @@ +/* + * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ +/*global define */ + +define({ + + /** + * Errors + */ + + // General file io error strings + "GENERIC_ERROR" : "(error {0})", + "NOT_FOUND_ERR" : "Het bestand kon niet worden gevonden.", + "NOT_READABLE_ERR" : "Het bestand kon niet worden ingelezen.", + "NO_MODIFICATION_ALLOWED_ERR" : "De doelmap kan niet gewijzigd worden.", + "NO_MODIFICATION_ALLOWED_ERR_FILE" : "De bevoegdheden laten u niet toe enige wijzigingen aan te brengen.", + "FILE_EXISTS_ERR" : "Het bestand of de map bestaat al.", + "FILE" : "bestand", + "DIRECTORY" : "map", + + // Project error strings + "ERROR_LOADING_PROJECT" : "Probleem tijdens het laden van het project", + "OPEN_DIALOG_ERROR" : "Er is een fout opgetreden bij het tonen van het dialoogvenster om een bestand te openen. (error {0})", + "REQUEST_NATIVE_FILE_SYSTEM_ERROR" : "Er is een fout opgetreden bij het laden van map {0}. (error {1})", + "READ_DIRECTORY_ENTRIES_ERROR" : "Er is een fout opgetreden bij het lezen van de inhoud van map {0}. (error {1})", + + // File open/save error string + "ERROR_OPENING_FILE_TITLE" : "Probleem bij het openen van een bestand", + "ERROR_OPENING_FILE" : "Er is een fout opgetreden bij het openen van het bestand {0}. {1}", + "ERROR_OPENING_FILES" : "Er is een fout opgetreden bij het openen van de volgende bestanden:", + "ERROR_RELOADING_FILE_TITLE" : "Probleem bij het herladen van wijzigingen op de schijf", + "ERROR_RELOADING_FILE" : "Er is een fout opgetreden bij het herladen van het bestand {0}. {1}", + "ERROR_SAVING_FILE_TITLE" : "Probleem bij het opslaan van een bestand", + "ERROR_SAVING_FILE" : "Er is een fout opgetreden bij het opslaan van het bestand {0}. {1}", + "ERROR_RENAMING_FILE_TITLE" : "Probleem bij het hernoemen van een bestand", + "ERROR_RENAMING_FILE" : "Er is een fout opgetreden bij het hernoemen van het bestand {0}. {1}", + "ERROR_DELETING_FILE_TITLE" : "Probleem bij het verwijderen van een bestand", + "ERROR_DELETING_FILE" : "Er is een fout opgetreden bij het verwijderen van het bestand {0}. {1}", + "INVALID_FILENAME_TITLE" : "Ongeldige {0} naam", + "INVALID_FILENAME_MESSAGE" : "Bestandsnamen kunnen de volgende karakters niet bevatten: /?*:;{}<>\\| of gebruik maken van woorden die door het systeem zijn gereserveerd.", + "FILE_ALREADY_EXISTS" : "Het {0} {1} bestaat al.", + "ERROR_CREATING_FILE_TITLE" : "Probleem bij het aanmaken van een {0}", + "ERROR_CREATING_FILE" : "Er is een fout opgetreden bij het aanmaken van het {0} {1}. {2}", + + // Application error strings + "ERROR_IN_BROWSER_TITLE" : "Oeps! {APP_NAME} werkt nog niet in browsers.", + "ERROR_IN_BROWSER" : "{APP_NAME} is gebouwd in HTML, maar op dit moment werkt het als desktop applicatie zodat je het kan gebruiken om lokale bestanden te bewerken. Gebruik graag de applicatie omgeving op github.com/adobe/brackets-shell om {APP_NAME} te starten.", + + // FileIndexManager error string + "ERROR_MAX_FILES_TITLE" : "Probleem bij het indexeren van bestanden", + "ERROR_MAX_FILES" : "Het maximum aantal bestanden is geïndexeerd. Het kan zijn dat acties om bestanden op te zoeken in de index niet correct verlopen.", + + // Live Development error strings + "ERROR_LAUNCHING_BROWSER_TITLE" : "Probleem bij het starten in de browser", + "ERROR_CANT_FIND_CHROME" : "De Google Chrome browser kon niet gevonden worden. Zorg ervoor dat deze geïnstalleerd is.", + "ERROR_LAUNCHING_BROWSER" : "Er is een fout opgetreden bij het starten van de browser. (error {0})", + + "LIVE_DEVELOPMENT_ERROR_TITLE" : "Probleem met Live Voorbeeld", + "LIVE_DEVELOPMENT_RELAUNCH_TITLE" : "Bezig met verbinden met de browser", + "LIVE_DEVELOPMENT_ERROR_MESSAGE" : "Om met Live Voorbeeld te verbinden, moet Chrome opnieuw gestart worden met debugging op afstand ingeschakeld.

    Wil je Chrome herstarten en debugging op afstand inschakelen?", + "LIVE_DEV_LOADING_ERROR_MESSAGE" : "Onmogelijk om de Live Ontwikkeling pagina te laden", + "LIVE_DEV_NEED_HTML_MESSAGE" : "Open een HTML bestand om Live Voorbeeld te starten.", + "LIVE_DEV_NEED_BASEURL_MESSAGE" : "Om live voorbeeld te starten met een server-side bestand, moet je een Start URL voor dit project definiëren.", + "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Er is een fout opgetreden bij het opstarten van de HTTP server voor live ontwikkeling bestanden. Probeer alsjeblieft opnieuw.", + "LIVE_DEVELOPMENT_INFO_TITLE" : "Welkom bij Live Voorbeeld!", + "LIVE_DEVELOPMENT_INFO_MESSAGE" : "Live Voorbeeld verbindt {APP_NAME} met je browser. Het toont een voorbeeld van je HTML bestand in de browser, vervolgens updatet het voorbeeld onmiddelijk bij het wijzigen van je code.

    In deze vroege versie van {APP_NAME}, werkt Live Voorbeeld enkel met Google Chrome en updatet live bij het wijzigen van CSS of HTML bestanden. Wijzigingen aan JavaScript bestanden worden automatisch herladen wanneer je bewaart.

    (Je zal dit bericht slechts eenmaal zien.)", + "LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Voor meer informatie zie, see Oplossen van Live Ontwikkeling verbindingsproblemen.", + + "LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "Live Voorbeeld", + "LIVE_DEV_STATUS_TIP_PROGRESS1" : "Live Voorbeeld: Bezig met verbinden\u2026", + "LIVE_DEV_STATUS_TIP_PROGRESS2" : "Live Voorbeeld: Initialiseren\u2026", + "LIVE_DEV_STATUS_TIP_CONNECTED" : "Verbreek verbinding met Live Voorbeeld", + "LIVE_DEV_STATUS_TIP_OUT_OF_SYNC" : "Live Voorbeeld (slaag bestand op om te verversen)", + "LIVE_DEV_STATUS_TIP_SYNC_ERROR" : "Live Voorbeeld (niet bezig met opdaten door een verkeerde syntax)", + + "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS" : "Live Voorbeeld is geannuleerd omdat de developer tools in de browser zijn geopend", + "LIVE_DEV_DETACHED_TARGET_CLOSED" : "Live Voorbeeld is geannuleerd omdat de pagina gesloten werd in de browser", + "LIVE_DEV_NAVIGATED_AWAY" : "Live Voorbeeld is geannuleerd omdat de browser navigeerde naar een pagina die geen deel uit maakt van het huidige project", + "LIVE_DEV_CLOSED_UNKNOWN_REASON" : "Live Voorbeeld is geannuleerd om een onbekende reden ({0})", + + "SAVE_CLOSE_TITLE" : "Opslaan van wijzigingen", + "SAVE_CLOSE_MESSAGE" : "Wil je de wijzigingen opslaan die je maakte in het document {0}?", + "SAVE_CLOSE_MULTI_MESSAGE" : "Wil je je wijzigingen van de volgende bestanden opslaan?", + "EXT_MODIFIED_TITLE" : "Externe Wijzigingen", + "CONFIRM_FOLDER_DELETE_TITLE" : "Bevestig Verwijdering", + "CONFIRM_FOLDER_DELETE" : "Ben je zeker dat je de map {0} wil verwijderen?", + "FILE_DELETED_TITLE" : "Bestand Verwijderd", + "EXT_MODIFIED_MESSAGE" : "{0} is gewijzigd op de schijf, maar heeft ook onbewaarde wijzigingen in {APP_NAME}.

    Welke versie wil je behouden?", + "EXT_DELETED_MESSAGE" : "{0} is verwijderd op de schijf, maar heeft onbewaarde wijzigingen in {APP_NAME}.

    Wil je je wijzigingen behouden?", + + // Find, Replace, Find in Files + "SEARCH_REGEXP_INFO" : "Gebruik de /re/ syntax voor een regexp zoekopdracht", + "FIND_RESULT_COUNT" : "{0} resultaten", + "FIND_RESULT_COUNT_SINGLE" : "1 resultaat", + "FIND_NO_RESULTS" : "Geen resultaten", + "WITH" : "Met", + "BUTTON_YES" : "Ja", + "BUTTON_NO" : "Nee", + "BUTTON_REPLACE_ALL" : "Alle\u2026", + "BUTTON_STOP" : "Stop", + "BUTTON_REPLACE" : "Vervang", + + "BUTTON_NEXT" : "\u25B6", + "BUTTON_PREV" : "\u25C0", + "BUTTON_NEXT_HINT" : "Volgende Overeenkomst", + "BUTTON_PREV_HINT" : "Vorige Overeenkomst", + + "OPEN_FILE" : "Open Bestand", + "SAVE_FILE_AS" : "Bewaar Bestand", + "CHOOSE_FOLDER" : "Kies een map", + + "RELEASE_NOTES" : "Release Notes", + "NO_UPDATE_TITLE" : "Je bent up to date!", + "NO_UPDATE_MESSAGE" : "Je werkt met de laatste versie van {APP_NAME}.", + + "FIND_REPLACE_TITLE_PART1" : "Vervang \"", + "FIND_REPLACE_TITLE_PART2" : "\" met \"", + "FIND_REPLACE_TITLE_PART3" : "\" — {2} {0} {1}", + + "FIND_IN_FILES_TITLE_PART1" : "\"", + "FIND_IN_FILES_TITLE_PART2" : "\" gevonden", + "FIND_IN_FILES_TITLE_PART3" : "— {0} {1} {2} in {3} {4}", + "FIND_IN_FILES_SCOPED" : "in {0}", + "FIND_IN_FILES_NO_SCOPE" : "in project", + "FIND_IN_FILES_FILE" : "bestand", + "FIND_IN_FILES_FILES" : "bestanden", + "FIND_IN_FILES_MATCH" : "overeenkomst", + "FIND_IN_FILES_MATCHES" : "overeenkomsten", + "FIND_IN_FILES_MORE_THAN" : "Meer dan ", + "FIND_IN_FILES_PAGING" : "{0}—{1}", + "FIND_IN_FILES_FILE_PATH" : "{0} {2} {1}", // We shoudl use normal dashes on Windows instead of em dash eventually + "ERROR_FETCHING_UPDATE_INFO_TITLE" : "Probleem bij het ophalen van update informatie", + "ERROR_FETCHING_UPDATE_INFO_MSG" : "Er is een fout opgetreden bij het ophalen van de laatste updat informatie van de server. Zorg ervoor dat je verbonden bent met het internet en probeer opnieuw.", + + /** + * ProjectManager + */ + "PROJECT_LOADING" : "Laden\u2026", + "UNTITLED" : "Naamloos", + "WORKING_FILES" : "Werkbestanden", + + /** + * Keyboard modifier names + */ + "KEYBOARD_CTRL" : "Ctrl", + "KEYBOARD_SHIFT" : "Shift", + "KEYBOARD_SPACE" : "Space", + + /** + * StatusBar strings + */ + "STATUSBAR_CURSOR_POSITION" : "Regel {0}, Kolom {1}", + "STATUSBAR_SELECTION_CH_SINGULAR" : " \u2014 {0} kolom geselecteerd", + "STATUSBAR_SELECTION_CH_PLURAL" : " \u2014 {0} kolommen geselecteerd", + "STATUSBAR_SELECTION_LINE_SINGULAR" : " \u2014 {0} regel geselecteerd", + "STATUSBAR_SELECTION_LINE_PLURAL" : " \u2014 {0} regels geselecteerd", + "STATUSBAR_INDENT_TOOLTIP_SPACES" : "Klik om de indentatie te veranderen naar spaties", + "STATUSBAR_INDENT_TOOLTIP_TABS" : "Klik om de indentatie te veranderen naar tabs", + "STATUSBAR_INDENT_SIZE_TOOLTIP_SPACES" : "Klik om het aantal spaties bij indentatie te veranderen", + "STATUSBAR_INDENT_SIZE_TOOLTIP_TABS" : "Klik om de breedte van het tab karakter te veranderen", + "STATUSBAR_SPACES" : "Spaties:", + "STATUSBAR_TAB_SIZE" : "Tab Grootte:", + "STATUSBAR_LINE_COUNT_SINGULAR" : "\u2014 {0} Regel", + "STATUSBAR_LINE_COUNT_PLURAL" : "\u2014 {0} Regels", + + // CodeInspection: errors/warnings + "ERRORS_PANEL_TITLE" : "{0} Fouten", + "SINGLE_ERROR" : "1 {0} Fout", + "MULTIPLE_ERRORS" : "{1} {0} Fouten", + "NO_ERRORS" : "Geen {0} fouten - goed zo!", + "LINT_DISABLED" : "Linting is uitgeschakeld", + "NO_LINT_AVAILABLE" : "Er is geen linter beschikbaar voor {0}", + "NOTHING_TO_LINT" : "Niets om te linten", + + + /** + * Command Name Constants + */ + + // File menu commands + "FILE_MENU" : "Bestand", + "CMD_FILE_NEW_UNTITLED" : "Nieuw", + "CMD_FILE_NEW" : "Nieuw Bestand", + "CMD_FILE_NEW_FOLDER" : "Nieuwe Map", + "CMD_FILE_OPEN" : "Open\u2026", + "CMD_ADD_TO_WORKING_SET" : "Voeg Toe Aan Werkset", + "CMD_OPEN_FOLDER" : "Open Map\u2026", + "CMD_FILE_CLOSE" : "Sluit", + "CMD_FILE_CLOSE_ALL" : "Sluit alles", + "CMD_FILE_SAVE" : "Bewaar", + "CMD_FILE_SAVE_ALL" : "Bewaar Alles", + "CMD_FILE_SAVE_AS" : "Bewaar Als\u2026", + "CMD_LIVE_FILE_PREVIEW" : "Live Voorbeeld", + "CMD_PROJECT_SETTINGS" : "Project Instellingen\u2026", + "CMD_FILE_RENAME" : "Hernoem", + "CMD_FILE_DELETE" : "Verwijder", + "CMD_INSTALL_EXTENSION" : "Installeer Uitbreiding\u2026", + "CMD_EXTENSION_MANAGER" : "Uitbreidingbeheer\u2026", + "CMD_FILE_REFRESH" : "Ververs Bestandsboom", + "CMD_QUIT" : "Stop", + // Used in native File menu on Windows + "CMD_EXIT" : "Exit", + + // Edit menu commands + "EDIT_MENU" : "Wijzig", + "CMD_UNDO" : "Herstel", + "CMD_REDO" : "Opnieuw", + "CMD_CUT" : "Knip", + "CMD_COPY" : "Kopieer", + "CMD_PASTE" : "Plak", + "CMD_SELECT_ALL" : "Selecteer Alles", + "CMD_SELECT_LINE" : "Selecteer Regel", + "CMD_FIND" : "Zoek", + "CMD_FIND_IN_FILES" : "Zoek in Mappen", + "CMD_FIND_IN_SUBTREE" : "Zoek in\u2026", + "CMD_FIND_NEXT" : "Zoek Volgende", + "CMD_FIND_PREVIOUS" : "Zoek Vorige", + "CMD_REPLACE" : "Vervang", + "CMD_INDENT" : "Inspringen", + "CMD_UNINDENT" : "Insprong Verwijderen", + "CMD_DUPLICATE" : "Dupliceer", + "CMD_DELETE_LINES" : "Verwijder Regel", + "CMD_COMMENT" : "Zet Regel Commentaar Aan/Uit", + "CMD_BLOCK_COMMENT" : "Zet Blok Commentaar Aan/Uit", + "CMD_LINE_UP" : "Verplaats Regel naar Boven", + "CMD_LINE_DOWN" : "Verplaats Regel naar Beneden", + "CMD_OPEN_LINE_ABOVE" : "Open Regel Boven", + "CMD_OPEN_LINE_BELOW" : "Open Regel Beneden", + "CMD_TOGGLE_CLOSE_BRACKETS" : "Automatisch Accolades Sluiten", + "CMD_SHOW_CODE_HINTS" : "Toon Code Hints", + + // View menu commands + "VIEW_MENU" : "Weergave", + "CMD_HIDE_SIDEBAR" : "Verberg Zijbalk", + "CMD_SHOW_SIDEBAR" : "Toon Zijbalk", + "CMD_INCREASE_FONT_SIZE" : "Vergroot Lettertype", + "CMD_DECREASE_FONT_SIZE" : "Verklein Lettertype", + "CMD_RESTORE_FONT_SIZE" : "Herstel Lettertype", + "CMD_SCROLL_LINE_UP" : "Scroll Regel naar Boven", + "CMD_SCROLL_LINE_DOWN" : "Scroll Regel naar Beneden", + "CMD_TOGGLE_LINE_NUMBERS" : "Regelnummers", + "CMD_TOGGLE_ACTIVE_LINE" : "Markeer Actieve Regel", + "CMD_TOGGLE_WORD_WRAP" : "Word Wrap", + "CMD_LIVE_HIGHLIGHT" : "Live Voorbeeld Markeren", + "CMD_VIEW_TOGGLE_INSPECTION" : "Lint Bestanden bij Opslaan", + "CMD_SORT_WORKINGSET_BY_ADDED" : "Sorteer op Toegevoegd", + "CMD_SORT_WORKINGSET_BY_NAME" : "Sorteer op Naam", + "CMD_SORT_WORKINGSET_BY_TYPE" : "Sorteer op Type", + "CMD_SORT_WORKINGSET_AUTO" : "Automatisch Sorteren", + + // Navigate menu Commands + "NAVIGATE_MENU" : "Navigeer", + "CMD_QUICK_OPEN" : "Open Snel", + "CMD_GOTO_LINE" : "Ga naar Regel", + "CMD_GOTO_DEFINITION" : "Definitie Snel Zoeken", + "CMD_GOTO_FIRST_PROBLEM" : "Ga naar de eerstvolgende Fout/Waarschuwing", + "CMD_TOGGLE_QUICK_EDIT" : "Wijzig snel", + "CMD_TOGGLE_QUICK_DOCS" : "Snel naar Documentatie", + "CMD_QUICK_EDIT_PREV_MATCH" : "Vorige Overeenkomst", + "CMD_QUICK_EDIT_NEXT_MATCH" : "Volgende Overeenkomst", + "CMD_NEXT_DOC" : "Volgend Document", + "CMD_PREV_DOC" : "Vorig Document", + "CMD_SHOW_IN_TREE" : "Toon in Bestandsboom", + "CMD_SHOW_IN_OS" : "Toon in Besturingssysteem", + + // Help menu commands + "HELP_MENU" : "Help", + "CMD_CHECK_FOR_UPDATE" : "Controleer op Updates", + "CMD_HOW_TO_USE_BRACKETS" : "Hoe gebruik je {APP_NAME}", + "CMD_FORUM" : "{APP_NAME} Forum", + "CMD_RELEASE_NOTES" : "Release Notes", + "CMD_REPORT_AN_ISSUE" : "Rapporteer een probleem", + "CMD_SHOW_EXTENSIONS_FOLDER" : "Toon de Map met Uitbreidingen", + "CMD_TWITTER" : "{TWITTER_NAME} op Twitter", + "CMD_ABOUT" : "Over {APP_TITLE}", + + // Strings for main-view.html + "EXPERIMENTAL_BUILD" : "experimentele build", + "DEVELOPMENT_BUILD" : "development build", + "OK" : "OK", + "DONT_SAVE" : "Niet opslaan", + "SAVE" : "Opslaan", + "CANCEL" : "Annuleer", + "DELETE" : "Verwijder", + "RELOAD_FROM_DISK" : "Laad opnieuw van Schijf", + "KEEP_CHANGES_IN_EDITOR" : "Behoud veranderingen in Editor", + "CLOSE_DONT_SAVE" : "Sluit (Bewaar Niet)", + "RELAUNCH_CHROME" : "Herstart Chrome", + "ABOUT" : "Over", + "CLOSE" : "Sluit", + "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_LINE3" : "Kennisgevingen, voorwaarden en bepalingen met betrekking tot software van derden bevinden zich op {ADOBE_THIRD_PARTY} en op de pagina's, hierin door verwijzing opgenomen.", + "ABOUT_TEXT_LINE4" : "Documentatie en broncode op https://github.com/adobe/brackets/", + "ABOUT_TEXT_LINE5" : "Gemaakt met \u2764 en JavaScript door:", + "ABOUT_TEXT_LINE6" : "Veel mensen (maar we hebben problemen met het laden van die data op dit moment).", + "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Web Platform Docs en het Web Platform grafisch logo zijn gelicentieerd onder een Creative Commons Attribution licentie, CC-BY 3.0 Unported.", + "UPDATE_NOTIFICATION_TOOLTIP" : "Er is een nieuwe build van {APP_NAME} beschikbaar! Klik hier voor details.", + "UPDATE_AVAILABLE_TITLE" : "Update Beschikbaar", + "UPDATE_MESSAGE" : "Hey, er is een nieuwe build van {APP_NAME} beschikbaar. Hier zijn een aantal van de nieuwe functies:", + "GET_IT_NOW" : "Haal het nu!", + "PROJECT_SETTINGS_TITLE" : "Project Instellingen voor: {0}", + "PROJECT_SETTING_BASE_URL" : "Live Voorbeeld Start URL", + "PROJECT_SETTING_BASE_URL_HINT" : "Om een locale server te gebruiken, voor een url in zoals http://localhost:8000/", + "BASEURL_ERROR_INVALID_PROTOCOL" : "Het {0} protocol wordt niet ondersteund door Live Voorbeeld—gebruik http: of https: .", + "BASEURL_ERROR_SEARCH_DISALLOWED" : "De start URL kan geen zoekparameters bevatten zoals \"{0}\".", + "BASEURL_ERROR_HASH_DISALLOWED" : "De start URL kan geen hashes bevatten zoals \"{0}\".", + "BASEURL_ERROR_INVALID_CHAR" : "Speciale karakters zoals '{0}' moeten %-geëncodeerd zijn.", + "BASEURL_ERROR_UNKNOWN_ERROR" : "Onbekende fout bij het parsen van de Start URL", + + // Extension Management strings + "INSTALL" : "Installeer", + "UPDATE" : "Update", + "REMOVE" : "Verwijder", + "OVERWRITE" : "Overschrijf", + "CANT_REMOVE_DEV" : "Uitbreidings in de \"dev\" map moeten manueel verwijderd worden.", + "CANT_UPDATE" : "De update is niet compatibel met deze versie van {APP_NAME}.", + "INSTALL_EXTENSION_TITLE" : "Installeer Uitbreiding", + "UPDATE_EXTENSION_TITLE" : "Update Uitbreiding", + "INSTALL_EXTENSION_LABEL" : "Uitbreiding URL", + "INSTALL_EXTENSION_HINT" : "URL van het zip bestand of de GitHup repo van de uitbreiding", + "INSTALLING_FROM" : "Bezig met installeren van uitbreiding van {0}\u2026", + "INSTALL_SUCCEEDED" : "Installatie succesvol!", + "INSTALL_FAILED" : "Installatie gefaald.", + "CANCELING_INSTALL" : "Bezig met annuleren\u2026", + "CANCELING_HUNG" : "Het annularen van de installatie duurt lang. Een intern probleem kan zijn opgetreden.", + "INSTALL_CANCELED" : "Installatie geannuleerd.", + // These must match the error codes in ExtensionsDomain.Errors.* : + "INVALID_ZIP_FILE" : "De gedownloade inhoud is geen geldig zip bestand.", + "INVALID_PACKAGE_JSON" : "Het package.json bestand is niet geldig (fout was: {0}).", + "MISSING_PACKAGE_NAME" : "Het package.json specifieert geen pakket naam.", + "BAD_PACKAGE_NAME" : "{0} is een ongeldige pakket naam.", + "MISSING_PACKAGE_VERSION" : "Het package.json bestand specifieert geen geldige pakket versie.", + "INVALID_VERSION_NUMBER" : "Het pakket versienummer ({0}) is ongeldig.", + "INVALID_BRACKETS_VERSION" : "De {APP_NAME} compatibiliteit string ({0}) is ongeldig.", + "DISALLOWED_WORDS" : "De woorden ({1}) zijn niet toegelaten in het {0} veld.", + "API_NOT_COMPATIBLE" : "De uitbreiding is niet compatibel met deze versie van {APP_NAME}. Het werd geinstalleerd in de map met uitgeschakelde uitbreidingen.", + "MISSING_MAIN" : "Het pakket heeft geen main.js bestand.", + "EXTENSION_ALREADY_INSTALLED" : "Het installeren van dit pakket zal een vroeger geinstalleerde uitbreiding overschrijven. Overschrijf de oudere uitbreiding?", + "EXTENSION_SAME_VERSION" : "Dit pakket is dezelfde versie als degene die op dit moment is geinstalleerd. Overschrijf de bestaande installatie?", + "EXTENSION_OLDER_VERSION" : "Dit pakket is versie {0} dewelke ouder is dan de op dit moment geinstalleerde ({1}). Overschrijf de bestaande installatie?", + "DOWNLOAD_ID_IN_USE" : "Interne fout: download ID is reeds in gebruik.", + "NO_SERVER_RESPONSE" : "Kan niet verbinden met de server.", + "BAD_HTTP_STATUS" : "Bestand niet gevonden op server (HTTP {0}).", + "CANNOT_WRITE_TEMP" : "Onmogelijk om download op te slaan naar tijdelijk bestand.", + "ERROR_LOADING" : "De uitbreiding ondervond een probleem bij het opstarten.", + "MALFORMED_URL" : "De URL is ongeldig. Controleer of ze correct werd ingevoerd.", + "UNSUPPORTED_PROTOCOL" : "De URL moet een http of https URL zijn.", + "UNKNOWN_ERROR" : "Onbekende interne fout.", + // For NOT_FOUND_ERR, see generic strings above + "EXTENSION_MANAGER_TITLE" : "Uitbreidingbeheer", + "EXTENSION_MANAGER_ERROR_LOAD" : "Onmogelijk om toegang te verkrijgen tot het uitbreidingen register. Probeer later opnieuw.", + "INSTALL_FROM_URL" : "Installeer van URL\u2026", + "EXTENSION_AUTHOR" : "Auteur", + "EXTENSION_DATE" : "Datum", + "EXTENSION_INCOMPATIBLE_NEWER" : "Deze uitbreiding vereist een nieuwere versie van {APP_NAME}.", + "EXTENSION_INCOMPATIBLE_OLDER" : "Deze uitbreiding werkt momenteel enkel met oudere versies van {APP_NAME}.", + "EXTENSION_NO_DESCRIPTION" : "Geen beschrijving", + "EXTENSION_MORE_INFO" : "Meer info...", + "EXTENSION_ERROR" : "Uitbreiding fout", + "EXTENSION_KEYWORDS" : "Sleutelwoorden", + "EXTENSION_INSTALLED" : "Geinstalleerd", + "EXTENSION_UPDATE_INSTALLED" : "Deze uitbreiding is gedownload en zal geinstalleerd worden wanneer je {APP_NAME} stopt.", + "EXTENSION_SEARCH_PLACEHOLDER" : "Zoek", + "EXTENSION_MORE_INFO_LINK" : "Meer", + "BROWSE_EXTENSIONS" : "Blader door Uitbreidingen", + "EXTENSION_MANAGER_REMOVE" : "Verwijder Uitbreiding", + "EXTENSION_MANAGER_REMOVE_ERROR" : "Onmogelijk om een of meerdere uitbreidingen te verwijderen: {0}. {APP_NAME} zal nog steeds stoppen.", + "EXTENSION_MANAGER_UPDATE" : "Update Uitbreiding", + "EXTENSION_MANAGER_UPDATE_ERROR" : "Onmogelijk om een of meerdere uitbreidingen te updaten: {0}. {APP_NAME} zal nog steeds stoppen.", + "MARKED_FOR_REMOVAL" : "Aangeduid voor verwijdering", + "UNDO_REMOVE" : "Herstel", + "MARKED_FOR_UPDATE" : "Aangeduid voor update", + "UNDO_UPDATE" : "Herstel", + "CHANGE_AND_QUIT_TITLE" : "Wijzig Uitbreidingen", + "CHANGE_AND_QUIT_MESSAGE" : "Om de aangeduidde uitbreiding te updaten of te verwijderen, moet je {APP_NAME} stoppen en herstarten. Je zal gevraagd worden alle onbewaarde wijzigingen op te slaan.", + "REMOVE_AND_QUIT" : "Verwijder Uitbreidingen en stop", + "CHANGE_AND_QUIT" : "Wijzig Uitbreidingen en Stop", + "UPDATE_AND_QUIT" : "Update Uitbreidingen en Stop", + "EXTENSION_NOT_INSTALLED" : "Kon de uitbreiding {0} niet verwijderen omdat ze niet was geinstalleerd", + "NO_EXTENSIONS" : "Nog geen uitbreidingen geinstalleerd.
    Klik op de Beschikbaar tab hierboven om te starten.", + "NO_EXTENSION_MATCHES" : "Geen uitbreidingen komen overeen met je zoekopdracht.", + "REGISTRY_SANITY_CHECK_WARNING" : "Wees voorzichtig bij het installeren van uitbreidingen van een onbekende bron.", + "EXTENSIONS_INSTALLED_TITLE" : "Geinstalleerd", + "EXTENSIONS_AVAILABLE_TITLE" : "Beschikbaar", + "EXTENSIONS_UPDATES_TITLE" : "Updates", + + /** + * Unit names + */ + + "UNIT_PIXELS" : "pixels", + + + // extensions/default/DebugCommands + "DEBUG_MENU" : "Debug", + "CMD_SHOW_DEV_TOOLS" : "Toon Developer Tools", + "CMD_REFRESH_WINDOW" : "Herlaad {APP_NAME}", + "CMD_NEW_BRACKETS_WINDOW" : "Nieuw {APP_NAME} Venster", + "CMD_SWITCH_LANGUAGE" : "Wijzig Taal", + "CMD_RUN_UNIT_TESTS" : "Start Testen", + "CMD_SHOW_PERF_DATA" : "Toon Performantie Data", + "CMD_ENABLE_NODE_DEBUGGER" : "Schakel Node Debugger in", + "CMD_LOG_NODE_STATE" : "Log Node Status naar Console", + "CMD_RESTART_NODE" : "Herstart Node", + + "LANGUAGE_TITLE" : "Wijzig Taal", + "LANGUAGE_MESSAGE" : "Taal:", + "LANGUAGE_SUBMIT" : "Herlaad {APP_NAME}", + "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" : "Italiaan", + "LOCALE_JA" : "Japans", + "LOCALE_NB" : "Norwegian", + "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", + "COLOR_EDITOR_RGBA_BUTTON_TIP" : "RGBa Formaat", + "COLOR_EDITOR_HEX_BUTTON_TIP" : "Hex Formaat", + "COLOR_EDITOR_HSLA_BUTTON_TIP" : "HSLa Formaat", + "COLOR_EDITOR_USED_COLOR_TIP_SINGULAR" : "{0} ({1} keer gebruikt)", + "COLOR_EDITOR_USED_COLOR_TIP_PLURAL" : "{0} ({1} keren gebruikt)", + + // extensions/default/JavaScriptCodeHints + "CMD_JUMPTO_DEFINITION" : "Ga naar Definitie", + "CMD_SHOW_PARAMETER_HINT" : "Toon Parameter Hint", + "NO_ARGUMENTS" : "", + + // extensions/default/JSLint + "JSLINT_NAME" : "JSLint", + + // extensions/default/QuickView + "CMD_ENABLE_QUICK_VIEW" : "Snel bekijken bij Muis Over", + + // extensions/default/RecentProjects + "CMD_TOGGLE_RECENT_PROJECTS" : "Recente Projecten", + + // extensions/default/WebPlatformDocs + "DOCS_MORE_LINK" : "Lees meer" +}); diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 495dedcd199..384393c6199 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -441,6 +441,7 @@ define({ "LOCALE_IT" : "Italian", "LOCALE_JA" : "Japanese", "LOCALE_NB" : "Norwegian", + "LOCALE_NL" : "Dutch", "LOCALE_PL" : "Polish", "LOCALE_PT_BR" : "Portuguese, Brazil", "LOCALE_PT_PT" : "Portuguese", diff --git a/src/nls/strings.js b/src/nls/strings.js index 79ab69b3012..0f2e6460abb 100644 --- a/src/nls/strings.js +++ b/src/nls/strings.js @@ -46,6 +46,7 @@ define(function (require, exports, module) { "it": true, "ja": true, "nb": true, + "nl": true, "pl": true, "pt-br": true, "pt-pt": true, From 17afe8e054174b814a688dec3f98ea336c5cda68 Mon Sep 17 00:00:00 2001 From: Work Date: Sat, 28 Sep 2013 18:43:49 +0200 Subject: [PATCH 0032/1140] Bug fix dutch translation --- src/nls/nl/strings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls/nl/strings.js b/src/nls/nl/strings.js index 078a8a485cd..701409fbf45 100644 --- a/src/nls/nl/strings.js +++ b/src/nls/nl/strings.js @@ -31,7 +31,7 @@ define({ */ // General file io error strings - "GENERIC_ERROR" : "(error {0})", + "GENERIC_ERROR" : "(fout {0})", "NOT_FOUND_ERR" : "Het bestand kon niet worden gevonden.", "NOT_READABLE_ERR" : "Het bestand kon niet worden ingelezen.", "NO_MODIFICATION_ALLOWED_ERR" : "De doelmap kan niet gewijzigd worden.", @@ -464,7 +464,7 @@ define({ // extensions/default/JavaScriptCodeHints "CMD_JUMPTO_DEFINITION" : "Ga naar Definitie", "CMD_SHOW_PARAMETER_HINT" : "Toon Parameter Hint", - "NO_ARGUMENTS" : "", + "NO_ARGUMENTS" : "", // extensions/default/JSLint "JSLINT_NAME" : "JSLint", From 48187a0ffb7f9a13278a81f07edc8dadec8b7f9d Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sun, 29 Sep 2013 01:24:37 +0200 Subject: [PATCH 0033/1140] German translation --- src/nls/de/strings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 842943a15f8..dc73009830b 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -444,6 +444,7 @@ define({ "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", From 293c94d414e33599e55d6c2f3282024b8bd80839 Mon Sep 17 00:00:00 2001 From: Lance Campbell Date: Sat, 28 Sep 2013 17:48:38 -0700 Subject: [PATCH 0034/1140] Add Menu.removeMenuDivider() --- src/command/Menus.js | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/command/Menus.js b/src/command/Menus.js index 508b21dca34..718aa520f22 100644 --- a/src/command/Menus.js +++ b/src/command/Menus.js @@ -458,6 +458,57 @@ define(function (require, exports, module) { delete menuItemMap[menuItemID]; }; + /** + * Removes the specified menu divider from this Menu. + * + * @param {!string} menuItemID - the menu item id of the divider to remove. + */ + Menu.prototype.removeMenuDivider = function (menuItemID) { + var menuItem, + $HTMLMenuItem; + + if (!menuItemID) { + console.error("removeMenuDivider(): missing required parameters: menuItemID"); + return; + } + + menuItem = getMenuItem(menuItemID); + + if (!menuItem) { + console.error("removeMenuDivider(): parameter menuItemID: %s is not a valid menu item id", menuItemID); + return; + } + + if (!menuItem.isDivider) { + console.error("removeMenuDivider(): parameter menuItemID: %s is not a menu divider", menuItemID); + return; + } + + if (_isHTMLMenu(this.id)) { + // Targeting parent to get the menu item and the
  • that contains it + $HTMLMenuItem = $(_getHTMLMenuItem(menuItemID)).parent(); + if ($HTMLMenuItem) { + $HTMLMenuItem.remove(); + } else { + console.error("removeMenuDivider(): HTML menu divider not found: %s", menuItemID); + return; + } + } else { + brackets.app.removeMenuItem(menuItemID, function (err) { + if (err) { + console.error("removeMenuDivider() -- divider not found: %s (error: %s)", menuItemID, err); + } + }); + } + + if (!menuItemMap[menuItemID]) { + console.error("removeMenuDivider(): menu divider not found in menuItemMap: %s", menuItemID); + return; + } + + delete menuItemMap[menuItemID]; + }; + /** * Adds a new menu item with the specified id and display text. The insertion position is * specified via the relativeID and position arguments which describe a position From ab444aa6beac6308976ecdf4b735a0f4ace6b9bc Mon Sep 17 00:00:00 2001 From: Theodore Keloglou Date: Sun, 29 Sep 2013 21:39:21 +0300 Subject: [PATCH 0035/1140] Add Greek Localization --- .../index.html" | 174 +++++++ .../main.css" | 42 ++ .../screenshots/quick-edit.png" | Bin 0 -> 315759 bytes src/nls/el/strings.js | 479 ++++++++++++++++++ src/nls/el/urls.js | 32 ++ src/nls/strings.js | 1 + 6 files changed, 728 insertions(+) create mode 100644 "samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/index.html" create mode 100644 "samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/main.css" create mode 100644 "samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/screenshots/quick-edit.png" create mode 100644 src/nls/el/strings.js create mode 100644 src/nls/el/urls.js diff --git "a/samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/index.html" "b/samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/index.html" new file mode 100644 index 00000000000..56edf886f6a --- /dev/null +++ "b/samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/index.html" @@ -0,0 +1,174 @@ + + + + + + + ΞΕΚΙΝΩΝΤΑΣ ΜΕ ΤΟ BRACKETS + + + + + +

    ΞΕΚΙΝΩΝΤΑΣ ΜΕ ΤΟ BRACKETS

    +

    Αυτός είναι ο οδηγός σας!

    + + + +

    + Καλώς ήρθατε σε μια πρώιμη προεπισκόπηση του Brackets, ένας νέος επεξεργαστής κειμένου ανοιχτού-κώδικα για τη νέα γενιά του + διαδικτύου. Είμαστε μεγάλοι οπαδοί των προτύπων και θέλουμε να φτιάξουμε καλύτερα εργαλεία για JavaScript, HTML και CSS + και σχετικές ανοιχτές τεχνολογίες του διαδικτύου. Αυτό είναι το ταπεινό μας ξεκίνημα. +

    + + +

    + Το Brackets είναι ένας διαφορετικής μορφής επεξεργαστής κειμένου. + Μία αξιοσημείωτη διαφορά είναι ότι αυτός ο επεξεργαστής κειμένου είναι γραμμένος σε JavaScript, HTML και CSS. + Αυτό σημαίνει ότι οι περισσότεροι από εσάς που χρησιμοποιούν το Brackets έχουν τις ικανότητες να τροποποιήσουν και να επεκτείνουν τον επεξεργαστή κειμένου. + Στην πραγματικότητα, χρησιμοποιούμε το Brackets κάθε μέρα για να φτιάξουμε το Brackets. Επίσης, έχει και κάποιες μοναδικές λειτουργίες όπως η Γρήγορα Επεξεργασία, + το Live Preview και άλλες που μπορεί να μην βρείτε σε άλλους επεξεργαστές. + Για να μάθετε περισσότερα για το πως να χρησιμοποιήσετε αυτές τις λειτουργίες, συνεχίστε το διάβασμα. +

    + + +

    Δοκιμάζουμε μερικά νέα πράγματα

    + + +

    Γρήγορη Επεξεργασία για CSS και JavaScript

    +

    + Όχι πια εναλλαγή μεταξύ των αρχείων και απόσπαση της προσοχής. Όταν επεξεργάζεστε HTML, χρησιμοποιήστε + την συντόμευση Cmd/Ctrl + E για να ανοίξετε έναν γρήγορο ενσωματωμένο επεξεργαστή που εμφανίζει το σχετικό CSS κώδικα. + Κάντε την αλλαγή στον κώδικα CSS, πατήστε ESC και είστε πίσω στην επεξεργασία HTML, ή απλά αφήστε τους + CSS κανόνες ανοιχτούς και αυτοί θα γίνουν μέρος του επεξεργαστή HTML. Αν πατήσεις ESC έξω από + έναν γρήγορο ενσωματωμένο επεξεργαστή, θα κρυφτούν όλα. +

    + + + Θέλετε να το δείτε στην πράξη; Βάλε τον κέρσορα στο tag από πάνω και πάτησε + Cmd/Ctrl + E. Πρέπει να δεις ένα γρήγορο ενσωματωμένο επεξεργαστή να εμφανίζετε από πάνω. Στα δεξιά θα δεις + μία λίστα με κανόνες CSS που σχετίζετε με αυτό το tag. Απλά κυλήστε τους κανόνες με + Alt + Up/Down για να βρείτε αυτόν που θέλετε να επεξεργαστείτε. + + +     + A screenshot showing CSS Quick Edit + + +

    + Μπορείς να χρησιμοποιήσεις την ίδια συντόμευση για κώδικα JavaScript για να δεις το σώμα μιας συνάρτησης με + το να τοποθετείς τον κέρσορα στο όνομα της συνάρτησης που καλείτε. Για τώρα οι γρήγοροι ενσωματωμένοι επεξεργαστές δεν μπορούν + να γίνουν ένθετοι, άρα μπορείς να χρησιμοποιήσεις την Γρήγορη Επεξεργασία μόνο όταν ο κέρσορας είναι μέσα σε έναν «πλήρους μεγέθους» επεξεργαστή. +

    + + +

    Προεπισκόπηση αλλαγών HTML και CSS ζωντανά στον browser

    +

    + Ξέρεις αυτό το «χορό save/reload» που κάνουμε τόσα χρόνια; Αυτό που κάνεις αλλαγές στον + επεξεργαστή σου, πατάς αποθήκευση, γυρνάς στον browser και μετά κάνεις ανανέωση για να δεις επιτέλους το αποτέλεσμα; + Με το Brackets, δεν χρειάζεται να κάνεις αυτόν τον χορό. +

    +

    + Το Brackets θα ανοίξει μία ζωντανή σύνδεση στον τοπικό σου browser και θα στείλει τους ανανεωμένους κώδικες HTML και CSS καθώς εσύ + πληκτρολογείς! Μπορεί ήδη να κάνεις κάτι τέτοιο με εργαλεία που βασίζονται στον browser, αλλά με το Brackets + δεν υπάρχει ανάγκη να αντιγράφεις και να επικολλάς τον τελικό κώδικα πίσω στον επεξεργαστή. Ο κώδικας σου τρέχει στον + browser, αλλά ζει στον επεξεργαστή σου! +

    + +

    Ζωντανή επισήμανση στοιχείων HTML και κανόνων CSS

    +

    + Το Brackets κάνει εύκολο το να βλέπεις πως οι αλλαγές στους κώδικες HTML και CSS θα επηρεάσουν την σελίδα. Όταν ο κέρσορας + είναι σε έναν κανόνα CSS, το Brackets θα επισημάνει όλα τα στοιχεία στον browser που επηρεάζονται. Παρόμοια, όταν επεξεργάζεστε + ένα αρχείο HTML, το Brackets θα επισημάνει τα αντιστοιχούμενα στοιχεία HTML στον browser. +

    + + + Αν έχεις εγκατεστημένο τον Google Chrome, μπορείς να το δοκιμάσεις μόνο σου. Κάνε κλικ στο εικονίδιο της αστραπής + στην πάνω δεξιά γωνία του παραθύρου του Brackets ή πατήστε Cmd/Ctrl + Alt + P. Όταν + το Live Preview ενεργοποιηθεί σε ένα έγγραφο HTML, όλα τα συνδεόμενα αρχεία CSS μπορούν να επεξεργασθούν σε πραγματικό χρόνο. + Το εικονίδιο θα αλλάξει από γκρι σε χρυσό όταν το Brackets δημιουργήσει την σύνδεση με τον browser. + + Τώρα, τοποθέτησε τον κέρσορα του στο από πάνω tag. Παρατηρήστε την μπλε επισήμανση που εμφανίζετε + γύρω από την εικόνα στον Chrome. Έπειτα, χρησιμοποιήστε το Cmd/Ctrl + E για να ανοίξετε τους ορισμένους κανόνες CSS. + Δοκιμάστε να αλλάξετε το μέγεθος του πλαισίου από 1px σε 10px ή αλλάξτε το χρώμα του φόντου + από "dimgray" σε "hotpink". Αν έχετε το Brackets και τον browser σας να είναι δίπλα δίπλα, θα δείτε + τις αλλαγές να συμβαίνουν στιγμιαία στον. Αμάτο, έτσι; + + +

    + Σήμερα, το Brackets υποστηρίζει το Live Preview μόνο για HTML και CSS. Όμως, στην τρέχουσα έκδοση, οι αλλαγές + σε αρχεία JavaScript ανανεώνονται αυτόματα όταν κάνετε αποθήκευση. Προς το παρόν δουλεύουμε τη υποστήριξη του Live Preview + για JavaScript. Επίσης, οι άμεσες προεπισκοπήσεις του Live Preview είναι δυνατές μόνο με τον Google Chrome, αλλά ελπίζουμε + να φέρουμε αυτήν την λειτουργία σε όλους τους μεγάλους browser στο μέλλον. +

    + +

    Γρήγορη Προβολή

    +

    + Για όσους από εμάς δεν απομνημονεύσει ακόμα τις αντιστοιχίες χρωμάτων για τις τιμές HEX ή RGB, το Brackets κάνει + γρήγορο και εύκολο το να βλέπεις ακριβώς ποιο χρώμα χρησιμοποιείται. Είτε σε CSS είτε σε HTML, απλά περάστε το ποντίκι πάνω από + τα τιμές του χρώματος ή τις διαβαθμίσεις χρώματος και το Brackets θα εμφανίσει μια προβολή αυτού του χρώματος ή της διαβάθμισης αυτόματα. Το + ίδιο συμβαίνει και με τις εικόνες: απλά περάστε πάνω από τον σύνδεσμο της εικόνας στο Brackets και αυτό θα προβάλει μια + μικρογραφία αυτής της εικόνας. +

    + + + Για να δοκιμάσετε την Γρήγορη Προβολή από μόνος σας, βάλτε τον κέρσορα πάνω από το tag στην κορυφή αυτού του + αρχείου και πατήστε Cmd/Ctrl + E για να ανοίξετε έναν γρήγορο επεξεργαστή CSS. Τώρα απλά πηγαίνετε το βελάκι πάνω από οποιοδήποτε + τιμή χρώματος μέσα στο αρχείο CSS. Επίσης, μπορείτε να το δείτε στη πράξη σε διαβαθμίσεις χρώματος με το ανοίξετε έναν γρήγορο επεξεργαστή CSS + στο tag και πηγαίνοντας το βελάκι πάνω από οποιαδήποτε τιμή χρώματος του φόντου. Για να χρησιμοποιήσετε την προβολή + εικόνας, βάλτε τον κέρσορα πάνω από το screenshot που συμπεριλήφθηκε προηγουμένως σε αυτό το έγγραφο. + + + +

    Συμμετάσχετε

    +

    + Το Brackets είναι ένα project ανοιχτού κώδικα. Web developers από όλον τον κόσμο συνεισφέρουν για να φτιάξουν + έναν καλύτερο επεξεργαστή κώδικα. Πολλοί περισσότεροι φτιάχνουν επεκτάσεις που επεκτείνουν τις δυνατότητες του Brackets. + Πείτε μας τι πιστεύετε, μοιραστείτε τις ιδέες σας ή συνεισφέρετε άμεσα στο + project. +

    + + + + + diff --git "a/samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/main.css" "b/samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/main.css" new file mode 100644 index 00000000000..57639da2c77 --- /dev/null +++ "b/samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/main.css" @@ -0,0 +1,42 @@ +html { + background-color: #eeeeee; + background-image: linear-gradient(bottom, rgb(238,238,238) 18%, rgb(153,153,153) 59%, rgb(238,238,238) 80%); + background-image: -o-linear-gradient(bottom, rgb(238,238,238) 18%, rgb(153,153,153) 59%, rgb(238,238,238) 80%); + background-image: -moz-linear-gradient(bottom, rgb(238,238,238) 18%, rgb(153,153,153) 59%, rgb(238,238,238) 80%); + background-image: -webkit-linear-gradient(bottom, rgb(238,238,238) 18%, rgb(153,153,153) 59%, rgb(238,238,238) 80%); + background-image: -ms-linear-gradient(bottom, rgb(238,238,238) 18%, rgb(153,153,153) 59%, rgb(238,238,238) 80%); +} + +body { + margin: 0 auto; + padding: 2em; + max-width: 800px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 1.5em; + color: #333333; + background-color: #ffffff; + -webkit-box-shadow: 0 0 12px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 0 0 12px rgba(0, 0, 0, 0.4); + box-shadow: 0 0 12px rgba(0, 0, 0, 0.4); +} + +h1, h2, h3, h4, h5, h6 { + line-height: 1.3em; +} + +samp +{ + /* hide from the browser so we can show cool features in Edge Code */ + display: none; +} + +img +{ + background: dimgray; + border: 1px solid black; + border-radius: 2px; + padding: 15px 10px 10px; + margin: 10px 0; + max-width: 95%; +} diff --git "a/samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/screenshots/quick-edit.png" "b/samples/el/\316\236\316\265\316\272\316\257\316\275\317\211\316\275\317\204\316\261\317\202/screenshots/quick-edit.png" new file mode 100644 index 0000000000000000000000000000000000000000..2d58dc82044eb1d19ba9d49a43927471ce10f03a GIT binary patch literal 315759 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 PCc>=ls2+U~J` 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 T+}_4aen?LGs8rHHy(|9{0}. (error {1})", + "READ_DIRECTORY_ENTRIES_ERROR" : "Σφάλμα προέκυψε κατά τη διαδικασία διαβάσματος των περιεχομένων του φακέλου {0}. (error {1})", + + // File open/save error string + "ERROR_OPENING_FILE_TITLE" : "Σφάλμα ανοίγματος αρχείου", + "ERROR_OPENING_FILE" : "Σφάλμα προέκυψε κατά τη διαδικασία ανοίγματος του αρχείου {0}. {1}", + "ERROR_OPENING_FILES" : "Σφάλμα προέκυψε κατά τη διαδικασία ανοίγματος των παρακάτω αρχείων:", + "ERROR_RELOADING_FILE_TITLE" : "Σφάλμα επαναφόρτωσης αλλαγών από το δίσκο", + "ERROR_RELOADING_FILE" : "Σφάλμα προέκυψε κατά τη διαδικασία επαναφόρτωσης του αρχείου {0}. {1}", + "ERROR_SAVING_FILE_TITLE" : "Σφάλμα αποθήκευσης αρχείου", + "ERROR_SAVING_FILE" : "Σφάλμα προέκυψε κατά τη διαδικασία αποθήκευσης του αρχείου {0}. {1}", + "ERROR_RENAMING_FILE_TITLE" : "Σφάλμα μετονομασίας αρχείου", + "ERROR_RENAMING_FILE" : "Σφάλμα προέκυψε κατά τη διαδικασία μετονομασίας αρχείου {0}. {1}", + "ERROR_DELETING_FILE_TITLE" : "Σφάλμα διαγραφής αρχείου", + "ERROR_DELETING_FILE" : "Σφάλμα προέκυψε κατά τη διαδικασία διαγραφής του αρχείου {0}. {1}", + "INVALID_FILENAME_TITLE" : "Μη έγκυρο {0} όνομα", + "INVALID_FILENAME_MESSAGE" : "Τα όνομα αρχείων δεν μπορούν να περιέχουν τους ακόλουθους χαρακτήρες: /?*:;{}<>\\| ή οποιεσδήποτε system reserved λέξεις.", + "FILE_ALREADY_EXISTS" : "Το {0} {1} υπάρχει ήδη.", + "ERROR_CREATING_FILE_TITLE" : "Σφάλμα δημιουργίας {0}", + "ERROR_CREATING_FILE" : "Σφάλμα προέκυψε κατά τη διαδικασία δημιουργίας του {0} {1}. {2}", + + // Application error strings + "ERROR_IN_BROWSER_TITLE" : "Ωχ! Το {APP_NAME} δεν τρέχει ακόμα σε browsers.", + "ERROR_IN_BROWSER" : "To {APP_NAME} είναι γραμμένο σε HTML, αλλά αυτή τη στιγμή τρέχει σαν native εφαρμογή έτσι ώστε να μπορείτε να επεξεργαστείτε τοπικά αρχεία. Παρακαλούμε να χρησιμοποιήσετε το application shell στο github.com/adobe/brackets-shell repo για να τρέξετε το {APP_NAME}.", + + // FileIndexManager error string + "ERROR_MAX_FILES_TITLE" : "Σφάλμα κατά τη διαδικασία indexing των αρχείων", + "ERROR_MAX_FILES" : "Ο μέγιστος αριθμός αρχείων έχει καταχωρηθεί index. Λειτουργίες που ψάχνουν αρχεία στο index μπορεί να μην δουλεύουν σωστά.", + + // Live Development error strings + "ERROR_LAUNCHING_BROWSER_TITLE" : "Σφάλμα ανοίγματος browser", + "ERROR_CANT_FIND_CHROME" : "Ο Google Chrome browser δεν βρέθηκε. Παρακαλούμε σιγουρευτείτε ότι είναι εγκατεστημένος.", + "ERROR_LAUNCHING_BROWSER" : "Σφάλμα προέκυψε κατά τη διαδικασία ανοίγματος του browser. (error {0})", + + "LIVE_DEVELOPMENT_ERROR_TITLE" : "Σφάλμα Live Preview", + "LIVE_DEVELOPMENT_RELAUNCH_TITLE" : "Σύνδεση στον Browser", + "LIVE_DEVELOPMENT_ERROR_MESSAGE" : "Για να συνδεθεί το Live Preview, ο Chrome πρέπει να επανεκκινηθεί με το remote debugging (απομακρυσμένη αποσφαλμάτωση) ενεργοποιημένο.

    Θέλετε να επανεκκινήσετε τον Chrome και να ενεργοποιήσετε το remote debugging;", + "LIVE_DEV_LOADING_ERROR_MESSAGE" : "Αδυναμία φόρτωσης της σελίδας Live Development", + "LIVE_DEV_NEED_HTML_MESSAGE" : "Ανοίξτε ένα αρχείο HTML έτσι ώστε να ξεκινήσει η άμεση προεπισκόπηση (Live Preview).", + "LIVE_DEV_NEED_BASEURL_MESSAGE" : "Για να ανοίξετε το Live Preview με ένα αρχείο από κάποιον server, πρέπει να προσδιορίσετε μια διεύθυνση (Base URL) για αυτό το project.", + "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Σφάλμα κατά τη διαδικασία εκκίνησης του HTTP server για την άμεση επεξεργασία αρχείων. Παρακαλούμε προσπαθήστε ξανά.", + "LIVE_DEVELOPMENT_INFO_TITLE" : "Καλώς ήρθατε στο Live Preview!", + "LIVE_DEVELOPMENT_INFO_MESSAGE" : "Το Live Preview συνδέει το {APP_NAME} με τον browser σας. Ανοίγει μια προεπισκόπηση του HTML αρχείου σας στον browser, και την ανανεώνει στιγμιαία ενώ επεξεργάζεστε τον κώδικα.

    Σε τούτη την πρώιμη έκδοση του {APP_NAME}, το Live Preview δουλεύει μόνο με Google Chrome και ανανεώνει άμεσα την σελίδα ενώ επεξεργάζεστε αρχεία CSS ή HTML. Αλλαγές σε αρχεία JavaScript ανανεώνονται αυτόματα όταν κάνετε αποθήκευση.

    (Το μήνυμα αυτό θα αυτοκαταστραφεί μετά την πρώτη εμφάνιση του.)", + "LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Για περισσότερες πληροφορίες δείτε εδώ:     Troubleshooting Live Development connection errors.", + + "LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "Live Preview", + "LIVE_DEV_STATUS_TIP_PROGRESS1" : "Live Preview: Σύνδεση\u2026", + "LIVE_DEV_STATUS_TIP_PROGRESS2" : "Live Preview: Εκκίνηση\u2026", + "LIVE_DEV_STATUS_TIP_CONNECTED" : "Αποσύνδεση Live Preview", + "LIVE_DEV_STATUS_TIP_OUT_OF_SYNC" : "Live Preview (κάντε αποθήκευση για να ανανεωθεί)", + "LIVE_DEV_STATUS_TIP_SYNC_ERROR" : "Live Preview (αδυναμία ανανέωσης λόγο συντακτικού λάθους)", + + "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS" : "Το Live Preview ακυρώθηκε επειδή τα developer tools του browser ανοίχτηκαν", + "LIVE_DEV_DETACHED_TARGET_CLOSED" : "Το Live Preview ακυρώθηκε επειδή η σελίδα στον browser έκλεισε", + "LIVE_DEV_NAVIGATED_AWAY" : "Το Live Preview ακυρώθηκε επειδή ο browser πήγε σε μια σελίδα που δεν είναι μέρος του τρέχων project", + "LIVE_DEV_CLOSED_UNKNOWN_REASON" : "Το Live Preview ακυρώθηκε. Δεν ξέρουμε γιατί. ({0})", + + "SAVE_CLOSE_TITLE" : "Αποθήκευση Αλλαγών", + "SAVE_CLOSE_MESSAGE" : "Θέλετε να αποθηκεύσετε τις αλλαγές που κάνατε στο έγγραφο {0}?", + "SAVE_CLOSE_MULTI_MESSAGE" : "Θέλετε να αποθηκεύσετε τις αλλαγές σας στα παρακάτω αρχεία;", + "EXT_MODIFIED_TITLE" : "Εξωτερικές Αλλαγές", + "CONFIRM_FOLDER_DELETE_TITLE" : "Επιβεβαίωση Διαγραφής", + "CONFIRM_FOLDER_DELETE" : "Είστε σίγουρος ότι θέλετε να διαγράψετε τον φάκελο {0}?", + "FILE_DELETED_TITLE" : "Το Αρχείο Διαγράφηκε", + "EXT_MODIFIED_MESSAGE" : "Το {0} έχει τροποποιηθεί στο δίσκο, αλλά υπάρχουν και μη αποθηκευμένες αλλαγές στο {APP_NAME}.

    Ποια έκδοση θέλετε να κρατήσετε;", + "EXT_DELETED_MESSAGE" : "Το {0} έχει διαγραφεί στον δίσκο, αλλά έχει μη αποθηκευμένες αλλαγές στο {APP_NAME}.

    Θέλετε να κρατήσετε τις αλλαγές σας;", + + // Find, Replace, Find in Files + "SEARCH_REGEXP_INFO" : "Χρησιμοποιήστε την σύνταξη /re/ για αναζήτηση regexp", + "FIND_RESULT_COUNT" : "{0} αποτελέσματα", + "FIND_RESULT_COUNT_SINGLE" : "1 αποτέλεσμα", + "FIND_NO_RESULTS" : "Δεν βρέθηκαν αποτελέσματα", + "WITH" : "Με", + "BUTTON_YES" : "Ναι", + "BUTTON_NO" : "Όχι", + "BUTTON_REPLACE_ALL" : "Όλα\u2026", + "BUTTON_STOP" : "Διακοπή", + "BUTTON_REPLACE" : "Αντικατάσταση", + + "BUTTON_NEXT" : "\u25B6", + "BUTTON_PREV" : "\u25C0", + "BUTTON_NEXT_HINT" : "Επόμενη Αντιστοιχία", + "BUTTON_PREV_HINT" : "Προηγούμενη Αντιστοιχία", + + "OPEN_FILE" : "Άνοιγμα Αρχείου", + "SAVE_FILE_AS" : "Αποθήκευση Αρχείου", + "CHOOSE_FOLDER" : "Επίλεξε ένα φάκελο", + + "RELEASE_NOTES" : "Release Notes", + "NO_UPDATE_TITLE" : "Έχετε την τελευταία έκδοση!", + "NO_UPDATE_MESSAGE" : "Τρέχετε την τελευταία έκδοση του {APP_NAME}.", + + "FIND_REPLACE_TITLE_PART1" : "Αντικατάσταση \"", + "FIND_REPLACE_TITLE_PART2" : "\" με \"", + "FIND_REPLACE_TITLE_PART3" : "\" — {2} {0} {1}", + + "FIND_IN_FILES_TITLE_PART1" : "\"", + "FIND_IN_FILES_TITLE_PART2" : "\" βρέθηκε", + "FIND_IN_FILES_TITLE_PART3" : "— {0} {1} {2} in {3} {4}", + "FIND_IN_FILES_SCOPED" : "στο {0}", + "FIND_IN_FILES_NO_SCOPE" : "στο project", + "FIND_IN_FILES_FILE" : "αρχείο", + "FIND_IN_FILES_FILES" : "αρχεία", + "FIND_IN_FILES_MATCH" : "αντιστοιχία", + "FIND_IN_FILES_MATCHES" : "αντιστοιχίες", + "FIND_IN_FILES_MORE_THAN" : "Πάνω από ", + "FIND_IN_FILES_PAGING" : "{0}—{1}", + "FIND_IN_FILES_FILE_PATH" : "{0} {2} {1}", // We shoudl use normal dashes on Windows instead of em dash eventually + "ERROR_FETCHING_UPDATE_INFO_TITLE" : "Σφάλμα λήψης πληροφοριών αναβάθμισης", + "ERROR_FETCHING_UPDATE_INFO_MSG" : "Προέκυψε σφάλμα κατά τη διαδικασία λήψης πληροφοριών της τελευταίας αναβάθμισης από τον server. Παρακαλούμε βεβαιωθείτε ότι είστε συνδεδεμένος στο internet και προσπαθήστε ξανά.", + + /** + * ProjectManager + */ + "PROJECT_LOADING" : "Φόρτωση\u2026", + "UNTITLED" : "Άτιτλο", + "WORKING_FILES" : "Αρχεία Εργασίας", + + /** + * Keyboard modifier names + */ + "KEYBOARD_CTRL" : "Ctrl", + "KEYBOARD_SHIFT" : "Shift", + "KEYBOARD_SPACE" : "Space", + + /** + * StatusBar strings + */ + "STATUSBAR_CURSOR_POSITION" : "Σειρά {0}, Στήλη {1}", + "STATUSBAR_SELECTION_CH_SINGULAR" : " \u2014 επιλεγμένη {0} στήλη", + "STATUSBAR_SELECTION_CH_PLURAL" : " \u2014 επιλεγμένες {0} στήλες", + "STATUSBAR_SELECTION_LINE_SINGULAR" : " \u2014 επιλεγμένη {0} γραμμή", + "STATUSBAR_SELECTION_LINE_PLURAL" : " \u2014 επιλεγμένες {0} γραμμές", + "STATUSBAR_INDENT_TOOLTIP_SPACES" : "Κάντε κλικ για να αλλάξετε τις εσοχές (indentation) σε κενά", + "STATUSBAR_INDENT_TOOLTIP_TABS" : "Κάντε κλικ για να αλλάξετε τις εσοχές (indentation) σε tabs", + "STATUSBAR_INDENT_SIZE_TOOLTIP_SPACES" : "Κάντε κλικ για να αλλάξετε τον αριθμό των κενών στις εσοχές", + "STATUSBAR_INDENT_SIZE_TOOLTIP_TABS" : "Κάντε κλικ για να αλλάξετε το πλάτος του tab", + "STATUSBAR_SPACES" : "Κενά:", + "STATUSBAR_TAB_SIZE" : "Μέγεθος Tab:", + "STATUSBAR_LINE_COUNT_SINGULAR" : "\u2014 {0} Γραμμή", + "STATUSBAR_LINE_COUNT_PLURAL" : "\u2014 {0} Γραμμές", + + // CodeInspection: errors/warnings + "ERRORS_PANEL_TITLE" : "{0} Σφάλματα", + "SINGLE_ERROR" : "1 {0} Σφάλμα", + "MULTIPLE_ERRORS" : "{1} {0} Σφάλματα", + "NO_ERRORS" : "Κανένα {0} Σφάλμα - Λαμπρά!", + "LINT_DISABLED" : "Το Linting είναι απενεργοποιημένο", + "NO_LINT_AVAILABLE" : "Δεν υπάρχει διαθέσιμος linter για {0}", + "NOTHING_TO_LINT" : "Δεν υπάρχει τίποτα για να γίνει lint", + + + /** + * Command Name Constants + */ + + // File menu commands + "FILE_MENU" : "Αρχείο", + "CMD_FILE_NEW_UNTITLED" : "Νέο", + "CMD_FILE_NEW" : "Νέο Αρχείο", + "CMD_FILE_NEW_FOLDER" : "Νέος Φάκελος", + "CMD_FILE_OPEN" : "Άνοιγμα\u2026", + "CMD_ADD_TO_WORKING_SET" : "Πρόσθεση στα Αρχεία Εργασίας", + "CMD_OPEN_FOLDER" : "Άνοιγμα Φακέλου\u2026", + "CMD_FILE_CLOSE" : "Κλείσιμο", + "CMD_FILE_CLOSE_ALL" : "Κλείσιμο Όλων", + "CMD_FILE_SAVE" : "Αποθήκευση", + "CMD_FILE_SAVE_ALL" : "Αποθήκευση Όλων", + "CMD_FILE_SAVE_AS" : "Αποθήκευση Ως\u2026", + "CMD_LIVE_FILE_PREVIEW" : "Live Preview", + "CMD_PROJECT_SETTINGS" : "Ρυθμίσεις Project\u2026", + "CMD_FILE_RENAME" : "Μετονομασία", + "CMD_FILE_DELETE" : "Διαγραφή", + "CMD_INSTALL_EXTENSION" : "Εγκατάσταση Επέκτασης (Extension)\u2026", + "CMD_EXTENSION_MANAGER" : "Διαχειριστής Επεκτάσεων\u2026", + "CMD_FILE_REFRESH" : "Ανανέωση Δέντρου Αρχείων", + "CMD_QUIT" : "Κλείσιμο", + // Used in native File menu on Windows + "CMD_EXIT" : "΄Εξοδος", + + // Edit menu commands + "EDIT_MENU" : "Επεξεργασία", + "CMD_UNDO" : "Αναίρεση", + "CMD_REDO" : "Επανάληψη", + "CMD_CUT" : "Αποκοπή", + "CMD_COPY" : "Αντιγραφή", + "CMD_PASTE" : "Επικόλληση", + "CMD_SELECT_ALL" : "Επιλογή Όλων", + "CMD_SELECT_LINE" : "Επιλογή Γραμμής", + "CMD_FIND" : "Εύρεση", + "CMD_FIND_IN_FILES" : "Εύρεση σε Αρχεία", + "CMD_FIND_IN_SUBTREE" : "Εύρεση σε\u2026", + "CMD_FIND_NEXT" : "Εύρεση Επόμενου", + "CMD_FIND_PREVIOUS" : "Εύρεση Προηγούμενου", + "CMD_REPLACE" : "Αντικατάσταση", + "CMD_INDENT" : "Εσοχή", + "CMD_UNINDENT" : "Αφαίρεση Εσοχής", + "CMD_DUPLICATE" : "Διπλασιασμός", + "CMD_DELETE_LINES" : "Διαγραφή Γραμμής", + "CMD_COMMENT" : "Εναλλαγή Σχολίου Γραμμής", + "CMD_BLOCK_COMMENT" : "Εναλλαγή Σχολίου Block", + "CMD_LINE_UP" : "Μετακίνηση Γραμμής Πάνω", + "CMD_LINE_DOWN" : "Μετακίνηση Γραμμής Κάτω", + "CMD_OPEN_LINE_ABOVE" : "Δημιουργία Γραμμής από πάνω", + "CMD_OPEN_LINE_BELOW" : "Δημιουργία Γραμμής από κάτω", + "CMD_TOGGLE_CLOSE_BRACKETS" : "Αυτόματο Κλείσιμο Αγκίστρων", + "CMD_SHOW_CODE_HINTS" : "Προβολή Υποδείξεων Κώδικα", + + // View menu commands + "VIEW_MENU" : "Προβολή", + "CMD_HIDE_SIDEBAR" : "Απόκρυψη Πλευρικής Εργαλειοθήκης", + "CMD_SHOW_SIDEBAR" : "Προβολή Πλευρικής Εργαλειοθήκης", + "CMD_INCREASE_FONT_SIZE" : "Αύξηση Μεγέθους Γραμματοσειράς", + "CMD_DECREASE_FONT_SIZE" : "Μείωση Μεγέθους Γραμματοσειράς", + "CMD_RESTORE_FONT_SIZE" : "Επαναφορά Μεγέθους Γραμματοσειράς", + "CMD_SCROLL_LINE_UP" : "Κύλιση Γραμμής Πάνω", + "CMD_SCROLL_LINE_DOWN" : "Κύλιση Γραμμής Κάτω", + "CMD_TOGGLE_LINE_NUMBERS" : "Αριθμοί Γραμμών", + "CMD_TOGGLE_ACTIVE_LINE" : "Επισήμανση Ενεργής Γραμμής", + "CMD_TOGGLE_WORD_WRAP" : "Αναδίπλωση Λέξης", + "CMD_LIVE_HIGHLIGHT" : "Επισήμανση Live Preview", + "CMD_VIEW_TOGGLE_INSPECTION" : "Lint Αρχείων κατά την Αποθήκευση", + "CMD_SORT_WORKINGSET_BY_ADDED" : "Ταξινόμηση κατά Σειράς Πρόσθεσης", + "CMD_SORT_WORKINGSET_BY_NAME" : "Ταξινόμηση κατά Όνομα", + "CMD_SORT_WORKINGSET_BY_TYPE" : "Ταξινόμηση κατά Τύπο", + "CMD_SORT_WORKINGSET_AUTO" : "Αυτόματη Ταξινόμηση", + + // Navigate menu Commands + "NAVIGATE_MENU" : "Πλοήγηση", + "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_NEXT_DOC" : "Επόμενο Έγγραφο", + "CMD_PREV_DOC" : "Προηγούμενο Έγγραφο", + "CMD_SHOW_IN_TREE" : "Προβολή στο Δέντρο Αρχείων", + "CMD_SHOW_IN_OS" : "Προβολή στο Λειτουργικό Σύστημα", + + // Help menu commands + "HELP_MENU" : "Βοήθεια", + "CMD_CHECK_FOR_UPDATE" : "Έλεγχος για Αναβαθμίσεις", + "CMD_HOW_TO_USE_BRACKETS" : "Πώς να Χρησιμοποιήσετε το {APP_NAME}", + "CMD_FORUM" : "{APP_NAME} Forum", + "CMD_RELEASE_NOTES" : "Release Notes", + "CMD_REPORT_AN_ISSUE" : "Αναφορά Προβλήματος", + "CMD_SHOW_EXTENSIONS_FOLDER" : "Προβολή Φακέλου Επεκτάσεων", + "CMD_TWITTER" : "{TWITTER_NAME} στο Twitter", + "CMD_ABOUT" : "Σχετικά με το {APP_TITLE}", + + // Strings for main-view.html + "EXPERIMENTAL_BUILD" : "experimental build", + "DEVELOPMENT_BUILD" : "development build", + "OK" : "OK", + "DONT_SAVE" : "Να Μην Αποθηκευτεί", + "SAVE" : "Αποθήκευση", + "CANCEL" : "Ακύρωση", + "DELETE" : "Διαγραφή", + "RELOAD_FROM_DISK" : "Επαναφόρτωση από τον Δίσκο", + "KEEP_CHANGES_IN_EDITOR" : "Διατήρηση Αλλαγών στο Επεξεργαστή", + "CLOSE_DONT_SAVE" : "Κλείσιμο (Να Μην Αποθηκευτεί)", + "RELAUNCH_CHROME" : "Επανεκκίνηση Chrome", + "ABOUT" : "Σχετικά", + "CLOSE" : "Κλείσιμο", + "ABOUT_TEXT_LINE1" : "sprint {VERSION_MINOR} {BUILD_TYPE} {VERSION}", + "ABOUT_TEXT_LINE3" : "Πληροφορίες, όροι και οι προϋποθέσεις που αφορούν λογισμικό τρίτων κατασκευαστών βρίσκονται στο {ADOBE_THIRD_PARTY} και ενσωματώνονται εδώ με αναφορά.", + "ABOUT_TEXT_LINE4" : "Documentation και πηγαίος κώδικας στο https://github.com/adobe/brackets/", + "ABOUT_TEXT_LINE5" : "Φτιαγμένο με \u2764 και JavaScript από:", + "ABOUT_TEXT_LINE6" : "Πολλούς ανθρώπους (απλά αντιμετωπίζουμε ένα πρόβλημα με την φόρτωση των δεδομένων αυτήν την στιγμή).", + "ABOUT_TEXT_WEB_PLATFORM_DOCS" : "Τα Web Platform Docs και το Web Platform γραφικό logo είναι αδειοδοτημένα κάτω από την άδεια Creative Commons Attribution, CC-BY 3.0 Unported.", + "UPDATE_NOTIFICATION_TOOLTIP" : "Υπάρχει ένα νέο build του {APP_NAME} διαθέσιμο! Πατήστε εδώ για λεπτομέρειες.", + "UPDATE_AVAILABLE_TITLE" : "Διαθέσιμη Αναβάθμιση", + "UPDATE_MESSAGE" : "Ψιτ, υπάρχει ένα νέο build του {APP_NAME} διαθέσιμο. Μερικές από τις καινούργιες λειτουργίες:", + "GET_IT_NOW" : "Κατέβασε το τώρα!", + "PROJECT_SETTINGS_TITLE" : "Ρυθμίσεις Project για: {0}", + "PROJECT_SETTING_BASE_URL" : "Live Preview Base URL", + "PROJECT_SETTING_BASE_URL_HINT" : "Για να χρησιμοποιήσετε τοπικό server, εισάγετε μια διεύθυνση σαν και αυτή http://localhost:8000/", + "BASEURL_ERROR_INVALID_PROTOCOL" : "Το πρωτόκολλο {0} δεν υποστηρίζεται από το Live Preview—παρακαλούμε χρησιμοποιήστε http: ή https: .", + "BASEURL_ERROR_SEARCH_DISALLOWED" : "Η διεύθυνση URL δεν μπορεί να περιέχει παραμέτρους αναζήτησης όπως \"{0}\".", + "BASEURL_ERROR_HASH_DISALLOWED" : "Η διεύθυνση URL δεν μπορεί να περιέχει hashes σαν και αυτά \"{0}\".", + "BASEURL_ERROR_INVALID_CHAR" : "Οι ειδικοί χαρακτήρες όπως '{0}' πρέπει να είναι %-encoded.", + "BASEURL_ERROR_UNKNOWN_ERROR" : "Άγνωστο σφάλμα κατά την προσπέλαση της διεύθυνσης URL", + + // Extension Management strings + "INSTALL" : "Εγκατάσταση", + "UPDATE" : "Αναβάθμιση", + "REMOVE" : "Κατάργηση", + "OVERWRITE" : "Αντικατάσταση", + "CANT_REMOVE_DEV" : "Οι επεκτάσεις στο φάκελο \"dev\" πρέπει να διαγραφούν χειροκίνητα.", + "CANT_UPDATE" : "Η αναβάθμιση δεν είναι συμβατή με αυτήν την έκδοση του {APP_NAME}.", + "INSTALL_EXTENSION_TITLE" : "Εγκατάσταση Επέκτασης", + "UPDATE_EXTENSION_TITLE" : "Αναβάθμιση Επέκτασης", + "INSTALL_EXTENSION_LABEL" : "URL Επέκτασης", + "INSTALL_EXTENSION_HINT" : "URL αρχείου zip ή GitHub repo της επέκτασης", + "INSTALLING_FROM" : "Εγκατάσταση επέκτασης από {0}\u2026", + "INSTALL_SUCCEEDED" : "Εγκατάσταση επιτυχής!", + "INSTALL_FAILED" : "Εγκατάσταση ανεπιτυχής.", + "CANCELING_INSTALL" : "Ακύρωση\u2026", + "CANCELING_HUNG" : "Η ακύρωση της εγκατάστασης παίρνει πολύ ώρα. Κάποιο εσωτερικό σφάλμα μπορεί να έχει προκληθεί.", + "INSTALL_CANCELED" : "Η εγκατάσταση ακυρώθηκε.", + // These must match the error codes in ExtensionsDomain.Errors.* : + "INVALID_ZIP_FILE" : "Το περιεχόμενο που κατέβηκε δεν είναι έγκυρο αρχείο zip.", + "INVALID_PACKAGE_JSON" : "Το αρχείο package.json δεν είναι έγκυρο (error was: {0}).", + "MISSING_PACKAGE_NAME" : "Το αρχείο package.json δεν καθορίζει όνομα πακέτου.", + "BAD_PACKAGE_NAME" : "Το {0} δεν είναι έγκυρο όνομα αρχείου.", + "MISSING_PACKAGE_VERSION" : "Το αρχείο package.json δεν καθορίζει έκδοση πακέτου.", + "INVALID_VERSION_NUMBER" : "Ο αριθμός έκδοσης του πακέτου ({0}) δεν είναι έγκυρος.", + "INVALID_BRACKETS_VERSION" : "Η συμβολοσειρά συμβατότητας (compatibility string) ({0}) του {APP_NAME} δεν είναι έγκυρη.", + "DISALLOWED_WORDS" : "Οι λέξεις ({1}) δεν επιτρέπονται στο πεδίο {0}.", + "API_NOT_COMPATIBLE" : "Η επέκταση δεν είναι συμβατή με αυτήν την έκδοση του {APP_NAME}. Εγκαταστάθηκε στον φάκελο των απενεργοποιημένων επεκτάσεων.", + "MISSING_MAIN" : "Το πακέτο δεν έχει main.js αρχείο.", + "EXTENSION_ALREADY_INSTALLED" : "Η εγκατάσταση αυτού του πακέτου θα αντικαταστήσει μια προηγούμενη εγκατάσταση επέκτασης. Να αντικατασταθεί η παλιά επέκταση;", + "EXTENSION_SAME_VERSION" : "Αυτό το πακέτο είναι η ίδια έκδοση με αυτό που είναι ήδη εγκατεστημένο. Να αντικατασταθεί η υπάρχουσα εγκατάσταση;", + "EXTENSION_OLDER_VERSION" : "Αυτό το πακέτο είναι στην έκδοση {0} η οποία είναι παλιότερη από την τρέχουσα εγκατάσταση ({1}). Να αντικατασταθεί η υπάρχουσα εγκατάσταση;", + "DOWNLOAD_ID_IN_USE" : "Εσωτερικό σφάλμα: το ID που κατέβηκε χρησιμοποιείται ήδη.", + "NO_SERVER_RESPONSE" : "Αδυναμία σύνδεσης στον server.", + "BAD_HTTP_STATUS" : "Το αρχείο δεν βρέθηκε στον server (HTTP {0}).", + "CANNOT_WRITE_TEMP" : "Αδυναμία αποθήκευσης αυτού που κατέβηκε στο αρχείο temp.", + "ERROR_LOADING" : "Η επέκταση αντιμετώπισε ένα σφάλμα ενώ ξεκινούσε.", + "MALFORMED_URL" : "Η διεύθυνση URL δεν είναι έγκυρη is invalid. Please check that you entered it correctly.", + "UNSUPPORTED_PROTOCOL" : "Η διεύθυνση URL πρέπει να είναι http ή https.", + "UNKNOWN_ERROR" : "Άγνωστο εσωτερικό σφάλμα.", + // For NOT_FOUND_ERR, see generic strings above + "EXTENSION_MANAGER_TITLE" : "Διαχειριστής Επεκτάσεων", + "EXTENSION_MANAGER_ERROR_LOAD" : "Αδυναμία πρόσβασης στο μητρώο επεκτάσεων. Παρακαλώ προσπαθήστε αργότερα.", + "INSTALL_FROM_URL" : "Εγκατάσταση από διεύθυνση URL\u2026", + "EXTENSION_AUTHOR" : "Δημιουργός", + "EXTENSION_DATE" : "Ημερομηνία", + "EXTENSION_INCOMPATIBLE_NEWER" : "Αυτή η επέκταση απαιτεί νεότερη έκδοση του {APP_NAME}.", + "EXTENSION_INCOMPATIBLE_OLDER" : "Αυτή η επέκταση προς το παρόν δουλεύει μόνο με παλαιότερες εκδόσεις του {APP_NAME}.", + "EXTENSION_NO_DESCRIPTION" : "Δεν υπάρχει περιγραφή", + "EXTENSION_MORE_INFO" : "Περισσότερες Πληροφορίες...", + "EXTENSION_ERROR" : "Σφάλμα επέκτασης", + "EXTENSION_KEYWORDS" : "Λέξεις κλειδιά", + "EXTENSION_INSTALLED" : "Εγκατεστημένο", + "EXTENSION_UPDATE_INSTALLED" : "Αυτή η αναβάθμιση επέκτασης έχει κατέβει και θα εγκατασταθεί όταν κλείσει το {APP_NAME}.", + "EXTENSION_SEARCH_PLACEHOLDER" : "Αναζήτηση", + "EXTENSION_MORE_INFO_LINK" : "Περισσότερα", + "BROWSE_EXTENSIONS" : "Περιήγηση Επεκτάσεων", + "EXTENSION_MANAGER_REMOVE" : "Κατάργηση Επέκτασης", + "EXTENSION_MANAGER_REMOVE_ERROR" : "Αδυναμία κατάργησης μίας ή περισσότερων επεκτάσεων: {0}. Το {APP_NAME} θα κλείσει.", + "EXTENSION_MANAGER_UPDATE" : "Αναβάθμιση Επέκτασης", + "EXTENSION_MANAGER_UPDATE_ERROR" : "Αδυναμία αναβάθμισης μίας η περισσότερων επεκτάσεων: {0}. Το {APP_NAME} θα κλείσει.", + "MARKED_FOR_REMOVAL" : "Επιλεγμένο για κατάργηση", + "UNDO_REMOVE" : "Αναίρεση", + "MARKED_FOR_UPDATE" : "Επιλεγμένο για αναβάθμιση", + "UNDO_UPDATE" : "Αναίρεση", + "CHANGE_AND_QUIT_TITLE" : "Αλλαγή Επεκτάσεων", + "CHANGE_AND_QUIT_MESSAGE" : "Για να αναβαθμίσετε ή να καταργήσετε τις επιλεγμένες επεκτάσεις, πρέπει να κλείσετε και να επανεκκινήσετε το {APP_NAME}. Θα ερωτηθείτε για την αποθήκευση των αλλαγών.", + "REMOVE_AND_QUIT" : "Κατάργηση Επεκτάσεων και Κλείσιμο", + "CHANGE_AND_QUIT" : "Αλλαγή Επεκτάσεων και Κλείσιμο", + "UPDATE_AND_QUIT" : "Αναβάθμιση Επεκτάσεων και Κλείσιμο", + "EXTENSION_NOT_INSTALLED" : "Αδυναμία κατάργησης της επέκτασης {0} αφού δεν ήταν εγκατεστημένη.", + "NO_EXTENSIONS" : "Δεν υπάρχουν επεκτάσεις εγκατεστημένες ακόμα.
    Κάντε κλικ στην καρτέλα Διαθέσιμα για να ξεκινήσετε.", + "NO_EXTENSION_MATCHES" : "Δεν βρέθηκαν επεκτάσεις που να ικανοποιούν τα κριτήρια αναζήτησης σας.", + "REGISTRY_SANITY_CHECK_WARNING" : "Να είστε προσεκτικοί όταν εγκαθιστάτε επεκτάσεις από άγνωστες πηγές.", + "EXTENSIONS_INSTALLED_TITLE" : "Εγκατεστημένες", + "EXTENSIONS_AVAILABLE_TITLE" : "Διαθέσιμες", + "EXTENSIONS_UPDATES_TITLE" : "Αναβαθμίσεις", + + /** + * Unit names + */ + + "UNIT_PIXELS" : "pixels", + + + // extensions/default/DebugCommands + "DEBUG_MENU" : "Debug", + "CMD_SHOW_DEV_TOOLS" : "Προβολή Developer Tools", + "CMD_REFRESH_WINDOW" : "Επαναφόρτωση {APP_NAME}", + "CMD_NEW_BRACKETS_WINDOW" : "Νέο Παράθυρο {APP_NAME}", + "CMD_SWITCH_LANGUAGE" : "Αλλαγή Γλώσσας", + "CMD_RUN_UNIT_TESTS" : "Τρέξε Tests", + "CMD_SHOW_PERF_DATA" : "Προβολή Δεδομένων Επίδοσης", + "CMD_ENABLE_NODE_DEBUGGER" : "Ενεργοποίηση του Node Debugger", + "CMD_LOG_NODE_STATE" : "Καταγραφή Node State στη Console", + "CMD_RESTART_NODE" : "Επανεκκίνηση του Node", + + "LANGUAGE_TITLE" : "Αλλαγή Γλώσσας", + "LANGUAGE_MESSAGE" : "Γλώσσες:", + "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_PL" : "Πολωνικά", + "LOCALE_PT_BR" : "Πορτογαλικά, Βραζιλία", + "LOCALE_PT_PT" : "Πορτογαλικά", + "LOCALE_RU" : "Ρώσικα", + "LOCALE_SK" : "Σλοβακικά", + "LOCALE_SV" : "Σουηδικά", + "LOCALE_TR" : "Τούρκικα", + "LOCALE_ZH_CN" : "Κινέζικα, απλοποιημένα", + "LOCALE_HU" : "Ουγγρικά", + + // extensions/default/InlineColorEditor + "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Τρέχων Χρώμα", + "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "Αρχικό Χρώμα", + "COLOR_EDITOR_RGBA_BUTTON_TIP" : "Μορφή RGBa", + "COLOR_EDITOR_HEX_BUTTON_TIP" : "Μορφή Hex", + "COLOR_EDITOR_HSLA_BUTTON_TIP" : "Μορφή HSLa", + "COLOR_EDITOR_USED_COLOR_TIP_SINGULAR" : "{0} (Χρησιμοποιήθηκε {1} φορά)", + "COLOR_EDITOR_USED_COLOR_TIP_PLURAL" : "{0} (Χρησιμοποιήθηκε {1} φορές)", + + // extensions/default/JavaScriptCodeHints + "CMD_JUMPTO_DEFINITION" : "Πήγαινε στον Ορισμό", + "CMD_SHOW_PARAMETER_HINT" : "Προβολή Υποδείξεων Παραμέτρων", + "NO_ARGUMENTS" : "<χωρίς παραμέτρους>", + + // extensions/default/JSLint + "JSLINT_NAME" : "JSLint", + + // extensions/default/QuickView + "CMD_ENABLE_QUICK_VIEW" : "Γρήγορη Προβολή στο Hover", + + // extensions/default/RecentProjects + "CMD_TOGGLE_RECENT_PROJECTS" : "Πρόσφατα Project", + + // extensions/default/WebPlatformDocs + "DOCS_MORE_LINK" : "Διαβάστε Περισσότερα" +}); diff --git a/src/nls/el/urls.js b/src/nls/el/urls.js new file mode 100644 index 00000000000..73c7feb80f8 --- /dev/null +++ b/src/nls/el/urls.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ +/*global define */ + +define({ + // Relative to the samples folder + "GETTING_STARTED" : "el/Ξεκινώντας", + "ADOBE_THIRD_PARTY" : "http://www.adobe.com/go/thirdparty/", + "WEB_PLATFORM_DOCS_LICENSE" : "http://creativecommons.org/licenses/by/3.0/deed.el" +}); diff --git a/src/nls/strings.js b/src/nls/strings.js index 79ab69b3012..2a01cb06660 100644 --- a/src/nls/strings.js +++ b/src/nls/strings.js @@ -39,6 +39,7 @@ define(function (require, exports, module) { root: true, "cs": true, "de": true, + "el": true, "es": true, "fi": true, "fr": true, From 27733fb45d284d32349f14c0fddd4ddc0391e924 Mon Sep 17 00:00:00 2001 From: Lawrence Hsu Date: Sun, 29 Sep 2013 16:25:11 -0700 Subject: [PATCH 0036/1140] Fixes based on @peterflynn's feedback. --- src/styles/brackets_patterns_override.less | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index c679ea39400..7f179c8df6e 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -403,7 +403,7 @@ a:focus { .modal .close { cursor: default; - margin: 10px 5px 0 0; + margin: 7px 5px 0 0; } .modal-header { @@ -523,7 +523,7 @@ a:focus { .dialog-filename { word-wrap: break-word; - font-weight: normal; + font-weight: @font-weight-semibold; body.platform-win & { // maintain contrast next to ".less-faint-on-win()" workaround font-weight: @font-weight-semibold; } @@ -838,9 +838,9 @@ input[type="color"], .uneditable-input { background-color: @tc-input-background; border: 1px solid @tc-input-border; - color: @tc-text; + color: @tc-light-weight-text; font-size: (@baseFontSize + 1px); - font-weight: @font-weight-semibold; + font-weight: normal; -webkit-font-smoothing: antialiased; .border-radius(@tc-control-border-radius); .box-shadow(@tc-input-inner-shadow); @@ -855,7 +855,6 @@ input[type="color"], &:focus { outline: 0; background-color: @tc-input-background; - color: @tc-text; text-shadow: none; border: 1px solid @tc-gray-component-focused-border; box-shadow: @tc-input-inner-shadow, @tc-input-glow; From 60c890efa8c664b3d6c022a8e7ddee226e1978db Mon Sep 17 00:00:00 2001 From: Lance Campbell Date: Mon, 30 Sep 2013 12:08:36 -0700 Subject: [PATCH 0037/1140] Add Menu.removeMenuDivider unit tests --- src/command/Menus.js | 4 +-- test/spec/Menu-test.js | 62 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 5 deletions(-) diff --git a/src/command/Menus.js b/src/command/Menus.js index 718aa520f22..d5cf316f09f 100644 --- a/src/command/Menus.js +++ b/src/command/Menus.js @@ -485,7 +485,7 @@ define(function (require, exports, module) { } if (_isHTMLMenu(this.id)) { - // Targeting parent to get the menu item and the

    QLtPtIgPcoqddIO#jspkJy;+Cqjb696rpch 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 Lqq80a@63Xfy!Z{D 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

  • that contains it + // Targeting parent to get the menu divider
    and the
  • that contains it $HTMLMenuItem = $(_getHTMLMenuItem(menuItemID)).parent(); if ($HTMLMenuItem) { $HTMLMenuItem.remove(); @@ -583,7 +583,7 @@ define(function (require, exports, module) { // create MenuItem DOM if (_isHTMLMenu(this.id)) { if (name === DIVIDER) { - $menuItem = $("
    • "); + $menuItem = $("
    • "); } else { // Create the HTML Menu $menuItem = $("
    • "); diff --git a/test/spec/Menu-test.js b/test/spec/Menu-test.js index bbfe63932d8..7b74d3c7cd2 100644 --- a/test/spec/Menu-test.js +++ b/test/spec/Menu-test.js @@ -647,6 +647,64 @@ define(function (require, exports, module) { }); + describe("Remove Menu Divider", function () { + + function menuDividerDOM(menuItemId) { + return testWindow.$("#" + menuItemId); + } + + it("should add then remove new menu divider to empty menu", function () { + runs(function () { + var menuId = "menu-custom-removeMenuDivider-1"; + var menu = Menus.addMenu("Custom", menuId); + + var menuDivider = menu.addMenuDivider(); + expect(menuDivider).not.toBeNull(); + expect(menuDivider).toBeDefined(); + + var $listItems = menuDividerDOM(menuDivider.id); + expect($listItems.length).toBe(1); + + menu.removeMenuDivider(menuDivider.id); + $listItems = menuDividerDOM(menuDivider.id); + expect($listItems.length).toBe(0); + }); + }); + + it("should gracefully handle someone trying to remove a menu divider without supplying the id", function () { + runs(function () { + var menuId = "menu-custom-removeMenuDivider-2"; + var menu = Menus.addMenu("Custom", menuId); + + menu.removeMenuDivider(); + expect(menu).toBeTruthy(); // Verify that we got this far... + }); + }); + + it("should gracefully handle someone trying to remove a menu divider with an invalid id", function () { + runs(function () { + var menuId = "menu-custom-removeMenuDivider-3"; + var menu = Menus.addMenu("Custom", menuId); + + menu.removeMenuDivider("foo"); + expect(menu).toBeTruthy(); // Verify that we got this far... + }); + }); + + it("should gracefully handle someone trying to remove a menu item that is not a divider", function () { + runs(function () { + var menuId = "menu-custom-removeMenuDivider-4"; + var menu = Menus.addMenu("Custom", menuId); + var menuItemId = "menu-test-removeMenuDivider1"; + var menuItem = menu.addMenuItem(menuItemId); + + menu.removeMenuDivider(menuItemId); + expect(menu).toBeTruthy(); // Verify that we got this far... + }); + }); + }); + + describe("Remove Menu", function () { function menuDOM(menuId) { @@ -675,10 +733,8 @@ define(function (require, exports, module) { }); }); - it("should gracefully handle someone trying to remove a menu without supply the id", function () { + it("should gracefully handle someone trying to remove a menu without supplying the id", function () { runs(function () { - var menuId = "Menu-test"; - Menus.removeMenu(); expect(Menus).toBeTruthy(); // Verify that we got this far... }); From 204203e555c811469de0fbd5a5ca4c9de1d6bf91 Mon Sep 17 00:00:00 2001 From: Lance Campbell Date: Mon, 30 Sep 2013 12:36:06 -0700 Subject: [PATCH 0038/1140] Remove all menu items before removing menu --- src/command/Menus.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/command/Menus.js b/src/command/Menus.js index d5cf316f09f..22f83bd8d66 100644 --- a/src/command/Menus.js +++ b/src/command/Menus.js @@ -35,7 +35,8 @@ define(function (require, exports, module) { StringUtils = require("utils/StringUtils"), CommandManager = require("command/CommandManager"), PopUpManager = require("widgets/PopUpManager"), - ViewUtils = require("utils/ViewUtils"); + ViewUtils = require("utils/ViewUtils"), + CollectionUtils = require("utils/CollectionUtils"); /** * Brackets Application Menu Constants @@ -928,6 +929,10 @@ define(function (require, exports, module) { * Extensions should use the following format: "author.myextension.mymenuname". */ function removeMenu(id) { + var menu, + commandID = "", + menuDividerID = ""; + if (!id) { console.error("removeMenu(): missing required parameter: id"); return; @@ -938,6 +943,21 @@ define(function (require, exports, module) { return; } + // Remove all of the menu items in the menu + menu = getMenu(id); + + CollectionUtils.forEach(menuItemMap, function (value, key) { + if (key.substring(0, id.length) === id) { + if (value.isDivider) { + menuDividerID = key.substring((id.length + 1), key.length); + menu.removeMenuDivider(menuDividerID); + } else { + commandID = value.getCommand(); + menu.removeMenuItem(commandID); + } + } + }); + if (_isHTMLMenu(id)) { $(_getHTMLMenu(id)).remove(); } else { From 6ef7cfd43358e8a46b792c54f07de1878e90153d Mon Sep 17 00:00:00 2001 From: Lance Campbell Date: Mon, 30 Sep 2013 14:38:49 -0700 Subject: [PATCH 0039/1140] Fix problem with removing dividers. Add remove menu (native) unit tests. --- src/command/Menus.js | 8 ++--- test/spec/Menu-test.js | 76 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/src/command/Menus.js b/src/command/Menus.js index 22f83bd8d66..c986b685586 100644 --- a/src/command/Menus.js +++ b/src/command/Menus.js @@ -930,9 +930,8 @@ define(function (require, exports, module) { */ function removeMenu(id) { var menu, - commandID = "", - menuDividerID = ""; - + commandID = ""; + if (!id) { console.error("removeMenu(): missing required parameter: id"); return; @@ -949,8 +948,7 @@ define(function (require, exports, module) { CollectionUtils.forEach(menuItemMap, function (value, key) { if (key.substring(0, id.length) === id) { if (value.isDivider) { - menuDividerID = key.substring((id.length + 1), key.length); - menu.removeMenuDivider(menuDividerID); + menu.removeMenuDivider(key); } else { commandID = value.getCommand(); menu.removeMenuItem(commandID); diff --git a/test/spec/Menu-test.js b/test/spec/Menu-test.js index 7b74d3c7cd2..cc701ad0d42 100644 --- a/test/spec/Menu-test.js +++ b/test/spec/Menu-test.js @@ -66,6 +66,80 @@ define(function (require, exports, module) { SpecRunnerUtils.closeTestWindow(); }); + describe("Remove Menu", function () { + it("should add then remove new menu to menu bar with a menu id", function () { + runs(function () { + var menuId = "Menu-test"; + Menus.addMenu("Custom", menuId); + + var menu = Menus.getMenu(menuId); + expect(menu).toBeTruthy(); + + Menus.removeMenu(menuId); + menu = Menus.getMenu(menuId); + expect(menu).toBeUndefined(); + }); + }); + + it("should remove all menu items and dividers in the menu when removing the menu", function () { + runs(function () { + var menuId = "Menu-test"; + Menus.addMenu("Custom", menuId); + + var menu = Menus.getMenu(menuId); + expect(menu).toBeTruthy(); + + var commandId = "Remove-Menu-test.Item-1"; + CommandManager.register("Remove Menu Test Command", commandId, function () {}); + + var menuItem = menu.addMenuItem(commandId); + expect(menuItem).toBeTruthy(); + + var menuItemId = menuItem.id; + expect(menuItemId).toBeTruthy(); + + var menuDivider = menu.addMenuDivider(); + expect(menuDivider).toBeTruthy(); + + var menuDividerId = menuDivider.id; + expect(menuDividerId).toBeTruthy(); + + menuItem = Menus.getMenuItem(menuItemId); + expect(menuItem).toBeTruthy(); + + menuDivider = Menus.getMenuItem(menuDividerId); + expect(menuDivider).toBeTruthy(); + + Menus.removeMenu(menuId); + + menu = Menus.getMenu(menuId); + expect(menu).toBeUndefined(); + + menuItem = Menus.getMenuItem(menuItemId); + expect(menuItem).toBeUndefined(); + + menuDivider = Menus.getMenuItem(menuDividerId); + expect(menuDivider).toBeUndefined(); + }); + }); + + it("should gracefully handle someone trying to remove a menu that doesn't exist", function () { + runs(function () { + var menuId = "Menu-test"; + + Menus.removeMenu(menuId); + expect(Menus).toBeTruthy(); // Verify that we got this far... + }); + }); + + it("should gracefully handle someone trying to remove a menu without supplying the id", function () { + runs(function () { + Menus.removeMenu(); + expect(Menus).toBeTruthy(); // Verify that we got this far... + }); + }); + }); + describe("Context Menus", function () { it("register a context menu", function () { @@ -439,7 +513,7 @@ define(function (require, exports, module) { }); }); - it("should add menu items to beginnging and end of menu section", function () { + it("should add menu items to beginning and end of menu section", function () { // set up test menu and menu items CommandManager.register("Brackets Test Command Section 10", "Menu-test.command10", function () {}); CommandManager.register("Brackets Test Command Section 11", "Menu-test.command11", function () {}); From 8f1172959f80846afa6beec693c1d6e12af7adbc Mon Sep 17 00:00:00 2001 From: Oskar Karlsson Date: Tue, 1 Oct 2013 13:21:53 +0200 Subject: [PATCH 0040/1140] #5356, added HTML dialog-tag --- src/extensions/default/HTMLCodeHints/HtmlTags.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/extensions/default/HTMLCodeHints/HtmlTags.json b/src/extensions/default/HTMLCodeHints/HtmlTags.json index 0a84542784a..0ffa7997fb8 100644 --- a/src/extensions/default/HTMLCodeHints/HtmlTags.json +++ b/src/extensions/default/HTMLCodeHints/HtmlTags.json @@ -29,6 +29,7 @@ "del": { "attributes": ["cite", "datetime"] }, "details": { "attributes": ["open"] }, "dfn": { "attributes": [] }, + "dialog": { "attributes": ["open"] }, "div": { "attributes": [] }, "dl": { "attributes": [] }, "dt": { "attributes": [] }, From fabaa6bfb90f3d18a1274635e8cd7b32c5b7857a Mon Sep 17 00:00:00 2001 From: Oskar Karlsson Date: Tue, 1 Oct 2013 14:36:36 +0200 Subject: [PATCH 0041/1140] Gave searchPanel a min height --- src/search/FindInFiles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js index d563543b07d..2155a9a6cf9 100644 --- a/src/search/FindInFiles.js +++ b/src/search/FindInFiles.js @@ -848,7 +848,7 @@ define(function (require, exports, module) { // Initialize items dependent on HTML DOM AppInit.htmlReady(function () { var panelHtml = Mustache.render(searchPanelTemplate, Strings); - searchResultsPanel = PanelManager.createBottomPanel("find-in-files.results", $(panelHtml)); + searchResultsPanel = PanelManager.createBottomPanel("find-in-files.results", $(panelHtml), 100); $searchResults = $("#search-results"); $searchSummary = $searchResults.find(".title"); From 6723f6bad37314bb98622465ab07cd745aa12551 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Tue, 1 Oct 2013 19:02:32 +0200 Subject: [PATCH 0042/1140] My try to improve the replace() function --- src/search/FindReplace.js | 94 ++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 56 deletions(-) diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js index f605643ec24..ac536552984 100644 --- a/src/search/FindReplace.js +++ b/src/search/FindReplace.js @@ -508,7 +508,7 @@ define(function (require, exports, module) { ' '; - function replace(editor, all) { + function replace(editor) { var cm = editor._codeMirror; createModalBar(replaceQueryDialog, true); $(modalBar).on("commit", function (e, query) { @@ -524,62 +524,44 @@ define(function (require, exports, module) { createModalBar(replacementQueryDialog, true, false); $(modalBar).on("commit", function (e, text) { text = text || ""; - var match, - fnMatch = function (w, i) { return match[i]; }; - if (all) { - cm.compoundChange(function () { - cm.operation(function () { - var cursor = getSearchCursor(cm, query); - while (cursor.findNext()) { - if (typeof query !== "string") { - match = cm.getRange(cursor.from(), cursor.to()).match(query); - cursor.replace(text.replace(/\$(\d)/, fnMatch)); - } else { - cursor.replace(text); - } - } - }); - }); - } else { - clearSearch(cm); - var cursor = getSearchCursor(cm, query, cm.getCursor(true)); - var advance = function () { - var start = cursor.from(), - match = cursor.findNext(); - if (!match) { - cursor = getSearchCursor(cm, query); - match = cursor.findNext(); - if (!match || - (start && cursor.from().line === start.line && cursor.from().ch === start.ch)) { - // No more matches, so destroy modalBar - modalBar = null; - return; - } + clearSearch(cm); + var cursor = getSearchCursor(cm, query, cm.getCursor(true)); + var advance = function () { + var start = cursor.from(), + match = cursor.findNext(); + if (!match) { + cursor = getSearchCursor(cm, query); + match = cursor.findNext(); + if (!match || + (start && cursor.from().line === start.line && cursor.from().ch === start.ch)) { + // No more matches, so destroy modalBar + modalBar = null; + return; } - editor.setSelection(cursor.from(), cursor.to(), true, Editor.BOUNDARY_CHECK_NORMAL); - createModalBar(doReplaceConfirm, true, false); - modalBar.getRoot().on("click", function (e) { - var animate = (e.target.id !== "replace-yes" && e.target.id !== "replace-no"); - modalBar.close(true, animate); - if (e.target.id === "replace-yes") { - doReplace(match); - } else if (e.target.id === "replace-no") { - advance(); - } else if (e.target.id === "replace-all") { - _showReplaceAllPanel(editor, query, text, fnMatch); - } else if (e.target.id === "replace-stop") { - // Destroy modalBar on stop - modalBar = null; - } - }); - }; - var doReplace = function (match) { - cursor.replace(typeof query === "string" ? text : - text.replace(/\$(\d)/, function (w, i) { return match[i]; })); - advance(); - }; + } + editor.setSelection(cursor.from(), cursor.to(), true, Editor.BOUNDARY_CHECK_NORMAL); + createModalBar(doReplaceConfirm, true, false); + modalBar.getRoot().on("click", function (e) { + var animate = (e.target.id !== "replace-yes" && e.target.id !== "replace-no"); + modalBar.close(true, animate); + if (e.target.id === "replace-yes") { + doReplace(match); + } else if (e.target.id === "replace-no") { + advance(); + } else if (e.target.id === "replace-all") { + _showReplaceAllPanel(editor, query, text, function (w, i) { return match[i]; }); + } else if (e.target.id === "replace-stop") { + // Destroy modalBar on stop + modalBar = null; + } + }); + }; + var doReplace = function (match) { + cursor.replace(typeof query === "string" ? text : + text.replace(/\$(\d)/, function (w, i) { return match[i]; })); advance(); - } + }; + advance(); }); }); @@ -648,4 +630,4 @@ define(function (require, exports, module) { CommandManager.register(Strings.CMD_FIND_NEXT, Commands.EDIT_FIND_NEXT, _findNext); CommandManager.register(Strings.CMD_REPLACE, Commands.EDIT_REPLACE, _replace); CommandManager.register(Strings.CMD_FIND_PREVIOUS, Commands.EDIT_FIND_PREVIOUS, _findPrevious); -}); +}); \ No newline at end of file From d9e5cc9e7bb352e7dc38fe93c607ba54b2abb288 Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Mon, 30 Sep 2013 19:16:23 -0700 Subject: [PATCH 0043/1140] Make MultiRangeInlineEditor test that relies on editor interaction a true integration test and wait for async functions to complete --- src/brackets.js | 1 + test/spec/MultiRangeInlineEditor-test.js | 479 +++++++++++++---------- 2 files changed, 276 insertions(+), 204 deletions(-) diff --git a/src/brackets.js b/src/brackets.js index 0a3e2ab5514..4de19159ca9 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -159,6 +159,7 @@ define(function (require, exports, module) { InstallExtensionDialog : require("extensibility/InstallExtensionDialog"), RemoteAgent : require("LiveDevelopment/Agents/RemoteAgent"), HTMLInstrumentation : require("language/HTMLInstrumentation"), + MultiRangeInlineEditor : require("editor/MultiRangeInlineEditor").MultiRangeInlineEditor, doneLoading : false }; diff --git a/test/spec/MultiRangeInlineEditor-test.js b/test/spec/MultiRangeInlineEditor-test.js index 8828e474b24..9fa6185a56d 100644 --- a/test/spec/MultiRangeInlineEditor-test.js +++ b/test/spec/MultiRangeInlineEditor-test.js @@ -23,7 +23,7 @@ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define: false, describe: false, it: false, xit: false, expect: false, beforeEach: false, afterEach: false, waitsFor: false, runs: false, $: false, HTMLElement: false */ +/*global define: false, describe: false, it: false, xit: false, expect: false, beforeEach: false, afterEach: false, waitsFor: false, runs: false, $: false, HTMLElement: false, beforeFirst: false, afterLast: false, waitsForDone: false */ define(function (require, exports, module) { 'use strict'; @@ -33,7 +33,8 @@ define(function (require, exports, module) { InlineWidget = require("editor/InlineWidget").InlineWidget, Editor = require("editor/Editor").Editor, EditorManager = require("editor/EditorManager"), - SpecRunnerUtils = require("spec/SpecRunnerUtils"); + SpecRunnerUtils = require("spec/SpecRunnerUtils"), + Commands = require("command/Commands"); describe("MultiRangeInlineEditor", function () { @@ -42,223 +43,293 @@ define(function (require, exports, module) { hostEditor, doc; - beforeEach(function () { - // create dummy Document and Editor - var mocks = SpecRunnerUtils.createMockEditor("hostEditor", ""); - doc = mocks.doc; - hostEditor = mocks.editor; - }); - - afterEach(function () { - SpecRunnerUtils.destroyMockEditor(doc); - hostEditor = null; - }); - - it("should initialize to a default state", function () { - inlineEditor = new MultiRangeInlineEditor([]); - - expect(inlineEditor instanceof InlineTextEditor).toBe(true); - expect(inlineEditor instanceof InlineWidget).toBe(true); - expect(inlineEditor.editors.length).toBe(0); - expect(inlineEditor.htmlContent instanceof HTMLElement).toBe(true); - expect(inlineEditor.height).toBe(0); - expect(inlineEditor.id).toBeNull(); - expect(inlineEditor.hostEditor).toBeNull(); - }); - - it("should load a single rule and initialize htmlContent and editor", function () { - var inlineDoc = SpecRunnerUtils.createMockDocument("inlineDoc\nstartLine\nendLine\n"); - var mockRange = { - document: inlineDoc, - lineStart: 1, - lineEnd: 2 - }; - - inlineEditor = new MultiRangeInlineEditor([mockRange]); - inlineEditor.load(hostEditor); - - expect(inlineEditor.editors.length).toBe(1); - expect(inlineEditor.editors[0].document).toBe(inlineDoc); - }); - - it("should contain a rule list widget displaying info for each rule", function () { - var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"), - inlineDocName = inlineDoc.file.name; - - var mockRanges = [ - { - document: inlineDoc, - name: "div", - lineStart: 0, - lineEnd: 0 - }, - { - document: inlineDoc, - name: ".foo", - lineStart: 1, - lineEnd: 1 - } - ]; + describe("unit", function () { - inlineEditor = new MultiRangeInlineEditor(mockRanges); - inlineEditor.load(hostEditor); + beforeEach(function () { + // create dummy Document and Editor + var mocks = SpecRunnerUtils.createMockEditor("hostEditor", ""); + doc = mocks.doc; + hostEditor = mocks.editor; + }); - var $ruleListItems = $(inlineEditor.htmlContent).find("li"); - expect($($ruleListItems.get(0)).text()).toBe("div — " + inlineDocName + " : 1"); - expect($($ruleListItems.get(1)).text()).toBe(".foo — " + inlineDocName + " : 2"); - }); - - it("should change selection to the next rule", function () { - var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); - - var mockRanges = [ - { - document: inlineDoc, - name: "div", - lineStart: 0, - lineEnd: 0 - }, - { - document: inlineDoc, - name: ".foo", - lineStart: 1, - lineEnd: 1 - } - ]; - - inlineEditor = new MultiRangeInlineEditor(mockRanges); - inlineEditor.load(hostEditor); - inlineEditor._selectNextRange(); - - var $selection = $(inlineEditor.htmlContent).find(".selection"); - var $ruleListItems = $(inlineEditor.htmlContent).find("li"); - expect($selection.position().top).toBe($($ruleListItems.get(0)).position().top); - }); - - it("should change selection to the previous rule", function () { - var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); - - var mockRanges = [ - { - document: inlineDoc, - name: "div", - lineStart: 0, - lineEnd: 0 - }, - { + afterEach(function () { + SpecRunnerUtils.destroyMockEditor(doc); + hostEditor = null; + }); + + it("should initialize to a default state", function () { + inlineEditor = new MultiRangeInlineEditor([]); + + expect(inlineEditor instanceof InlineTextEditor).toBe(true); + expect(inlineEditor instanceof InlineWidget).toBe(true); + expect(inlineEditor.editors.length).toBe(0); + expect(inlineEditor.htmlContent instanceof HTMLElement).toBe(true); + expect(inlineEditor.height).toBe(0); + expect(inlineEditor.id).toBeNull(); + expect(inlineEditor.hostEditor).toBeNull(); + }); + + it("should load a single rule and initialize htmlContent and editor", function () { + var inlineDoc = SpecRunnerUtils.createMockDocument("inlineDoc\nstartLine\nendLine\n"); + var mockRange = { document: inlineDoc, - name: ".foo", lineStart: 1, - lineEnd: 1 - } - ]; - - inlineEditor = new MultiRangeInlineEditor(mockRanges); - inlineEditor.load(hostEditor); - - // select .foo - inlineEditor.setSelectedIndex(1); - - // verify selection moves - var $selection = $(inlineEditor.htmlContent).find(".selection"); - var $ruleListItems = $(inlineEditor.htmlContent).find("li"); - expect($selection.position().top).toBe($($ruleListItems.get(1)).position().top); + lineEnd: 2 + }; + + inlineEditor = new MultiRangeInlineEditor([mockRange]); + inlineEditor.load(hostEditor); + + expect(inlineEditor.editors.length).toBe(1); + expect(inlineEditor.editors[0].document).toBe(inlineDoc); + }); + + it("should contain a rule list widget displaying info for each rule", function () { + var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"), + inlineDocName = inlineDoc.file.name; + + var mockRanges = [ + { + document: inlineDoc, + name: "div", + lineStart: 0, + lineEnd: 0 + }, + { + document: inlineDoc, + name: ".foo", + lineStart: 1, + lineEnd: 1 + } + ]; + + inlineEditor = new MultiRangeInlineEditor(mockRanges); + inlineEditor.load(hostEditor); + + var $ruleListItems = $(inlineEditor.htmlContent).find("li"); + expect($($ruleListItems.get(0)).text()).toBe("div — " + inlineDocName + " : 1"); + expect($($ruleListItems.get(1)).text()).toBe(".foo — " + inlineDocName + " : 2"); + }); + + it("should change selection to the next rule", function () { + var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); + + var mockRanges = [ + { + document: inlineDoc, + name: "div", + lineStart: 0, + lineEnd: 0 + }, + { + document: inlineDoc, + name: ".foo", + lineStart: 1, + lineEnd: 1 + } + ]; + + inlineEditor = new MultiRangeInlineEditor(mockRanges); + inlineEditor.load(hostEditor); + inlineEditor._selectNextRange(); + + var $selection = $(inlineEditor.htmlContent).find(".selection"); + var $ruleListItems = $(inlineEditor.htmlContent).find("li"); + expect($selection.position().top).toBe($($ruleListItems.get(0)).position().top); + }); + + it("should change selection to the previous rule", function () { + var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); + + var mockRanges = [ + { + document: inlineDoc, + name: "div", + lineStart: 0, + lineEnd: 0 + }, + { + document: inlineDoc, + name: ".foo", + lineStart: 1, + lineEnd: 1 + } + ]; + + inlineEditor = new MultiRangeInlineEditor(mockRanges); + inlineEditor.load(hostEditor); + + // select .foo + inlineEditor.setSelectedIndex(1); + + // verify selection moves + var $selection = $(inlineEditor.htmlContent).find(".selection"); + var $ruleListItems = $(inlineEditor.htmlContent).find("li"); + expect($selection.position().top).toBe($($ruleListItems.get(1)).position().top); + + // select div + inlineEditor._selectPreviousRange(); + + // verify selection moves again + expect($selection.position().top).toBe($($ruleListItems.get(0)).position().top); + }); - // select div - inlineEditor._selectPreviousRange(); - // verify selection moves again - expect($selection.position().top).toBe($($ruleListItems.get(0)).position().top); + function expectResultItemToEqual(resultItem, mockRange) { + expect(resultItem.name).toBe(mockRange.name); + expect(resultItem.textRange.startLine).toBe(mockRange.lineStart); + expect(resultItem.textRange.endLine).toBe(mockRange.lineEnd); + } + + it("should retrieve all rules", function () { + var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); + var mockRanges = [ + { + document: inlineDoc, + name: "div", + lineStart: 0, + lineEnd: 0 + }, + { + document: inlineDoc, + name: ".foo", + lineStart: 1, + lineEnd: 1 + } + ]; + + inlineEditor = new MultiRangeInlineEditor(mockRanges); + + expect(inlineEditor._getRanges().length).toEqual(mockRanges.length); + expectResultItemToEqual(inlineEditor._getRanges()[0], mockRanges[0]); + expectResultItemToEqual(inlineEditor._getRanges()[1], mockRanges[1]); + }); + + it("should retreive the selected rule", function () { + var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); + + var mockRanges = [ + { + document: inlineDoc, + name: "div", + lineStart: 0, + lineEnd: 0 + }, + { + document: inlineDoc, + name: ".foo", + lineStart: 1, + lineEnd: 1 + } + ]; + + inlineEditor = new MultiRangeInlineEditor(mockRanges); + inlineEditor.load(hostEditor); + + // "div" rule should be selected by default + expectResultItemToEqual(inlineEditor._getSelectedRange(), mockRanges[0]); + + // select ".foo" rule - should be next + inlineEditor._selectNextRange(); + expectResultItemToEqual(inlineEditor._getSelectedRange(), mockRanges[1]); + }); }); - - function expectResultItemToEqual(resultItem, mockRange) { - expect(resultItem.name).toBe(mockRange.name); - expect(resultItem.textRange.startLine).toBe(mockRange.lineStart); - expect(resultItem.textRange.endLine).toBe(mockRange.lineEnd); - } - - it("should retreive all rules", function () { - var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); - var mockRanges = [ - { - document: inlineDoc, - name: "div", - lineStart: 0, - lineEnd: 0 - }, - { - document: inlineDoc, - name: ".foo", - lineStart: 1, - lineEnd: 1 - } - ]; + describe("integration", function () { - inlineEditor = new MultiRangeInlineEditor(mockRanges); + this.category = "integration"; - expect(inlineEditor._getRanges().length).toEqual(mockRanges.length); - expectResultItemToEqual(inlineEditor._getRanges()[0], mockRanges[0]); - expectResultItemToEqual(inlineEditor._getRanges()[1], mockRanges[1]); - }); + var testWindow, + TWCommandManager, + TWEditorManager, + TWMultiRangeInlineEditor; - it("should retreive the selected rule", function () { - var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); - - var mockRanges = [ - { - document: inlineDoc, - name: "div", - lineStart: 0, - lineEnd: 0 - }, - { - document: inlineDoc, - name: ".foo", - lineStart: 1, - lineEnd: 1 - } - ]; - - inlineEditor = new MultiRangeInlineEditor(mockRanges); - inlineEditor.load(hostEditor); + beforeFirst(function () { + SpecRunnerUtils.createTempDirectory(); + + // Create a new window that will be shared by ALL tests in this spec. + SpecRunnerUtils.createTestWindowAndRun(this, function (w) { + testWindow = w; + + // Load module instances from brackets.test + TWCommandManager = testWindow.brackets.test.CommandManager; + TWEditorManager = testWindow.brackets.test.EditorManager; + TWMultiRangeInlineEditor = testWindow.brackets.test.MultiRangeInlineEditor; + + SpecRunnerUtils.loadProjectInTestWindow(SpecRunnerUtils.getTempDirectory()); + }); + }); - // "div" rule should be selected by default - expectResultItemToEqual(inlineEditor._getSelectedRange(), mockRanges[0]); + afterLast(function () { + testWindow = null; + TWCommandManager = null; + TWEditorManager = null; + TWMultiRangeInlineEditor = null; + SpecRunnerUtils.closeTestWindow(); + + SpecRunnerUtils.removeTempDirectory(); + }); + + beforeEach(function () { + runs(function () { + waitsForDone(TWCommandManager.execute(Commands.FILE_NEW_UNTITLED)); + }); + + runs(function () { + hostEditor = TWEditorManager.getCurrentFullEditor(); + }); + }); - // select ".foo" rule - should be next - inlineEditor._selectNextRange(); - expectResultItemToEqual(inlineEditor._getSelectedRange(), mockRanges[1]); - }); + afterEach(function () { + runs(function () { + waitsForDone(TWCommandManager.execute(Commands.FILE_CLOSE, { _forceClose: true })); + }); + + runs(function () { + hostEditor = null; + }); + }); - it("should close and return to the host editor", function () { - var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); - - var mockRanges = [ - { - document: inlineDoc, - name: "div", - lineStart: 0, - lineEnd: 0 - } - ]; - - inlineEditor = new MultiRangeInlineEditor(mockRanges); - inlineEditor.load(hostEditor); - - // add widget directly, bypass _openInlineWidget - hostEditor.addInlineWidget({line: 0, ch: 0}, inlineEditor); - - // verify it was added - expect(hostEditor.hasFocus()).toBe(false); - expect(hostEditor.getInlineWidgets().length).toBe(1); - - // close the inline editor directly, should call EditorManager and removeInlineWidget - inlineEditor.close(); + // This needs to open in a Brackets test window because it's actually relying on + // the real Editor functions for adding an inline widget, which complete asynchronously + // after the animation is finished. That animation doesn't actually occur in the + // Jasmine window. + it("should close and return to the host editor", function () { + runs(function () { + var inlineDoc = SpecRunnerUtils.createMockDocument("div{}\n.foo{}\n"); + + var mockRanges = [ + { + document: inlineDoc, + name: "div", + lineStart: 0, + lineEnd: 0 + } + ]; + + inlineEditor = new TWMultiRangeInlineEditor(mockRanges); + inlineEditor.load(hostEditor); + + // add widget directly, bypass _openInlineWidget + waitsForDone(hostEditor.addInlineWidget({line: 0, ch: 0}, inlineEditor)); + }); + + runs(function () { + // verify it was added + expect(hostEditor.hasFocus()).toBe(false); + expect(hostEditor.getInlineWidgets().length).toBe(1); + + // close the inline editor directly, should call EditorManager and removeInlineWidget + waitsForDone(inlineEditor.close()); + }); + + runs(function () { + // verify no editors + expect(hostEditor.getInlineWidgets().length).toBe(0); + expect(hostEditor.hasFocus()).toBe(true); + }); + }); - // verify no editors - expect(hostEditor.getInlineWidgets().length).toBe(0); - expect(hostEditor.hasFocus()).toBe(true); }); }); From 1660fd58d5f0b77c82cc53ca390fa72d5d31157b Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Tue, 1 Oct 2013 13:44:58 -0700 Subject: [PATCH 0044/1140] Remove Win-specific hacks from #4568 now that desired font weight is heavier across the board. --- src/styles/brackets_patterns_override.less | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 7f179c8df6e..7ba6ab5a0ef 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -31,7 +31,7 @@ * */ -/* Variable OVerride */ +/* Variable Overrides */ @tooltipBackground: #fff; @tooltipArrowColor: @tooltipBackground; @@ -454,16 +454,6 @@ a:focus { } } -// Work around #4568: SourceSans is much fainter on Win than Mac, especially small text with "light" font-weight. -// We fix some of the most egregious cases by using a heavier font-weight only on Win (and because that's usually -// overkill, we also make the color paler to dial it back down a bit). -.less-faint-on-win() { - body.platform-win & { - font-weight: normal; - color: #2e2e2e; - } -} - .modal-body ul { /* Bootstrap's type.less defines a heavy margin-bottom on ul/ol that we don't want in dialogs since they have heavy padding instead. */ @@ -494,7 +484,6 @@ a:focus { line-height: 20px; margin-bottom: 20px; font-weight: normal; - .less-faint-on-win(); } .dialog-message li { @@ -524,9 +513,6 @@ a:focus { word-wrap: break-word; font-weight: @font-weight-semibold; - body.platform-win & { // maintain contrast next to ".less-faint-on-win()" workaround - font-weight: @font-weight-semibold; - } } /* Any Dialog text in this style is automatically turned into a link that opens in the browser. Use href for the link's target. */ @@ -724,15 +710,13 @@ a[href^="http"] { display: block; font-size: 15px; font-weight: normal; - .less-faint-on-win(); .user-select(text); cursor: text; } .ext-desc { + width: auto; color: @tc-text; font-weight: normal; - .less-faint-on-win(); - width: auto; .user-select(text); cursor: text; } @@ -811,7 +795,6 @@ a[href^="http"] { .dialog-message { font-size: 14px; line-height: 17px; - .less-faint-on-win(); // Enable text selection cursor: auto; From eb84a93fa1c34f90c198fab7ac4ab8d3143f84c0 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Tue, 1 Oct 2013 16:58:43 -0700 Subject: [PATCH 0045/1140] use precise=false for performance when parsing unchanging code --- src/language/HTMLUtils.js | 2 +- src/utils/TokenUtils.js | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/language/HTMLUtils.js b/src/language/HTMLUtils.js index e80768de554..405e7b48790 100644 --- a/src/language/HTMLUtils.js +++ b/src/language/HTMLUtils.js @@ -482,7 +482,7 @@ define(function (require, exports, module) { outerMode = editor._codeMirror.getMode(), tokenModeName; - while (TokenUtils.moveNextToken(ctx)) { + while (TokenUtils.moveNextToken(ctx, false)) { tokenModeName = CodeMirror.innerMode(outerMode, ctx.token.state).mode.name; if (inBlock) { if (!currentBlock.end) { diff --git a/src/utils/TokenUtils.js b/src/utils/TokenUtils.js index 625434aaefe..047e552dd5e 100644 --- a/src/utils/TokenUtils.js +++ b/src/utils/TokenUtils.js @@ -51,9 +51,15 @@ define(function (require, exports, module) { /** * Moves the given context backwards by one token. * @param {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} ctx + * @param {boolean=} precise If code is being edited, use true (default) for accuracy. + * If parsing unchanging code, use false to use cache for performance. * @return {boolean} whether the context changed */ - function movePrevToken(ctx) { + function movePrevToken(ctx, precise) { + if (precise === undefined) { + precise = true; + } + if (ctx.pos.ch <= 0 || ctx.token.start <= 0) { //move up a line if (ctx.pos.line <= 0) { @@ -64,17 +70,23 @@ define(function (require, exports, module) { } else { ctx.pos.ch = ctx.token.start; } - ctx.token = ctx.editor.getTokenAt(ctx.pos, true); + ctx.token = ctx.editor.getTokenAt(ctx.pos, precise); return true; } /** * Moves the given context forward by one token. * @param {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} ctx + * @param {boolean=} precise If code is being edited, use true (default) for accuracy. + * If parsing unchanging code, use false to use cache for performance. * @return {boolean} whether the context changed */ - function moveNextToken(ctx) { + function moveNextToken(ctx, precise) { var eol = ctx.editor.getLine(ctx.pos.line).length; + if (precise === undefined) { + precise = true; + } + if (ctx.pos.ch >= eol || ctx.token.end >= eol) { //move down a line if (ctx.pos.line >= ctx.editor.lineCount() - 1) { @@ -85,7 +97,7 @@ define(function (require, exports, module) { } else { ctx.pos.ch = ctx.token.end + 1; } - ctx.token = ctx.editor.getTokenAt(ctx.pos, true); + ctx.token = ctx.editor.getTokenAt(ctx.pos, precise); return true; } From 825a4a2d24281117771c9bf5ff754214ec6190df Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Tue, 1 Oct 2013 17:46:23 -0700 Subject: [PATCH 0046/1140] Re-add check for ignored folders when validating a package --- src/extensibility/node/package-validator.js | 14 +++++++++----- src/extensibility/node/spec/Validation.spec.js | 11 ++++++++++- test/spec/extension-test-files/has-macosx.zip | Bin 0 -> 9567 bytes 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 test/spec/extension-test-files/has-macosx.zip diff --git a/src/extensibility/node/package-validator.js b/src/extensibility/node/package-validator.js index b50db228a83..a18a6495a87 100644 --- a/src/extensibility/node/package-validator.js +++ b/src/extensibility/node/package-validator.js @@ -54,12 +54,10 @@ var Errors = { }; /* - * Directories to ignore when computing the common prefix among the entries of - * a zip file. + * Directories to ignore when determining whether the contents of an extension are + * in a subfolder. */ -var ignoredPrefixes = { - "__MACOSX": true -}; +var ignoredFolders = [ "__MACOSX" ]; /** * Returns true if the name presented is acceptable as a package name. This enforces the @@ -156,6 +154,12 @@ function containsWords(wordlist, str) { */ function findCommonPrefix(extractDir, callback) { fs.readdir(extractDir, function (err, files) { + ignoredFolders.forEach(function (folder) { + var index = files.indexOf(folder); + if (index !== -1) { + files.splice(index, 1); + } + }); if (err) { callback(err); } else if (files.length === 1) { diff --git a/src/extensibility/node/spec/Validation.spec.js b/src/extensibility/node/spec/Validation.spec.js index ccaf1371803..81cd35f7612 100644 --- a/src/extensibility/node/spec/Validation.spec.js +++ b/src/extensibility/node/spec/Validation.spec.js @@ -54,7 +54,8 @@ var basicValidExtension = path.join(testFilesDirectory, "basic-valid-extensio badname = path.join(testFilesDirectory, "badname.zip"), mainInDirectory = path.join(testFilesDirectory, "main-in-directory.zip"), invalidVersion = path.join(testFilesDirectory, "invalid-version.zip"), - invalidBracketsVersion = path.join(testFilesDirectory, "invalid-brackets-version.zip"); + invalidBracketsVersion = path.join(testFilesDirectory, "invalid-brackets-version.zip"), + ignoredFolder = path.join(testFilesDirectory, "has-macosx.zip"); describe("Package Validation", function () { @@ -291,4 +292,12 @@ describe("Package Validation", function () { expect(validateName("..")).toEqual(false); expect(validateName(".")).toEqual(false); }); + + it("should ignore the __MACOSX folder when looking for a single subfolder", function (done) { + packageValidator.validate(ignoredFolder, {}, function (err, result) { + expect(err).toBeNull(); + expect(result.errors.length).toEqual(0); + done(); + }); + }); }); \ No newline at end of file diff --git a/test/spec/extension-test-files/has-macosx.zip b/test/spec/extension-test-files/has-macosx.zip new file mode 100644 index 0000000000000000000000000000000000000000..6cb339bbeca38ec357b28e08a6ab3a72e816ef4a GIT binary patch literal 9567 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 H@4x;B44wtR literal 0 HcmV?d00001 From ac4c951cff07d6e9d019b43ebf6464b890ae664f Mon Sep 17 00:00:00 2001 From: wALF Utility Date: Tue, 1 Oct 2013 21:11:59 -0700 Subject: [PATCH 0047/1140] Updated by ALF automation. --- src/nls/fr/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js index 9c64cd0a2b8..3ccbb063570 100644 --- a/src/nls/fr/strings.js +++ b/src/nls/fr/strings.js @@ -341,7 +341,7 @@ define({ "INSTALL_EXTENSION_LABEL": "URL de l’extension ", "INSTALL_EXTENSION_HINT": "URL du fichier zip de l’extension ou du référentiel GitHub", "INSTALLING_FROM": "Installation de l’extension depuis·{0}\u2026", - "INSTALL_SUCCEEDED": "Installation réussie.", + "INSTALL_SUCCEEDED": "Installation réussie !", "INSTALL_FAILED": "Echec de l’installation.", "CANCELING_INSTALL": "Annulation en cours\u2026", "CANCELING_HUNG": "L’annulation de l’installation prend beaucoup de temps. Il est possible qu’une erreur interne se soit produite.", From bd4018d55cd3c0efcf42c117d623243997bed696 Mon Sep 17 00:00:00 2001 From: sathyamoorthi Date: Wed, 2 Oct 2013 17:03:48 +0530 Subject: [PATCH 0048/1140] Integration test failures fixed --- src/command/Commands.js | 1 + src/document/DocumentCommandHandlers.js | 26 ++++++---- src/document/DocumentManager.js | 59 +++++++++++++++------- src/extensions/default/CloseOthers/main.js | 4 +- src/nls/root/strings.js | 1 + 5 files changed, 59 insertions(+), 32 deletions(-) diff --git a/src/command/Commands.js b/src/command/Commands.js index 85509a9e97c..89061d93e01 100644 --- a/src/command/Commands.js +++ b/src/command/Commands.js @@ -43,6 +43,7 @@ define(function (require, exports, module) { exports.FILE_SAVE_AS = "file.saveAs"; // DocumentCommandHandlers.js handleFileSaveAs() exports.FILE_CLOSE = "file.close"; // DocumentCommandHandlers.js handleFileClose() exports.FILE_CLOSE_ALL = "file.close_all"; // DocumentCommandHandlers.js handleFileCloseAll() + exports.FILE_CLOSE_LIST = "file.close_list"; // DocumentCommandHandlers.js handleFileCloseList() exports.FILE_ADD_TO_WORKING_SET = "file.addToWorkingSet"; // DocumentCommandHandlers.js handleFileAddToWorkingSet() exports.FILE_LIVE_FILE_PREVIEW = "file.liveFilePreview"; // LiveDevelopment/main.js _handleGoLiveCommand() exports.FILE_LIVE_HIGHLIGHT = "file.previewHighlight"; // LiveDevelopment/main.js _handlePreviewHighlightCommand() diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index aef34c7a068..9330f3b856f 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -730,11 +730,16 @@ define(function (require, exports, module) { var doc = DocumentManager.getOpenDocumentForPath(file.fullPath); if (doc) { var savePromise = handleFileSave({doc: doc}); - savePromise.fail(function (error) { - if (error === USER_CANCELED) { - userCanceled = true; - } - }); + savePromise + .done(function (newFile) { + file.fullPath = newFile.fullPath; + file.name = newFile.name; + }) + .fail(function (error) { + if (error === USER_CANCELED) { + userCanceled = true; + } + }); return savePromise; } else { // working set entry that was never actually opened - ignore @@ -913,7 +918,7 @@ define(function (require, exports, module) { return promise; } - function _doCloseDocumentList(list, promptOnly) { + function _doCloseDocumentList(list, promptOnly, clearCurrentDoc) { var result = new $.Deferred(), unsavedDocs = []; @@ -997,7 +1002,7 @@ define(function (require, exports, module) { // guarantees that handlers run in the order they are added. result.done(function () { if (!promptOnly) { - DocumentManager.removeFromWorkingSet(list); + DocumentManager.removeListFromWorkingSet(list, (clearCurrentDoc || true)); } }); @@ -1016,8 +1021,8 @@ define(function (require, exports, module) { return _doCloseDocumentList(DocumentManager.getWorkingSet(), (commandData && commandData.promptOnly)); } - function handleFileCloseList(documentList) { - return _doCloseDocumentList(documentList); + function handleFileCloseList(commandData) { + return _doCloseDocumentList((commandData && commandData.documentList), false); } /** @@ -1226,8 +1231,6 @@ define(function (require, exports, module) { // Exported for unit testing only exports._parseDecoratedPath = _parseDecoratedPath; - - exports.handleFileCloseList = handleFileCloseList; // Register global commands CommandManager.register(Strings.CMD_FILE_OPEN, Commands.FILE_OPEN, handleFileOpen); @@ -1246,6 +1249,7 @@ define(function (require, exports, module) { CommandManager.register(Strings.CMD_FILE_CLOSE, Commands.FILE_CLOSE, handleFileClose); CommandManager.register(Strings.CMD_FILE_CLOSE_ALL, Commands.FILE_CLOSE_ALL, handleFileCloseAll); + CommandManager.register(Strings.CMD_FILE_CLOSE_LIST, Commands.FILE_CLOSE_LIST, handleFileCloseList); if (brackets.platform === "win") { CommandManager.register(Strings.CMD_EXIT, Commands.FILE_QUIT, handleFileQuit); diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index b5337ffc5a2..37e1f0785f0 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -316,12 +316,19 @@ define(function (require, exports, module) { // Dispatch event $(exports).triggerHandler("workingSetAddList", [uniqueFileList]); } - - function _internalRemoveFromWorkingSet(file) { + + /** + * Warning: low level API - use FILE_CLOSE command in most cases. + * Removes the given file from the working set list, if it was in the list. Does not change + * the current editor even if it's for this file. Does not prompt for unsaved changes. + * @param {!FileEntry} file + * @param {boolean=} true to suppress redraw after removal + */ + function removeFromWorkingSet(file, suppressRedraw) { // If doc isn't in working set, do nothing var index = findInWorkingSet(file.fullPath); if (index === -1) { - return false; + return; } // Remove @@ -329,22 +336,8 @@ define(function (require, exports, module) { _workingSetMRUOrder.splice(findInWorkingSet(file.fullPath, _workingSetMRUOrder), 1); _workingSetAddedOrder.splice(findInWorkingSet(file.fullPath, _workingSetAddedOrder), 1); - return true; - } - - function removeFromWorkingSet(content, suppressRedraw) { - if (content) { - if ($.isArray(content)) { - content.forEach(function (file) { - _internalRemoveFromWorkingSet(file); - }); - - $(exports).triggerHandler("workingSetRemoveList", [content]); - - } else if (_internalRemoveFromWorkingSet(content)) { - $(exports).triggerHandler("workingSetRemove", [content, suppressRedraw]); - } - } + // Dispatch event + $(exports).triggerHandler("workingSetRemove", [file, suppressRedraw]); } /** @@ -575,6 +568,33 @@ define(function (require, exports, module) { _clearCurrentDocument(); _removeAllFromWorkingSet(); } + + function removeListFromWorkingSet(list, clearCurrentDocument) { + var fileList = [], index; + + if (!list) { + return; + } + + if (clearCurrentDocument) { + _clearCurrentDocument(); + } + + list.forEach(function (file) { + index = findInWorkingSet(file.fullPath); + + if (index !== -1) { + fileList.push(_workingSet[index]); + + _workingSet.splice(index, 1); + _workingSetMRUOrder.splice(findInWorkingSet(file.fullPath, _workingSetMRUOrder), 1); + _workingSetAddedOrder.splice(findInWorkingSet(file.fullPath, _workingSetAddedOrder), 1); + } + }); + + $(exports).triggerHandler("workingSetRemoveList", [fileList]); + } + /** * Cleans up any loose Documents whose only ref is its own master Editor, and that Editor is not @@ -946,6 +966,7 @@ define(function (require, exports, module) { exports.addToWorkingSet = addToWorkingSet; exports.addListToWorkingSet = addListToWorkingSet; exports.removeFromWorkingSet = removeFromWorkingSet; + exports.removeListFromWorkingSet = removeListFromWorkingSet; exports.getNextPrevFile = getNextPrevFile; exports.swapWorkingSetIndexes = swapWorkingSetIndexes; exports.sortWorkingSet = sortWorkingSet; diff --git a/src/extensions/default/CloseOthers/main.js b/src/extensions/default/CloseOthers/main.js index 66d1028d20d..a569be514f3 100644 --- a/src/extensions/default/CloseOthers/main.js +++ b/src/extensions/default/CloseOthers/main.js @@ -56,8 +56,8 @@ define(function (require, exports, module) { for (i = start; i < end; i++) { docList.push(workingSet[i]); } - - docCH.handleFileCloseList(docList); + + CommandManager.execute(Commands.FILE_CLOSE_LIST, {documentList: docList}); } if (settings.close_below) { diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index f1f5621f527..77742450379 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -209,6 +209,7 @@ define({ "CMD_OPEN_FOLDER" : "Open Folder\u2026", "CMD_FILE_CLOSE" : "Close", "CMD_FILE_CLOSE_ALL" : "Close All", + "CMD_FILE_CLOSE_LIST" : "Close List", "CMD_FILE_CLOSE_OTHERS" : "Close Others", "CMD_FILE_CLOSE_ABOVE" : "Close Others Above", "CMD_FILE_CLOSE_BELOW" : "Close Others Below", From dc0ed463f4d37a27bc260f1d5dc1ac8e45224f43 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Wed, 2 Oct 2013 08:15:46 -0700 Subject: [PATCH 0049/1140] performance: do not use precise token parsing --- src/extensions/default/JavaScriptCodeHints/Session.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extensions/default/JavaScriptCodeHints/Session.js b/src/extensions/default/JavaScriptCodeHints/Session.js index 34a2a7ead5a..f8cc9fdcfc6 100644 --- a/src/extensions/default/JavaScriptCodeHints/Session.js +++ b/src/extensions/default/JavaScriptCodeHints/Session.js @@ -131,9 +131,9 @@ define(function (require, exports, module) { var cm = this.editor._codeMirror; if (cursor) { - return cm.getTokenAt(cursor, true); + return cm.getTokenAt(cursor); } else { - return cm.getTokenAt(this.getCursor(), true); + return cm.getTokenAt(this.getCursor()); } }; From 2b6c6620cb9f846e4e9b1dd29b8f52c0783d59b4 Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Wed, 2 Oct 2013 19:06:01 +0200 Subject: [PATCH 0050/1140] Fix dialog positioning --- src/styles/bootstrap/modals.less | 2 - src/styles/brackets_patterns_override.less | 50 ++++++++++++++-------- src/widgets/Dialogs.js | 33 ++++++++------ src/widgets/bootstrap-modal.js | 5 ++- 4 files changed, 55 insertions(+), 35 deletions(-) diff --git a/src/styles/bootstrap/modals.less b/src/styles/bootstrap/modals.less index ec57254b52c..6a04cec462d 100644 --- a/src/styles/bootstrap/modals.less +++ b/src/styles/bootstrap/modals.less @@ -27,10 +27,8 @@ .modal { position: fixed; top: 50%;//changed from 10% - left: 50%; z-index: @zindexModal; width: 600px; - margin: -250px 0 0 -280px;//changed from -280px background-color: @white; border: 1px solid #999; border: 1px solid rgba(0,0,0,.3); diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 5fc2ac1a93e..2a20a015ecd 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -376,9 +376,27 @@ /* Dialog-related styles */ +.modal-wrapper { + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; + overflow: auto; + display: table; +} + +.modal-inner-wrapper { + display: table-cell; + vertical-align: middle; +} + .modal { background-color: @tc-gray-panel; - width: auto; + min-width: 200px; + position: relative; + top: 0; + margin: auto; } .modal .close { @@ -392,11 +410,15 @@ border-bottom: 1px solid @tc-gray-panel-separator; } -.modal-body, .modal-header { +.modal-body { + background-color: @tc-gray-panel; +} + +.modal-body, .modal-header, .modal-footer { /* See styles/bootstrap/patterns.less .modal class. Pushing this value down to .modal-header and .modal-body to allow the overall modal to take the width of the footer */ - width: 580px; + width: 100%; } .modal-footer { @@ -558,9 +580,6 @@ a[href^="http"] { width: 400px; } -.install-extension-dialog { - margin-top: -125px; -} .install-extension-dialog .modal-body input.url { margin: 10px 0; width: 550px; @@ -568,17 +587,14 @@ a[href^="http"] { /* Extension Manager dialog */ .extension-manager-dialog { - top: 50%; - left: 50%; - margin-top: -275px; - margin-left: -350px; background-color: #d4d7d7; - + width: 730px; + .modal-header { border-bottom: none; + width: 760px; padding: 0; - width: auto; - + .nav-tabs { margin: 0; border-color: #c3c6c5; @@ -663,12 +679,12 @@ a[href^="http"] { } } .modal-body { - width: 730px; height: 400px; overflow-y: scroll; - padding: 0; background-color: @tc-gray-panel; - + padding: 0; + width: 760px; + .empty-message { position: absolute; top: 50%; @@ -897,7 +913,7 @@ input[type="color"], background-color: @tc-button-background; text-shadow: @tc-text-shadow; color: @tc-text; - cursor: default; + cursor: default; font-size: (@baseFontSize + 1); font-weight: @font-weight-semibold; line-height: normal; diff --git a/src/widgets/Dialogs.js b/src/widgets/Dialogs.js index fbc788f7253..7fbb67edd8f 100644 --- a/src/widgets/Dialogs.js +++ b/src/widgets/Dialogs.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -69,6 +69,7 @@ define(function (require, exports, module) { function _dismissDialog($dlg, buttonId) { $dlg.data("buttonId", buttonId); $dlg.modal("hide"); + $(".modal-wrapper:last").remove(); } /** @@ -219,15 +220,18 @@ define(function (require, exports, module) { * @return {Dialog} */ function showModalDialogUsingTemplate(template, autoDismiss) { + console.log("Appended"); if (autoDismiss === undefined) { autoDismiss = true; } + $("body").append("
    "); + var result = $.Deferred(), promise = result.promise(), $dlg = $(template) .addClass("instance") - .appendTo(window.document.body); + .appendTo(".modal-inner-wrapper:last"); // Save the dialog promise for unit tests $dlg.data("promise", promise); @@ -282,6 +286,7 @@ define(function (require, exports, module) { .modal({ backdrop: "static", show: true, + selector: ".modal-inner-wrapper:last", keyboard: false // handle the ESC key ourselves so we can deal with nested dialogs }) // Updates the z-index of the modal dialog and the backdrop @@ -321,7 +326,7 @@ define(function (require, exports, module) { } /** - * Immediately closes any dialog instances with the given class. The dialog callback for each instance will + * Immediately closes any dialog instances with the given class. The dialog callback for each instance will * be called with the special buttonId DIALOG_CANCELED (note: callback is run asynchronously). * @param {string} dlgClass The class name identifier for the dialog. * @param {string=} buttonId The button id to use when closing the dialog. Defaults to DIALOG_CANCELED diff --git a/src/widgets/bootstrap-modal.js b/src/widgets/bootstrap-modal.js index 12abe06f17a..14a918c6dca 100755 --- a/src/widgets/bootstrap-modal.js +++ b/src/widgets/bootstrap-modal.js @@ -57,7 +57,7 @@ var transition = $.support.transition && that.$element.hasClass('fade') if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position + that.$element.appendTo(this.options.selector) //don't move modals dom position } that.$element.show() @@ -160,7 +160,7 @@ var doAnimate = $.support.transition && animate this.$backdrop = $('
    ') - .appendTo(document.body) + .appendTo(this.options.selector) this.$backdrop.click( this.options.backdrop == 'static' ? @@ -212,6 +212,7 @@ backdrop: true , keyboard: true , show: true + , selector: "body" } $.fn.modal.Constructor = Modal From 21adbceca411a1db3b37bb42fada689b5f2454a1 Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Wed, 2 Oct 2013 21:14:55 +0200 Subject: [PATCH 0051/1140] Fix not exactly centering and remove console.log --- src/styles/brackets_patterns_override.less | 8 ++++++-- src/widgets/Dialogs.js | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 2a20a015ecd..c251de2639b 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -418,7 +418,7 @@ /* See styles/bootstrap/patterns.less .modal class. Pushing this value down to .modal-header and .modal-body to allow the overall modal to take the width of the footer */ - width: 100%; + width: 560px; } .modal-footer { @@ -588,7 +588,7 @@ a[href^="http"] { /* Extension Manager dialog */ .extension-manager-dialog { background-color: #d4d7d7; - width: 730px; + width: 760px; .modal-header { border-bottom: none; @@ -759,6 +759,10 @@ a[href^="http"] { } } } + + .modal-footer { + width: 730px; + } } /* About dialog */ diff --git a/src/widgets/Dialogs.js b/src/widgets/Dialogs.js index 7fbb67edd8f..b2209df395f 100644 --- a/src/widgets/Dialogs.js +++ b/src/widgets/Dialogs.js @@ -220,7 +220,6 @@ define(function (require, exports, module) { * @return {Dialog} */ function showModalDialogUsingTemplate(template, autoDismiss) { - console.log("Appended"); if (autoDismiss === undefined) { autoDismiss = true; } From 429ae863e9c58603b47cbe8896e5742cfd4b8cc7 Mon Sep 17 00:00:00 2001 From: Oskar Karlsson Date: Wed, 2 Oct 2013 21:19:25 +0200 Subject: [PATCH 0052/1140] Changed default minSize from 0 to 100 for Resizer.makeResizable() --- src/utils/Resizer.js | 9 ++++++--- src/view/PanelManager.js | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index c97f7d38748..9cba4a57f22 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -139,7 +139,7 @@ define(function (require, exports, module) { * @param {!string} position Which side of the element can be dragged: one of the POSITION_* constants * (TOP/BOTTOM for vertical resizing or LEFT/RIGHT for horizontal). * @param {?number} minSize Minimum size (width or height) of the element's outer dimensions, including - * border & padding. Defaults to 0. + * border & padding. Defaults to 100. * @param {?boolean} collapsible Indicates the panel is collapsible on double click on the * resizer. Defaults to false. * @param {?string} forceLeft CSS selector indicating element whose 'left' should be locked to the @@ -162,8 +162,11 @@ define(function (require, exports, module) { elementSizeFunction = direction === DIRECTION_HORIZONTAL ? $element.width : $element.height, resizerCSSPosition = direction === DIRECTION_HORIZONTAL ? "left" : "top", contentSizeFunction = direction === DIRECTION_HORIZONTAL ? $resizableElement.width : $resizableElement.height; - - minSize = minSize || 0; + + if (minSize === undefined) { + minSize = DEFAULT_MIN_SIZE; + } + collapsible = collapsible || false; $element.prepend($resizer); diff --git a/src/view/PanelManager.js b/src/view/PanelManager.js index 42cd694f670..43326bc4fa1 100644 --- a/src/view/PanelManager.js +++ b/src/view/PanelManager.js @@ -150,7 +150,7 @@ define(function (require, exports, module) { * Represents a panel below the editor area (a child of ".content"). * * @param {!jQueryObject} $panel The entire panel, including any chrome, already in the DOM. - * @param {number=} minSize Minimum height of panel in px; default is 0 + * @param {number=} minSize Minimum height of panel in px; default is 100 */ function Panel($panel, minSize) { this.$panel = $panel; @@ -187,7 +187,7 @@ define(function (require, exports, module) { * * @param {!string} id Unique id for this panel. Use package-style naming, e.g. "myextension.feature.panelname" * @param {!jQueryObject} $panel DOM content to use as the panel. Need not be in the document yet. - * @param {number=} minSize Minimum height of panel in px; default is 0 + * @param {number=} minSize Minimum height of panel in px; default is 100 * @return {!Panel} */ function createBottomPanel(id, $panel, minSize) { From a73b7c6fe727aace902190c8b479fd71651b4d60 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 2 Oct 2013 15:54:15 -0400 Subject: [PATCH 0053/1140] Consider 2,000 lines to be a large file for hints. This is a fix for #4922... only part of Document.js was being processed because it was considered a "large file" at 250 lines. 250 lines seems a bit too conservative. We'll want to see if there are complaints about memory usage and I think we'll also want to experiment a bit with how we manage Tern. But, it seems to me that a file the size of Document.js should not be getting truncated hints. --- src/extensions/default/JavaScriptCodeHints/ScopeManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js index c244da84e72..23d802234ed 100644 --- a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js +++ b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js @@ -59,7 +59,7 @@ define(function (require, exports, module) { var MAX_HINTS = 30, // how often to reset the tern server LARGE_LINE_CHANGE = 100, - LARGE_LINE_COUNT = 250, + LARGE_LINE_COUNT = 2000, OFFSET_ZERO = {line: 0, ch: 0}; /** From 93c5a38ebb612cb90219ec90762a3ba11b99c4be Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Thu, 3 Oct 2013 12:07:53 -0700 Subject: [PATCH 0054/1140] Implementation for this story https://trello.com/c/gbBtpARq/709-1-define-default-html-file-for-live-development Implemented fix for https://github.com/adobe/brackets/issues/2033 Added a lot of test cases to cover the new functionality. --- src/LiveDevelopment/LiveDevelopment.js | 173 ++++++++-- .../dynamic-project-1/sub/sub2/index.php | 2 + .../dynamic-project-1/sub/sub2/test.css | 1 + .../dynamic-project-2/sub/index.php | 2 + .../dynamic-project-2/sub/sub2/test.css | 1 + .../dynamic-project-3/index.php | 2 + .../dynamic-project-3/sub/sub2/test.css | 1 + .../dynamic-project-4/index.php | 2 + .../dynamic-project-4/sub/index.php | 2 + .../dynamic-project-4/sub/sub2/index.php | 2 + .../dynamic-project-4/sub/sub2/test.css | 1 + .../dynamic-project-5/index.php | 2 + .../dynamic-project-5/sub/index.php | 2 + .../dynamic-project-5/sub/sub2/index.php | 2 + .../dynamic-project-5/sub/test.css | 1 + .../static-project-1/sub/sub2/index.html | 2 + .../static-project-1/sub/sub2/test.css | 1 + .../static-project-2/sub/index.html | 9 + .../static-project-2/sub/sub2/test.css | 3 + .../static-project-3/index.html | 2 + .../static-project-3/sub/sub2/test.css | 1 + .../static-project-4/index.html | 2 + .../static-project-4/sub/index.html | 2 + .../static-project-4/sub/sub2/index.html | 2 + .../static-project-4/sub/sub2/test.css | 1 + .../static-project-5/index.html | 2 + .../static-project-5/sub/index.html | 2 + .../static-project-5/sub/sub2/index.html | 2 + .../static-project-5/sub/test.css | 1 + test/spec/LiveDevelopment-test.js | 314 ++++++++++++++++++ 30 files changed, 515 insertions(+), 27 deletions(-) create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-1/sub/sub2/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-1/sub/sub2/test.css create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-2/sub/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-2/sub/sub2/test.css create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-3/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-3/sub/sub2/test.css create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-4/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/sub2/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/sub2/test.css create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-5/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/sub2/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/test.css create mode 100644 test/spec/LiveDevelopment-test-files/static-project-1/sub/sub2/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-1/sub/sub2/test.css create mode 100644 test/spec/LiveDevelopment-test-files/static-project-2/sub/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-2/sub/sub2/test.css create mode 100644 test/spec/LiveDevelopment-test-files/static-project-3/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-3/sub/sub2/test.css create mode 100644 test/spec/LiveDevelopment-test-files/static-project-4/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-4/sub/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/test.css create mode 100644 test/spec/LiveDevelopment-test-files/static-project-5/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-5/sub/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-5/sub/sub2/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-5/sub/test.css diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index 2b0c26fe628..80ec0b4e432 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -75,6 +75,8 @@ define(function LiveDevelopment(require, exports, module) { var STATUS_SYNC_ERROR = exports.STATUS_SYNC_ERROR = 5; var Async = require("utils/Async"), + CollectionUtils = require("utils/CollectionUtils"), + FileIndexManager = require("project/FileIndexManager"), Dialogs = require("widgets/Dialogs"), DefaultDialogs = require("widgets/DefaultDialogs"), DocumentManager = require("document/DocumentManager"), @@ -566,7 +568,7 @@ define(function LiveDevelopment(require, exports, module) { // After (1) the interstitial page loads, (2) then browser navigation // to the base URL is completed, and (3) the agents finish loading // gather related documents and finally set status to STATUS_ACTIVE. - var doc = _getCurrentDocument(); + var doc = _getCurrentDocument(); // TODO: probably wrong... if (doc) { var status = STATUS_ACTIVE, @@ -611,6 +613,115 @@ define(function LiveDevelopment(require, exports, module) { return result.promise(); } + /** + * @private + * Determine an index file that can be used to start Live Development. + * This function will inspect all files in a project to find the closest index file + * available for currently opened document. We are searching for these files: + * - index.html + * - index.htm + * + * If the project is configured with a custom base url for live developmment, then + * the list of possible index files is extended to contain these index files too: + * - index.php + * - index.php3 + * - index.php4 + * - index.php5 + * - index.phtm + * - index.phtml + * - index.cfm + * - index.cfml + * - index.asp + * - index.aspx + * - index.jsp + * - index.jspx + * - index.shm + * - index.shml + * + * If a file was found, the promise will be resolved with the full path to this file. If no file + * was found in the whole project tree, the promise will be resolved with null. + * + * @return {jQuery.Promise} A promise that is resolved with a full path + * to a file if one could been determined, or null if there was no suitable index + * file. + */ + function _getInitialDocFromCurrent() { + var doc = _getCurrentDocument(), + refPath, + i; + + // TODO: FileUtils.getParentFolder() + function getParentFolder(path) { + return path.substring(0, path.lastIndexOf('/', path.length - 2) + 1); + } + + // Is the currently opened document already a file we can use for Live Development? + if (doc) { + refPath = doc.file.fullPath; + if (FileUtils.isStaticHtmlFileExt(refPath) || FileUtils.isServerHtmlFileExt(refPath)) { + return new $.Deferred().resolve(doc); + } + } + + var result = new $.Deferred(); + + var baseUrl = ProjectManager.getBaseUrl(), + hasOwnServerForLiveDevelopment = (baseUrl && baseUrl.length); + + // TODO: It would be better to reuse the list of file extensions from FileUtils + var staticIndexFiles = ["html", "htm"].map(function (extension) { return "index." + extension; }); + var dynamicIndexFiles = ["php", "php3", "php4", "php5", "phtm", "phtml", "cfm", "cfml", "asp", "aspx", "jsp", "jspx", "shtm", "shtml"].map(function (extension) { return "index." + extension; }); + + FileIndexManager.getFileInfoList("all").done(function (allFiles) { + if (refPath) { + var projectRoot = ProjectManager.getProjectRoot().fullPath, + containingFolder = FileUtils.getDirectoryPath(refPath), + indexFileFound = false, + stillInProjectTree = true; + + var filterIndexFile = function (fileInfo) { + if (fileInfo.fullPath.indexOf(containingFolder) === 0) { + if (hasOwnServerForLiveDevelopment) { + if ((dynamicIndexFiles.indexOf(fileInfo.name) !== -1) || + (staticIndexFiles.indexOf(fileInfo.name) !== -1)) { + return true; + } + } else if (staticIndexFiles.indexOf(fileInfo.name) !== -1) { + return true; + } + } else { + return false; + } + }; + + while (!indexFileFound && stillInProjectTree) { + i = CollectionUtils.indexOf(allFiles, filterIndexFile); + + // We found no good match + if (i === -1) { + // traverse the directory tree up one level + containingFolder = getParentFolder(containingFolder); + // Are we still inside the project? + if (containingFolder.indexOf(projectRoot) === -1) { + stillInProjectTree = false; + } + } else { + indexFileFound = true; + } + } + + if (i !== -1) { + DocumentManager.getDocumentForPath(allFiles[i].fullPath).then(result.resolve, result.resolve); + return; + } + } + + result.resolve(null); + }); + + return result.promise(); + } + /** * @private * While still connected to the Inspector, do cleanup for agents, @@ -819,17 +930,18 @@ define(function LiveDevelopment(require, exports, module) { // parallel. loadAgents(); - var doc = _getCurrentDocument(); - if (doc) { - // Navigate from interstitial to the document - // Fires a frameNavigated event - Inspector.Page.navigate(doc.url); - } else { - // Unlikely that we would get to this state where - // a connection is in process but there is no current - // document - close(); - } + _getInitialDocFromCurrent().done(function (doc) { + if (doc) { + // Navigate from interstitial to the document + // Fires a frameNavigated event + Inspector.Page.navigate(doc.url); + } else { + // Unlikely that we would get to this state where + // a connection is in process but there is no current + // document + close(); + } + }); }); } @@ -974,12 +1086,13 @@ define(function LiveDevelopment(require, exports, module) { // helper function that actually does the launch once we are sure we have // a doc and the server for that doc is up and running. - function _doLaunchAfterServerReady(doc) { + function _doLaunchAfterServerReady(initialDoc) { // update status _setStatus(STATUS_CONNECTING); // create live document - _liveDocument = _createDocument(doc, EditorManager.getCurrentFullEditor()); + initialDoc._ensureMasterEditor(); + _liveDocument = _createDocument(initialDoc, initialDoc._masterEditor); // start listening for requests _server.add(_liveDocument); @@ -1037,18 +1150,23 @@ define(function LiveDevelopment(require, exports, module) { /** Open the Connection and go live */ function open() { _openDeferred = new $.Deferred(); - - var doc = _getCurrentDocument(), - prepareServerPromise = (doc && _prepareServer(doc)) || new $.Deferred().reject(); - // wait for server (StaticServer, Base URL or file:) - prepareServerPromise.done(function (result) { - _doLaunchAfterServerReady(doc); - }); - - prepareServerPromise.fail(function () { - _showWrongDocError(); - _openDeferred.reject(); + // TODO: need to run _onDocumentChange() after load if doc != currentDocument here? Maybe not, since activeEditorChange + // doesn't trigger it, while inline editors can still cause edits in doc other than currentDoc... + _getInitialDocFromCurrent().done(function (doc) { + var prepareServerPromise = (doc && _prepareServer(doc)) || new $.Deferred().reject(); + + DocumentManager.addToWorkingSet(doc.file); + + // wait for server (StaticServer, Base URL or file:) + prepareServerPromise + .done(function () { + _doLaunchAfterServerReady(doc); + }) + .fail(function () { + _showWrongDocError(); + _openDeferred.reject(); + }); }); return _openDeferred.promise(); @@ -1181,8 +1299,9 @@ define(function LiveDevelopment(require, exports, module) { } // For unit testing - exports.launcherUrl = launcherUrl; - exports._getServer = _getServer; + exports.launcherUrl = launcherUrl; + exports._getServer = _getServer; + exports._getInitialDocFromCurrent = _getInitialDocFromCurrent; // Export public functions exports.agents = agents; diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-1/sub/sub2/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-1/sub/sub2/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-1/sub/sub2/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-1/sub/sub2/test.css b/test/spec/LiveDevelopment-test-files/dynamic-project-1/sub/sub2/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-1/sub/sub2/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-2/sub/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-2/sub/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-2/sub/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-2/sub/sub2/test.css b/test/spec/LiveDevelopment-test-files/dynamic-project-2/sub/sub2/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-2/sub/sub2/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-3/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-3/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-3/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-3/sub/sub2/test.css b/test/spec/LiveDevelopment-test-files/dynamic-project-3/sub/sub2/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-3/sub/sub2/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-4/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-4/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-4/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/sub2/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/sub2/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/sub2/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/sub2/test.css b/test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/sub2/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-4/sub/sub2/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-5/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-5/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-5/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/sub2/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/sub2/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/sub2/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/test.css b/test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-5/sub/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-1/sub/sub2/index.html b/test/spec/LiveDevelopment-test-files/static-project-1/sub/sub2/index.html new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-1/sub/sub2/index.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-1/sub/sub2/test.css b/test/spec/LiveDevelopment-test-files/static-project-1/sub/sub2/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-1/sub/sub2/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-2/sub/index.html b/test/spec/LiveDevelopment-test-files/static-project-2/sub/index.html new file mode 100644 index 00000000000..71591d40d14 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-2/sub/index.html @@ -0,0 +1,9 @@ + + + Test + + + +

    Hello

    + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-2/sub/sub2/test.css b/test/spec/LiveDevelopment-test-files/static-project-2/sub/sub2/test.css new file mode 100644 index 00000000000..c449d9c6840 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-2/sub/sub2/test.css @@ -0,0 +1,3 @@ +body { background-color: red;} + +h1 { color: blue; } diff --git a/test/spec/LiveDevelopment-test-files/static-project-3/index.html b/test/spec/LiveDevelopment-test-files/static-project-3/index.html new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-3/index.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-3/sub/sub2/test.css b/test/spec/LiveDevelopment-test-files/static-project-3/sub/sub2/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-3/sub/sub2/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-4/index.html b/test/spec/LiveDevelopment-test-files/static-project-4/index.html new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-4/index.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-4/sub/index.html b/test/spec/LiveDevelopment-test-files/static-project-4/sub/index.html new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-4/sub/index.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/index.html b/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/index.html new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/index.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/test.css b/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-5/index.html b/test/spec/LiveDevelopment-test-files/static-project-5/index.html new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-5/index.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-5/sub/index.html b/test/spec/LiveDevelopment-test-files/static-project-5/sub/index.html new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-5/sub/index.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-5/sub/sub2/index.html b/test/spec/LiveDevelopment-test-files/static-project-5/sub/sub2/index.html new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-5/sub/sub2/index.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-5/sub/test.css b/test/spec/LiveDevelopment-test-files/static-project-5/sub/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-5/sub/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test.js b/test/spec/LiveDevelopment-test.js index 5f0029903cb..94e0ba9e8e6 100644 --- a/test/spec/LiveDevelopment-test.js +++ b/test/spec/LiveDevelopment-test.js @@ -971,4 +971,318 @@ define(function (require, exports, module) { }); }); + + describe("Default HTML Document", function () { + var brackets, + FileIndexManager, + LiveDevelopment, + ProjectManager, + testWindow; + + beforeFirst(function () { + runs(function () { + SpecRunnerUtils.createTestWindowAndRun(this, function (w) { + testWindow = w; + // Load module instances from brackets.test + brackets = testWindow.brackets; + LiveDevelopment = brackets.test.LiveDevelopment; + FileIndexManager = brackets.test.FileIndexManager; + ProjectManager = brackets.test.ProjectManager; + }); + }); + }); + + afterLast(function () { + brackets = null; + FileIndexManager = null; + LiveDevelopment = null; + ProjectManager = null; + testWindow = null; + + SpecRunnerUtils.closeTestWindow(); + }); + + function loadFileAndUpdateFileIndex(fileToLoadIntoEditor) { + runs(function () { + // TODO: check if this is really necessary + FileIndexManager.markDirty(); + waits(2000); + waitsForDone(SpecRunnerUtils.openProjectFiles([fileToLoadIntoEditor]), "SpecRunnerUtils.openProjectFiles " + fileToLoadIntoEditor); + }); + } + + describe("Find static page for Live Development", function () { + it("should return the same HTML document like the currently open document", function () { + var promise, + document, + indexFile = "sub/sub2/index.html"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/static-project-1"); + + runs(function () { + waitsForDone(SpecRunnerUtils.openProjectFiles([indexFile]), "SpecRunnerUtils.openProjectFiles " + indexFile); + }); + + runs(function () { + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/static-project-1/" + indexFile); + }); + }); + + it("should find the HTML page in the same directory like the current document", function () { + var promise, + document, + cssFile = "sub/sub2/test.css", + indexFile = "sub/sub2/index.html"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/static-project-1"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/static-project-1/" + indexFile); + }); + }); + + it("should find the HTML page one directory level up", function () { + var promise, + document; + var cssFile = "sub/sub2/test.css", + indexFile = "sub/index.html"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/static-project-2"); + + loadFileAndUpdateFileIndex(cssFile); + + brackets.app.showDeveloperTools(); + runs(function () { + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/static-project-2/" + indexFile); + }); + }); + + it("should find the HTML page in the project root directory for the current document", function () { + var promise, + document; + var cssFile = "sub/sub2/test.css", + indexFile = "index.html"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/static-project-3"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/static-project-3/" + indexFile); + }); + }); + + it("should find the closest HTML page in the project tree", function () { + var promise, + document; + var cssFile = "sub/sub2/test.css", + indexFile = "sub/sub2/index.html"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/static-project-4"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/static-project-4/" + indexFile); + }); + }); + + it("should find the HTML page in the same directory", function () { + var promise, + document; + var cssFile = "sub/test.css", + indexFile = "sub/index.html"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/static-project-5"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/static-project-5/" + indexFile); + }); + }); + }); + + describe("Find dynamic page for Live Development", function () { + it("should return the same index.php document like the currently opened document", function () { + var promise, + document, + indexFile = "sub/sub2/index.php"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/dynamic-project-1"); + + runs(function () { + waitsForDone(SpecRunnerUtils.openProjectFiles([indexFile]), "SpecRunnerUtils.openProjectFiles " + indexFile); + }); + + runs(function () { + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/dynamic-project-1/" + indexFile); + }); + }); + + it("should find the index.php page in the same directory like the current document", function () { + var promise, + document, + cssFile = "sub/sub2/test.css", + indexFile = "sub/sub2/index.php"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/dynamic-project-1"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + ProjectManager.setBaseUrl("http://localhost:1111/"); + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/dynamic-project-1/" + indexFile); + }); + }); + + it("should find the index.php page one directory level up", function () { + var promise, + document, + cssFile = "sub/sub2/test.css", + indexFile = "sub/index.php"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/dynamic-project-2"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + ProjectManager.setBaseUrl("http://localhost:2222/"); + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/dynamic-project-2/" + indexFile); + }); + }); + + it("should find the index.php page in the project root", function () { + var promise, + document, + cssFile = "sub/sub2/test.css", + indexFile = "index.php"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/dynamic-project-3"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + ProjectManager.setBaseUrl("http://localhost:3333/"); + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/dynamic-project-3/" + indexFile); + }); + }); + + it("should find the HTML page in the same directory", function () { + var promise, + document; + var cssFile = "sub/test.css", + indexFile = "sub/index.php"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/dynamic-project-5"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + ProjectManager.setBaseUrl("http://localhost:5555/"); + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document.file.fullPath).toBe(testPath + "/dynamic-project-5/" + indexFile); + }); + }); + }); + }); }); From 0b76ededc75218f7d414a73b27e1c1308cc319ef Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 3 Oct 2013 15:31:33 -0400 Subject: [PATCH 0055/1140] Revert "Merge pull request #3406 from WebsiteDeveloper/Issue-1617" This reverts commit 2d350a5305beec1d282f700bf9d2b360e19a76a7, reversing changes made to d7fa08d20533766f77609c9969f3976500786fb0. --- src/editor/CodeHintManager.js | 132 +++++++++++++++------------------- src/editor/Editor.js | 15 ++-- test/SpecRunner.js | 33 +++++---- test/UnitTestSuite.js | 24 +++---- test/spec/CodeHint-test.js | 30 ++++---- 5 files changed, 107 insertions(+), 127 deletions(-) diff --git a/src/editor/CodeHintManager.js b/src/editor/CodeHintManager.js index d11257ef2ec..6619d9d8fcf 100644 --- a/src/editor/CodeHintManager.js +++ b/src/editor/CodeHintManager.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /* @@ -91,36 +91,36 @@ * to show hints. Because implicit hints can be triggered by every * character insertion, hasHints may be called frequently; consequently, * the provider should endeavor to return a value as quickly as possible. - * + * * Because calls to hasHints imply that a hinting session is about to * begin, a provider may wish to clean up cached data from previous * sessions in this method. Similarly, if the provider returns true, it * may wish to prepare to cache data suitable for the current session. In * particular, it should keep a reference to the editor object so that it * can access the editor in future calls to getHints and insertHints. - * - * param {Editor} editor + * + * param {Editor} editor * A non-null editor object for the active window. * - * param {string} implicitChar + * param {string} implicitChar * Either null, if the hinting request was explicit, or a single character * that represents the last insertion and that indicates an implicit * hinting request. * - * return {boolean} + * return {boolean} * Determines whether the current provider is able to provide hints for * the given editor context and, in case implicitChar is non- null, * whether it is appropriate to do so. - * - * + * + * * # CodeHintProvider.getHints(implicitChar) - * + * * The method by which a provider provides hints for the editor context * associated with the current session. The getHints method is called only * if the provider asserted its willingness to provide hints in an earlier - * call to hasHints. The provider may return null or false, which indicates + * call to hasHints. The provider may return null or false, which indicates * that the manager should end the current hinting session and close the hint - * list window; or true, which indicates that the manager should end the + * list window; or true, which indicates that the manager should end the * current hinting session but immediately attempt to begin a new hinting * session by querying registered providers. Otherwise, the provider should * return a response object that contains the following properties: @@ -156,7 +156,7 @@ * deferred object from the current call has resolved or been rejected. If * the provider rejects the deferred, the manager will end the hinting * session. - * + * * The getHints method may be called by the manager repeatedly during a * hinting session. Providers may wish to cache information for efficiency * that may be useful throughout these sessions. The same editor context @@ -177,7 +177,7 @@ * match: string, * selectInitial: boolean, * handleWideResults: boolean}} - * + * * Null if the provider wishes to end the hinting session. Otherwise, a * response object, possibly deferred, that provides 1. a sorted array * hints that consists either of strings or jQuery objects; 2. a string @@ -185,17 +185,17 @@ * matching substrings when rendering the hint list; and 3. a boolean that * indicates whether the first result, if one exists, should be selected * by default in the hint list window. If match is non-null, then the - * hints should be strings. - * - * If the match is null, the manager will not - * attempt to emphasize any parts of the hints when rendering the hint - * list; instead the provider may return strings or jQuery objects for + * hints should be strings. + * + * If the match is null, the manager will not + * attempt to emphasize any parts of the hints when rendering the hint + * list; instead the provider may return strings or jQuery objects for * which emphasis is self-contained. For example, the strings may contain - * substrings that wrapped in bold tags. In this way, the provider can + * substrings that wrapped in bold tags. In this way, the provider can * choose to let the manager handle emphasis for the simple and common case - * of prefix matching, or can provide its own emphasis if it wishes to use + * of prefix matching, or can provide its own emphasis if it wishes to use * a more sophisticated matching algorithm. - * + * * * # CodeHintProvider.insertHint(hint) * @@ -209,18 +209,18 @@ * explicit hinting request, which may result in a new hinting session * being opened with some provider, but not necessarily the current one. * - * param {string} hint + * param {string} hint * The hint to be inserted into the editor context for the current session. - * - * return {boolean} + * + * return {boolean} * Indicates whether the manager should follow hint insertion with an * explicit hint request. * * * # CodeHintProvider.insertHintOnTab - * + * * type {?boolean} insertHintOnTab - * Indicates whether the CodeHintManager should request that the provider of + * Indicates whether the CodeHintManager should request that the provider of * the current session insert the currently selected hint on tab key events, * or if instead a tab character should be inserted into the editor. If omitted, * the fallback behavior is determined by the CodeHintManager. The default @@ -275,12 +275,12 @@ define(function (require, exports, module) { return b.priority - a.priority; } - /** + /** * The method by which a CodeHintProvider registers its willingness to * providing hints for editors in a given language. * * @param {!CodeHintProvider} provider - * The hint provider to be registered, described below. + * The hint provider to be registered, described below. * * @param {!Array.} languageIds * The set of language ids for which the provider is capable of @@ -353,7 +353,7 @@ define(function (require, exports, module) { }); } - /** + /** * Return the array of hint providers for the given language id. * This gets called (potentially) on every keypress. So, it should be fast. * @@ -384,14 +384,14 @@ define(function (require, exports, module) { } } - /** + /** * Is there a hinting session active for a given editor? - * + * * NOTE: the sessionEditor, sessionProvider and hintList objects are - * only guaranteed to be initialized during an active session. - * + * only guaranteed to be initialized during an active session. + * * @param {Editor} editor - * @return boolean + * @return boolean */ function _inSession(editor) { if (sessionEditor) { @@ -433,7 +433,7 @@ define(function (require, exports, module) { _beginSession(previousEditor); } else if (response.hasOwnProperty("hints")) { // a synchronous response if (hintList.isOpen()) { - // the session is open + // the session is open hintList.update(response); } else { hintList.open(response); @@ -442,7 +442,7 @@ define(function (require, exports, module) { deferredHints = response; response.done(function (hints) { if (hintList.isOpen()) { - // the session is open + // the session is open hintList.update(hints); } else { hintList.open(hints); @@ -453,7 +453,7 @@ define(function (require, exports, module) { } /** - * Try to begin a new hinting session. + * Try to begin a new hinting session. * @param {Editor} editor */ _beginSession = function (editor) { @@ -497,7 +497,7 @@ define(function (require, exports, module) { }; /** - * Explicitly start a new session. If we have an existing session, + * Explicitly start a new session. If we have an existing session, * then close the current one and restart a new one. * @param {Editor} editor */ @@ -517,7 +517,7 @@ define(function (require, exports, module) { } /** - * Handles keys related to displaying, searching, and navigating the hint list. + * Handles keys related to displaying, searching, and navigating the hint list. * This gets called before handleChange. * * TODO: Ideally, we'd get a more semantic event from the editor that told us @@ -560,7 +560,7 @@ define(function (require, exports, module) { } /** - * Start a new implicit hinting session, or update the existing hint list. + * Start a new implicit hinting session, or update the existing hint list. * Called by the editor after handleKeyEvent, which is responsible for setting * the lastChar. */ @@ -571,8 +571,8 @@ define(function (require, exports, module) { var charToRetest = lastChar; _updateHintList(); - // _updateHintList() may end a hinting session and clear lastChar, but a - // different provider may want to start a new session with the same character. + // _updateHintList() may end a hinting session and clear lastChar, but a + // different provider may want to start a new session with the same character. // So check whether current provider terminates the current hinting // session. If so, then restore lastChar and restart a new session. if (!_inSession(editor)) { @@ -617,30 +617,10 @@ define(function (require, exports, module) { function _getCodeHintList() { return hintList; } - - function activeEditorChangeHandler(event, current, previous) { - var changeHandler = function (event, editor, changeList) { - handleChange(editor, changeList); - }, - keyEventHandler = function (jqEvent, editor, event) { - handleKeyEvent(editor, event); - }; - - $(current).on("change", changeHandler); - $(current).on("keyEvent", keyEventHandler); - - //Removing all old Handlers - $(previous).off("change", changeHandler); - $(previous).off("keyEvent", keyEventHandler); - } - - activeEditorChangeHandler(null, EditorManager.getActiveEditor(), null); - - $(EditorManager).on("activeEditorChange", activeEditorChangeHandler); // Dismiss code hints before executing any command since the command - // may make the current hinting session irrevalent after execution. - // For example, when the user hits Ctrl+K to open Quick Doc, it is + // may make the current hinting session irrevalent after execution. + // For example, when the user hits Ctrl+K to open Quick Doc, it is // pointless to keep the hint list since the user wants to view the Quick Doc. $(CommandManager).on("beforeExecuteCommand", _endSession); @@ -651,6 +631,8 @@ define(function (require, exports, module) { // Define public API exports.isOpen = isOpen; + exports.handleKeyEvent = handleKeyEvent; + exports.handleChange = handleChange; exports.registerHintProvider = registerHintProvider; exports.hasValidExclusion = hasValidExclusion; exports.setInsertHintOnTab = setInsertHintOnTab; diff --git a/src/editor/Editor.js b/src/editor/Editor.js index b809d2a7089..2f48ee98403 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -64,7 +64,8 @@ define(function (require, exports, module) { "use strict"; - var Commands = require("command/Commands"), + var CodeHintManager = require("editor/CodeHintManager"), + Commands = require("command/Commands"), CommandManager = require("command/CommandManager"), Menus = require("command/Menus"), PerfUtils = require("utils/PerfUtils"), @@ -270,6 +271,9 @@ define(function (require, exports, module) { function _handleKeyEvents(jqEvent, editor, event) { _checkElectricChars(jqEvent, editor, event); + + // Pass the key event to the code hint manager. It may call preventDefault() on the event. + CodeHintManager.handleKeyEvent(editor, event); } /** @@ -593,14 +597,9 @@ define(function (require, exports, module) { // Else, Master editor: // we're the ground truth; nothing else to do, since Document listens directly to us // note: this change might have been a real edit made by the user, OR this might have - // been a change synced from another editor. + // been a change synced from another editor - // The "editorChange" event is mostly for the use of the CodeHintManager. - // It differs from the normal "change" event, that it's actually publicly usable, - // whereas the "change" event should be listend to on the document. Also the - // Editor dispatches a change event before this event is dispatched, because - // CodeHintManager needs to hook in here when other things are already done. - $(this).triggerHandler("editorChange", [this, changeList]); + CodeHintManager.handleChange(this, changeList); }; /** diff --git a/test/SpecRunner.js b/test/SpecRunner.js index 39820234c6d..212edeafee0 100644 --- a/test/SpecRunner.js +++ b/test/SpecRunner.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ @@ -53,9 +53,8 @@ define(function (require, exports, module) { NodeConnection = require("utils/NodeConnection"), BootstrapReporterView = require("test/BootstrapReporterView").BootstrapReporterView, ColorUtils = require("utils/ColorUtils"), - NativeApp = require("utils/NativeApp"), - CodeHintManager = require("editor/CodeHintManager"); - + NativeApp = require("utils/NativeApp"); + // Load modules that self-register and just need to get included in the main project require("document/ChangedDocumentTracker"); @@ -168,7 +167,7 @@ define(function (require, exports, module) { /** * Listener for UnitTestReporter "runnerEnd" event. Attached only if * "resultsPath" URL parameter exists. Does not overwrite existing file. - * + * * @param {!$.Event} event * @param {!UnitTestReporter} reporter */ @@ -264,7 +263,7 @@ define(function (require, exports, module) { function init() { // Start up the node connection, which is held in the - // _nodeConnectionDeferred module variable. (Use + // _nodeConnectionDeferred module variable. (Use // _nodeConnectionDeferred.done() to access it. // This is in SpecRunner rather than SpecRunnerUtils because the hope diff --git a/test/UnitTestSuite.js b/test/UnitTestSuite.js index 3a409b593a3..b1b43bbf9a9 100644 --- a/test/UnitTestSuite.js +++ b/test/UnitTestSuite.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ diff --git a/test/spec/CodeHint-test.js b/test/spec/CodeHint-test.js index 6cedb11cfde..8e79371987c 100644 --- a/test/spec/CodeHint-test.js +++ b/test/spec/CodeHint-test.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ @@ -46,7 +46,7 @@ define(function (require, exports, module) { /** * Performs setup for a code hint test. Opens a file and set pos. - * + * * @param {!string} openFile Project relative file path to open in a main editor. * @param {!number} openPos The pos within openFile to place the IP. */ @@ -72,10 +72,10 @@ define(function (require, exports, module) { //testWindow.brackets.app.showDeveloperTools(); // Load module instances from brackets.test + CodeHintManager = testWindow.brackets.test.CodeHintManager; EditorManager = testWindow.brackets.test.EditorManager; CommandManager = testWindow.brackets.test.CommandManager; KeyBindingManager = testWindow.brackets.test.KeyBindingManager; - CodeHintManager = testWindow.brackets.test.CodeHintManager; }); }); @@ -318,7 +318,7 @@ define(function (require, exports, module) { preventDefault: function () { } }); - // Verify that after the keydown, the session is closed + // Verify that after the keydown, the session is closed // (not just the hint popup). Because of #1381, we don't // actually have a way to close the session as soon as the // popup is dismissed by Bootstrap, so we do so on the next From 4e2ff4558f926f458f973f76260e507ec6f870ec Mon Sep 17 00:00:00 2001 From: Oskar Karlsson Date: Thu, 3 Oct 2013 21:42:18 +0200 Subject: [PATCH 0056/1140] Changed comments that are related to minSize for creating panels --- src/utils/Resizer.js | 2 +- src/view/PanelManager.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index 9cba4a57f22..c4a1966f178 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -139,7 +139,7 @@ define(function (require, exports, module) { * @param {!string} position Which side of the element can be dragged: one of the POSITION_* constants * (TOP/BOTTOM for vertical resizing or LEFT/RIGHT for horizontal). * @param {?number} minSize Minimum size (width or height) of the element's outer dimensions, including - * border & padding. Defaults to 100. + * border & padding. Defaults to DEFAULT_MIN_SIZE. * @param {?boolean} collapsible Indicates the panel is collapsible on double click on the * resizer. Defaults to false. * @param {?string} forceLeft CSS selector indicating element whose 'left' should be locked to the diff --git a/src/view/PanelManager.js b/src/view/PanelManager.js index 43326bc4fa1..e558cae02b7 100644 --- a/src/view/PanelManager.js +++ b/src/view/PanelManager.js @@ -150,7 +150,7 @@ define(function (require, exports, module) { * Represents a panel below the editor area (a child of ".content"). * * @param {!jQueryObject} $panel The entire panel, including any chrome, already in the DOM. - * @param {number=} minSize Minimum height of panel in px; default is 100 + * @param {number=} minSize Minimum height of panel in px; default is DEFAULT_MIN_SIZE */ function Panel($panel, minSize) { this.$panel = $panel; @@ -187,7 +187,7 @@ define(function (require, exports, module) { * * @param {!string} id Unique id for this panel. Use package-style naming, e.g. "myextension.feature.panelname" * @param {!jQueryObject} $panel DOM content to use as the panel. Need not be in the document yet. - * @param {number=} minSize Minimum height of panel in px; default is 100 + * @param {number=} minSize Minimum height of panel in px; default is DEFAULT_MIN_SIZE * @return {!Panel} */ function createBottomPanel(id, $panel, minSize) { From f2bd6b2498006428acfa76dbc526755e03d5bdd8 Mon Sep 17 00:00:00 2001 From: Oskar Karlsson Date: Thu, 3 Oct 2013 22:48:20 +0200 Subject: [PATCH 0057/1140] Modified comment --- src/view/PanelManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/PanelManager.js b/src/view/PanelManager.js index e558cae02b7..1241d0f287a 100644 --- a/src/view/PanelManager.js +++ b/src/view/PanelManager.js @@ -187,7 +187,7 @@ define(function (require, exports, module) { * * @param {!string} id Unique id for this panel. Use package-style naming, e.g. "myextension.feature.panelname" * @param {!jQueryObject} $panel DOM content to use as the panel. Need not be in the document yet. - * @param {number=} minSize Minimum height of panel in px; default is DEFAULT_MIN_SIZE + * @param {number=} minSize Minimum height of panel in px. * @return {!Panel} */ function createBottomPanel(id, $panel, minSize) { From 5aff26817ea2cb02508fbb374e2013424c63c764 Mon Sep 17 00:00:00 2001 From: Oskar Karlsson Date: Thu, 3 Oct 2013 22:52:02 +0200 Subject: [PATCH 0058/1140] Missed one comment --- src/view/PanelManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/PanelManager.js b/src/view/PanelManager.js index 1241d0f287a..fcb27758d0f 100644 --- a/src/view/PanelManager.js +++ b/src/view/PanelManager.js @@ -150,7 +150,7 @@ define(function (require, exports, module) { * Represents a panel below the editor area (a child of ".content"). * * @param {!jQueryObject} $panel The entire panel, including any chrome, already in the DOM. - * @param {number=} minSize Minimum height of panel in px; default is DEFAULT_MIN_SIZE + * @param {number=} minSize Minimum height of panel in px. */ function Panel($panel, minSize) { this.$panel = $panel; From 667094c6b2899ef6b82d7318fc6bd3b08eddc7bf Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Thu, 3 Oct 2013 17:40:38 -0700 Subject: [PATCH 0059/1140] fixed some of the issues mentioned in the review --- src/LiveDevelopment/LiveDevelopment.js | 35 ++++++++++++------- src/file/FileUtils.js | 16 ++++----- .../dynamic-project-6/top1/index.php | 2 ++ .../dynamic-project-6/top2/test.css | 1 + .../static-project-4/sub/sub2/index.html | 6 ++++ .../static-project-6/top1/index.html | 2 ++ .../static-project-6/top2/test.css | 1 + test/spec/LiveDevelopment-test.js | 24 ++++++++++++- 8 files changed, 65 insertions(+), 22 deletions(-) create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-6/top1/index.php create mode 100644 test/spec/LiveDevelopment-test-files/dynamic-project-6/top2/test.css create mode 100644 test/spec/LiveDevelopment-test-files/static-project-6/top1/index.html create mode 100644 test/spec/LiveDevelopment-test-files/static-project-6/top2/test.css diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index 80ec0b4e432..5a6dba5459c 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -655,6 +655,11 @@ define(function LiveDevelopment(require, exports, module) { return path.substring(0, path.lastIndexOf('/', path.length - 2) + 1); } + function getFilenameWithoutExtension(filename) { + var index = filename.lastIndexOf("."); + return index === -1 ? filename : filename.slice(0, index); + } + // Is the currently opened document already a file we can use for Live Development? if (doc) { refPath = doc.file.fullPath; @@ -668,10 +673,6 @@ define(function LiveDevelopment(require, exports, module) { var baseUrl = ProjectManager.getBaseUrl(), hasOwnServerForLiveDevelopment = (baseUrl && baseUrl.length); - // TODO: It would be better to reuse the list of file extensions from FileUtils - var staticIndexFiles = ["html", "htm"].map(function (extension) { return "index." + extension; }); - var dynamicIndexFiles = ["php", "php3", "php4", "php5", "phtm", "phtml", "cfm", "cfml", "asp", "aspx", "jsp", "jspx", "shtm", "shtml"].map(function (extension) { return "index." + extension; }); - FileIndexManager.getFileInfoList("all").done(function (allFiles) { if (refPath) { var projectRoot = ProjectManager.getProjectRoot().fullPath, @@ -679,23 +680,31 @@ define(function LiveDevelopment(require, exports, module) { indexFileFound = false, stillInProjectTree = true; + var filteredFiltered = allFiles.filter(function (item) { + var parent = getParentFolder(item.fullPath); + + return (containingFolder.indexOf(parent) === 0); + }); + var filterIndexFile = function (fileInfo) { if (fileInfo.fullPath.indexOf(containingFolder) === 0) { - if (hasOwnServerForLiveDevelopment) { - if ((dynamicIndexFiles.indexOf(fileInfo.name) !== -1) || - (staticIndexFiles.indexOf(fileInfo.name) !== -1)) { + if (getFilenameWithoutExtension(fileInfo.name) === "index") { + if (hasOwnServerForLiveDevelopment) { + if ((FileUtils.isServerHtmlFileExt(fileInfo.name)) || + (FileUtils.isStaticHtmlFileExt(fileInfo.name))) { + return true; + } + } else if (FileUtils.isStaticHtmlFileExt(fileInfo.name)) { return true; } - } else if (staticIndexFiles.indexOf(fileInfo.name) !== -1) { - return true; + } else { + return false; } - } else { - return false; } }; while (!indexFileFound && stillInProjectTree) { - i = CollectionUtils.indexOf(allFiles, filterIndexFile); + i = CollectionUtils.indexOf(filteredFiltered, filterIndexFile); // We found no good match if (i === -1) { @@ -711,7 +720,7 @@ define(function LiveDevelopment(require, exports, module) { } if (i !== -1) { - DocumentManager.getDocumentForPath(allFiles[i].fullPath).then(result.resolve, result.resolve); + DocumentManager.getDocumentForPath(filteredFiltered[i].fullPath).then(result.resolve, result.resolve); return; } } diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js index 4269f0fb6a7..1c921c016dd 100644 --- a/src/file/FileUtils.js +++ b/src/file/FileUtils.js @@ -365,28 +365,28 @@ define(function (require, exports, module) { /** * Determine if file extension is a static html file extension. - * @param {string} fileExt file name with extension or just a file extension + * @param {string} filePath could be a path, a file name or just a file extension * @return {boolean} Returns true if fileExt is in the list */ - function isStaticHtmlFileExt(fileExt) { - if (!fileExt) { + function isStaticHtmlFileExt(filePath) { + if (!filePath) { return false; } - return (_staticHtmlFileExts.indexOf(getFileExtension(fileExt).toLowerCase()) !== -1); + return (_staticHtmlFileExts.indexOf(getFileExtension(filePath).toLowerCase()) !== -1); } /** * Determine if file extension is a server html file extension. - * @param {string} fileExt file name with extension or just a file extension + * @param {string} filePath could be a path, a file name or just a file extension * @return {boolean} Returns true if fileExt is in the list */ - function isServerHtmlFileExt(fileExt) { - if (!fileExt) { + function isServerHtmlFileExt(filePath) { + if (!filePath) { return false; } - return (_serverHtmlFileExts.indexOf(getFileExtension(fileExt).toLowerCase()) !== -1); + return (_serverHtmlFileExts.indexOf(getFileExtension(filePath).toLowerCase()) !== -1); } /** diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-6/top1/index.php b/test/spec/LiveDevelopment-test-files/dynamic-project-6/top1/index.php new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-6/top1/index.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/dynamic-project-6/top2/test.css b/test/spec/LiveDevelopment-test-files/dynamic-project-6/top2/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/dynamic-project-6/top2/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/index.html b/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/index.html index 8c7fe21114b..6aea6878621 100644 --- a/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/index.html +++ b/test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/index.html @@ -1,2 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-6/top1/index.html b/test/spec/LiveDevelopment-test-files/static-project-6/top1/index.html new file mode 100644 index 00000000000..8c7fe21114b --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-6/top1/index.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test-files/static-project-6/top2/test.css b/test/spec/LiveDevelopment-test-files/static-project-6/top2/test.css new file mode 100644 index 00000000000..26e0bcb6991 --- /dev/null +++ b/test/spec/LiveDevelopment-test-files/static-project-6/top2/test.css @@ -0,0 +1 @@ +body { background-color: red } \ No newline at end of file diff --git a/test/spec/LiveDevelopment-test.js b/test/spec/LiveDevelopment-test.js index 94e0ba9e8e6..bdb100e634e 100644 --- a/test/spec/LiveDevelopment-test.js +++ b/test/spec/LiveDevelopment-test.js @@ -1070,7 +1070,6 @@ define(function (require, exports, module) { loadFileAndUpdateFileIndex(cssFile); - brackets.app.showDeveloperTools(); runs(function () { promise = LiveDevelopment._getInitialDocFromCurrent(); @@ -1157,6 +1156,29 @@ define(function (require, exports, module) { expect(document.file.fullPath).toBe(testPath + "/static-project-5/" + indexFile); }); }); + + it("should not find any HTML page", function () { + var promise, + document; + var cssFile = "top2/test.css"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/static-project-6"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document).toBe(null); + }); + }); }); describe("Find dynamic page for Live Development", function () { From 5393ee479f851363f9cb28a317c2a8beb6eb9ad4 Mon Sep 17 00:00:00 2001 From: Ingo Richter Date: Thu, 3 Oct 2013 23:29:39 -0700 Subject: [PATCH 0060/1140] fixed some issues mentioned in the review - added some forgotten waitsForDone() calls - added a missing test case for dynamic-project-6 - check document and if it doesn't have a masterEditor before adding the document to the workspace - removed the waits() call after invalidating the FileIndexManager - re-enabled the message dialog if no suitable document was found for Live Preview --- src/LiveDevelopment/LiveDevelopment.js | 4 +++- test/spec/LiveDevelopment-test.js | 30 ++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index 5a6dba5459c..55bf4f6e0d9 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -1165,7 +1165,9 @@ define(function LiveDevelopment(require, exports, module) { _getInitialDocFromCurrent().done(function (doc) { var prepareServerPromise = (doc && _prepareServer(doc)) || new $.Deferred().reject(); - DocumentManager.addToWorkingSet(doc.file); + if (doc && !doc._masterEditor) { + DocumentManager.addToWorkingSet(doc.file); + } // wait for server (StaticServer, Base URL or file:) prepareServerPromise diff --git a/test/spec/LiveDevelopment-test.js b/test/spec/LiveDevelopment-test.js index bdb100e634e..9538bb6f050 100644 --- a/test/spec/LiveDevelopment-test.js +++ b/test/spec/LiveDevelopment-test.js @@ -1004,9 +1004,7 @@ define(function (require, exports, module) { function loadFileAndUpdateFileIndex(fileToLoadIntoEditor) { runs(function () { - // TODO: check if this is really necessary FileIndexManager.markDirty(); - waits(2000); waitsForDone(SpecRunnerUtils.openProjectFiles([fileToLoadIntoEditor]), "SpecRunnerUtils.openProjectFiles " + fileToLoadIntoEditor); }); } @@ -1029,6 +1027,8 @@ define(function (require, exports, module) { promise.done(function (doc) { document = doc; }); + + waitsForDone(promise); }); runs(function () { @@ -1199,6 +1199,8 @@ define(function (require, exports, module) { promise.done(function (doc) { document = doc; }); + + waitsForDone(promise); }); runs(function () { @@ -1305,6 +1307,30 @@ define(function (require, exports, module) { expect(document.file.fullPath).toBe(testPath + "/dynamic-project-5/" + indexFile); }); }); + + it("should not find any HTML page", function () { + var promise, + document; + var cssFile = "top2/test.css"; + + SpecRunnerUtils.loadProjectInTestWindow(testPath + "/dynamic-project-6"); + loadFileAndUpdateFileIndex(cssFile); + + runs(function () { + ProjectManager.setBaseUrl("http://localhost:6666/"); + promise = LiveDevelopment._getInitialDocFromCurrent(); + + promise.done(function (doc) { + document = doc; + }); + + waitsForDone(promise); + }); + + runs(function () { + expect(document).toBe(null); + }); + }); }); }); }); From b9813eb99dfa91bed76f167b6ca941feb029b498 Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Fri, 4 Oct 2013 13:34:22 +0200 Subject: [PATCH 0061/1140] Remove all references to CodeHintManager --- src/editor/CodeHintManager.js | 129 ++++++++++++++++++---------------- src/editor/Editor.js | 69 +++++++++--------- test/SpecRunner.js | 29 ++++---- 3 files changed, 120 insertions(+), 107 deletions(-) diff --git a/src/editor/CodeHintManager.js b/src/editor/CodeHintManager.js index 6619d9d8fcf..4717f56f638 100644 --- a/src/editor/CodeHintManager.js +++ b/src/editor/CodeHintManager.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /* @@ -91,36 +91,36 @@ * to show hints. Because implicit hints can be triggered by every * character insertion, hasHints may be called frequently; consequently, * the provider should endeavor to return a value as quickly as possible. - * + * * Because calls to hasHints imply that a hinting session is about to * begin, a provider may wish to clean up cached data from previous * sessions in this method. Similarly, if the provider returns true, it * may wish to prepare to cache data suitable for the current session. In * particular, it should keep a reference to the editor object so that it * can access the editor in future calls to getHints and insertHints. - * - * param {Editor} editor + * + * param {Editor} editor * A non-null editor object for the active window. * - * param {string} implicitChar + * param {string} implicitChar * Either null, if the hinting request was explicit, or a single character * that represents the last insertion and that indicates an implicit * hinting request. * - * return {boolean} + * return {boolean} * Determines whether the current provider is able to provide hints for * the given editor context and, in case implicitChar is non- null, * whether it is appropriate to do so. - * - * + * + * * # CodeHintProvider.getHints(implicitChar) - * + * * The method by which a provider provides hints for the editor context * associated with the current session. The getHints method is called only * if the provider asserted its willingness to provide hints in an earlier - * call to hasHints. The provider may return null or false, which indicates + * call to hasHints. The provider may return null or false, which indicates * that the manager should end the current hinting session and close the hint - * list window; or true, which indicates that the manager should end the + * list window; or true, which indicates that the manager should end the * current hinting session but immediately attempt to begin a new hinting * session by querying registered providers. Otherwise, the provider should * return a response object that contains the following properties: @@ -156,7 +156,7 @@ * deferred object from the current call has resolved or been rejected. If * the provider rejects the deferred, the manager will end the hinting * session. - * + * * The getHints method may be called by the manager repeatedly during a * hinting session. Providers may wish to cache information for efficiency * that may be useful throughout these sessions. The same editor context @@ -177,7 +177,7 @@ * match: string, * selectInitial: boolean, * handleWideResults: boolean}} - * + * * Null if the provider wishes to end the hinting session. Otherwise, a * response object, possibly deferred, that provides 1. a sorted array * hints that consists either of strings or jQuery objects; 2. a string @@ -185,17 +185,17 @@ * matching substrings when rendering the hint list; and 3. a boolean that * indicates whether the first result, if one exists, should be selected * by default in the hint list window. If match is non-null, then the - * hints should be strings. - * - * If the match is null, the manager will not - * attempt to emphasize any parts of the hints when rendering the hint - * list; instead the provider may return strings or jQuery objects for + * hints should be strings. + * + * If the match is null, the manager will not + * attempt to emphasize any parts of the hints when rendering the hint + * list; instead the provider may return strings or jQuery objects for * which emphasis is self-contained. For example, the strings may contain - * substrings that wrapped in bold tags. In this way, the provider can + * substrings that wrapped in bold tags. In this way, the provider can * choose to let the manager handle emphasis for the simple and common case - * of prefix matching, or can provide its own emphasis if it wishes to use + * of prefix matching, or can provide its own emphasis if it wishes to use * a more sophisticated matching algorithm. - * + * * * # CodeHintProvider.insertHint(hint) * @@ -209,18 +209,18 @@ * explicit hinting request, which may result in a new hinting session * being opened with some provider, but not necessarily the current one. * - * param {string} hint + * param {string} hint * The hint to be inserted into the editor context for the current session. - * - * return {boolean} + * + * return {boolean} * Indicates whether the manager should follow hint insertion with an * explicit hint request. * * * # CodeHintProvider.insertHintOnTab - * + * * type {?boolean} insertHintOnTab - * Indicates whether the CodeHintManager should request that the provider of + * Indicates whether the CodeHintManager should request that the provider of * the current session insert the currently selected hint on tab key events, * or if instead a tab character should be inserted into the editor. If omitted, * the fallback behavior is determined by the CodeHintManager. The default @@ -275,12 +275,12 @@ define(function (require, exports, module) { return b.priority - a.priority; } - /** + /** * The method by which a CodeHintProvider registers its willingness to * providing hints for editors in a given language. * * @param {!CodeHintProvider} provider - * The hint provider to be registered, described below. + * The hint provider to be registered, described below. * * @param {!Array.} languageIds * The set of language ids for which the provider is capable of @@ -353,7 +353,7 @@ define(function (require, exports, module) { }); } - /** + /** * Return the array of hint providers for the given language id. * This gets called (potentially) on every keypress. So, it should be fast. * @@ -384,14 +384,14 @@ define(function (require, exports, module) { } } - /** + /** * Is there a hinting session active for a given editor? - * + * * NOTE: the sessionEditor, sessionProvider and hintList objects are - * only guaranteed to be initialized during an active session. - * + * only guaranteed to be initialized during an active session. + * * @param {Editor} editor - * @return boolean + * @return boolean */ function _inSession(editor) { if (sessionEditor) { @@ -433,7 +433,7 @@ define(function (require, exports, module) { _beginSession(previousEditor); } else if (response.hasOwnProperty("hints")) { // a synchronous response if (hintList.isOpen()) { - // the session is open + // the session is open hintList.update(response); } else { hintList.open(response); @@ -442,7 +442,7 @@ define(function (require, exports, module) { deferredHints = response; response.done(function (hints) { if (hintList.isOpen()) { - // the session is open + // the session is open hintList.update(hints); } else { hintList.open(hints); @@ -453,7 +453,7 @@ define(function (require, exports, module) { } /** - * Try to begin a new hinting session. + * Try to begin a new hinting session. * @param {Editor} editor */ _beginSession = function (editor) { @@ -497,7 +497,7 @@ define(function (require, exports, module) { }; /** - * Explicitly start a new session. If we have an existing session, + * Explicitly start a new session. If we have an existing session, * then close the current one and restart a new one. * @param {Editor} editor */ @@ -517,7 +517,7 @@ define(function (require, exports, module) { } /** - * Handles keys related to displaying, searching, and navigating the hint list. + * Handles keys related to displaying, searching, and navigating the hint list. * This gets called before handleChange. * * TODO: Ideally, we'd get a more semantic event from the editor that told us @@ -528,7 +528,7 @@ define(function (require, exports, module) { * @param {Editor} editor * @param {KeyboardEvent} event */ - function handleKeyEvent(editor, event) { + function _handleKeyEvent(jqEvent, editor, event) { keyDownEditor = editor; if (event.type === "keydown") { if (!(event.ctrlKey || event.altKey || event.metaKey) && @@ -560,19 +560,19 @@ define(function (require, exports, module) { } /** - * Start a new implicit hinting session, or update the existing hint list. + * Start a new implicit hinting session, or update the existing hint list. * Called by the editor after handleKeyEvent, which is responsible for setting * the lastChar. */ - function handleChange(editor, changeList) { + function _handleChange(event, editor, changeList) { if (lastChar && editor === keyDownEditor) { keyDownEditor = null; if (_inSession(editor)) { var charToRetest = lastChar; _updateHintList(); - // _updateHintList() may end a hinting session and clear lastChar, but a - // different provider may want to start a new session with the same character. + // _updateHintList() may end a hinting session and clear lastChar, but a + // different provider may want to start a new session with the same character. // So check whether current provider terminates the current hinting // session. If so, then restore lastChar and restart a new session. if (!_inSession(editor)) { @@ -618,9 +618,22 @@ define(function (require, exports, module) { return hintList; } + function activeEditorChangeHandler(event, current, previous) { + $(current).on("editorChange", _handleChange); + $(current).on("keyEvent", _handleKeyEvent); + + //Removing all old Handlers + $(previous).off("editorChange", _handleChange); + $(previous).off("keyEvent", _handleKeyEvent); + } + + activeEditorChangeHandler(null, EditorManager.getActiveEditor(), null); + + $(EditorManager).on("activeEditorChange", activeEditorChangeHandler); + // Dismiss code hints before executing any command since the command - // may make the current hinting session irrevalent after execution. - // For example, when the user hits Ctrl+K to open Quick Doc, it is + // may make the current hinting session irrevalent after execution. + // For example, when the user hits Ctrl+K to open Quick Doc, it is // pointless to keep the hint list since the user wants to view the Quick Doc. $(CommandManager).on("beforeExecuteCommand", _endSession); @@ -631,8 +644,6 @@ define(function (require, exports, module) { // Define public API exports.isOpen = isOpen; - exports.handleKeyEvent = handleKeyEvent; - exports.handleChange = handleChange; exports.registerHintProvider = registerHintProvider; exports.hasValidExclusion = hasValidExclusion; exports.setInsertHintOnTab = setInsertHintOnTab; diff --git a/src/editor/Editor.js b/src/editor/Editor.js index 2f48ee98403..7300c936a5d 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -38,7 +38,7 @@ * * For now, direct access to the underlying CodeMirror object is still possible via _codeMirror -- * but this is considered deprecated and may go away. - * + * * The Editor object dispatches the following events: * - keyEvent -- When any key event happens in the editor (whether it changes the text or not). * Event handlers are passed ({Editor}, {KeyboardEvent}). The 2nd arg is the raw DOM event. @@ -64,8 +64,7 @@ define(function (require, exports, module) { "use strict"; - var CodeHintManager = require("editor/CodeHintManager"), - Commands = require("command/Commands"), + var Commands = require("command/Commands"), CommandManager = require("command/CommandManager"), Menus = require("command/Menus"), PerfUtils = require("utils/PerfUtils"), @@ -120,13 +119,13 @@ define(function (require, exports, module) { */ function _handleTabKey(instance) { // Tab key handling is done as follows: - // 1. If the selection is before any text and the indentation is to the left of + // 1. If the selection is before any text and the indentation is to the left of // the proper indentation then indent it to the proper place. Otherwise, - // add another tab. In either case, move the insertion point to the + // add another tab. In either case, move the insertion point to the // beginning of the text. // 2. If the selection is multi-line, indent all the lines. - // 3. If the selection is after the first non-space character, and is an - // insertion point, insert a tab character or the appropriate number + // 3. If the selection is after the first non-space character, and is an + // insertion point, insert a tab character or the appropriate number // of spaces to pad to the nearest tab boundary. var from = instance.getCursor(true), to = instance.getCursor(false), @@ -171,7 +170,7 @@ define(function (require, exports, module) { /** * @private * Handle left arrow, right arrow, backspace and delete keys when soft tabs are used. - * @param {!CodeMirror} instance CodeMirror instance + * @param {!CodeMirror} instance CodeMirror instance * @param {number} direction Direction of movement: 1 for forward, -1 for backward * @param {function} functionName name of the CodeMirror function to call * @return {boolean} true if key was handled @@ -201,7 +200,7 @@ define(function (require, exports, module) { return false; } - // If we are on the tab boundary, jump by the full amount, + // If we are on the tab boundary, jump by the full amount, // but not beyond the start of the line. if (jump === 0) { jump = indentUnit; @@ -271,9 +270,6 @@ define(function (require, exports, module) { function _handleKeyEvents(jqEvent, editor, event) { _checkElectricChars(jqEvent, editor, event); - - // Pass the key event to the code hint manager. It may call preventDefault() on the event. - CodeHintManager.handleKeyEvent(editor, event); } /** @@ -305,7 +301,7 @@ define(function (require, exports, module) { * * ALWAYS call destroy() when you are done with an Editor - otherwise it will leak a Document ref. * - * @param {!Document} document + * @param {!Document} document * @param {!boolean} makeMasterEditor If true, this Editor will set itself as the (secret) "master" * Editor for the Document. If false, this Editor will attach to the Document as a "slave"/ * secondary editor. @@ -492,7 +488,7 @@ define(function (require, exports, module) { }; - /** + /** * Selects all text and maintains the current scroll position. */ Editor.prototype.selectAllNoScroll = function () { @@ -599,7 +595,12 @@ define(function (require, exports, module) { // note: this change might have been a real edit made by the user, OR this might have // been a change synced from another editor - CodeHintManager.handleChange(this, changeList); + // The "editorChange" event is mostly for the use of the CodeHintManager. + // It differs from the normal "change" event, that it's actually publicly usable, + // whereas the "change" event should be listend to on the document. Also the + // Editor dispatches a change event before this event is dispatched, because + // CodeHintManager needs to hook in here when other things are already done. + $(this).triggerHandler("editorChange", [this, changeList]); }; /** @@ -650,7 +651,7 @@ define(function (require, exports, module) { /** - * Install event handlers on the CodeMirror instance, translating them into + * Install event handlers on the CodeMirror instance, translating them into * jQuery events on the Editor instance. */ Editor.prototype._installEditorListeners = function () { @@ -659,7 +660,7 @@ define(function (require, exports, module) { // onKeyEvent is an option in CodeMirror rather than an event--it's a // low-level hook for all keyboard events rather than a specific event. For // our purposes, though, it's convenient to treat it as an event internally, - // so we bridge it to jQuery events the same way we do ordinary CodeMirror + // so we bridge it to jQuery events the same way we do ordinary CodeMirror // events. this._codeMirror.setOption("onKeyEvent", function (instance, event) { $(self).triggerHandler("keyEvent", [self, event]); @@ -812,7 +813,7 @@ define(function (require, exports, module) { var $scrollerElement = $(this.getScrollerElement()); var editorHeight = $scrollerElement.height(); - // we need to make adjustments for the statusbar's padding on the bottom and the menu bar on top. + // we need to make adjustments for the statusbar's padding on the bottom and the menu bar on top. var statusBarHeight = $scrollerElement.outerHeight() - editorHeight; var menuBarHeight = $scrollerElement.offset().top; @@ -1242,7 +1243,7 @@ define(function (require, exports, module) { }; /** - * Sets the height of an inline widget in this editor. + * Sets the height of an inline widget in this editor. * @param {!InlineWidget} inlineWidget The widget whose height should be set. * @param {!number} height The height of the widget. * @param {boolean} ensureVisible Whether to scroll the entire widget into view. @@ -1304,7 +1305,7 @@ define(function (require, exports, module) { /** * @private * Get the starting line number for an inline widget. - * @param {!InlineWidget} inlineWidget + * @param {!InlineWidget} inlineWidget * @return {number} The line number of the widget or -1 if not found. */ Editor.prototype._getInlineWidgetLineNumber = function (inlineWidget) { @@ -1341,7 +1342,7 @@ define(function (require, exports, module) { */ Editor.prototype.refresh = function (handleResize) { // If focus is currently in a child of the CodeMirror editor (e.g. in an inline widget), but not in - // the CodeMirror input field itself, remember the focused item so we can restore focus after the + // the CodeMirror input field itself, remember the focused item so we can restore focus after the // refresh (which might cause the widget to be removed from the display list temporarily). var focusedItem = window.document.activeElement, restoreFocus = $.contains(this._codeMirror.getScrollerElement(), focusedItem); @@ -1407,7 +1408,7 @@ define(function (require, exports, module) { * A-B-A would return A as the mode, not null). * * @return {?(Object|string)} Name of syntax-highlighting mode, or object containing a "name" property - * naming the mode along with configuration options required by the mode. + * naming the mode along with configuration options required by the mode. * See {@link LanguageManager#getLanguageForPath()} and {@link Language#getMode()}. */ Editor.prototype.getModeForSelection = function () { diff --git a/test/SpecRunner.js b/test/SpecRunner.js index 212edeafee0..6bea79d90a7 100644 --- a/test/SpecRunner.js +++ b/test/SpecRunner.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ @@ -41,6 +41,7 @@ define(function (require, exports, module) { // Utility dependency var AppInit = require("utils/AppInit"), + CodeHintManager = require("editor/CodeHintManager"), Global = require("utils/Global"), SpecRunnerUtils = require("spec/SpecRunnerUtils"), ExtensionLoader = require("utils/ExtensionLoader"), @@ -167,7 +168,7 @@ define(function (require, exports, module) { /** * Listener for UnitTestReporter "runnerEnd" event. Attached only if * "resultsPath" URL parameter exists. Does not overwrite existing file. - * + * * @param {!$.Event} event * @param {!UnitTestReporter} reporter */ @@ -263,7 +264,7 @@ define(function (require, exports, module) { function init() { // Start up the node connection, which is held in the - // _nodeConnectionDeferred module variable. (Use + // _nodeConnectionDeferred module variable. (Use // _nodeConnectionDeferred.done() to access it. // This is in SpecRunner rather than SpecRunnerUtils because the hope From ad4ce2a2753b1ee350c22395fc811c1f2fe5ea7f Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Fri, 4 Oct 2013 15:56:25 +0200 Subject: [PATCH 0062/1140] Fix URL hints not showing --- src/extensions/default/UrlCodeHints/main.js | 83 ++++++++++----------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/src/extensions/default/UrlCodeHints/main.js b/src/extensions/default/UrlCodeHints/main.js index 9f00c7bab60..c5d9f58599f 100644 --- a/src/extensions/default/UrlCodeHints/main.js +++ b/src/extensions/default/UrlCodeHints/main.js @@ -1,16 +1,16 @@ /* * 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 @@ -201,7 +201,7 @@ define(function (require, exports, module) { /** * Helper function that determines the possible value hints for a given html tag/attribute name pair - * + * * @param {{queryStr: string}} query * The current query * @@ -320,45 +320,44 @@ define(function (require, exports, module) { tokenType; this.editor = editor; - if (implicitChar === null) { - tagInfo = HTMLUtils.getTagInfo(editor, editor.getCursorPos()); - query = null; - tokenType = tagInfo.position.tokenType; - - if (tokenType === HTMLUtils.ATTR_VALUE) { + + tagInfo = HTMLUtils.getTagInfo(editor, editor.getCursorPos()); + query = null; + tokenType = tagInfo.position.tokenType; + + if (tokenType === HTMLUtils.ATTR_VALUE) { - // Verify that attribute name has hintable values - if (htmlAttrs[tagInfo.attr.name]) { + // Verify that attribute name has hintable values + if (htmlAttrs[tagInfo.attr.name]) { - if (tagInfo.position.offset >= 0) { - query = tagInfo.attr.value.slice(0, tagInfo.position.offset); - } else { - // We get negative offset for a quoted attribute value with some leading whitespaces - // as in = 0) { + query = tagInfo.attr.value.slice(0, tagInfo.position.offset); + } else { + // We get negative offset for a quoted attribute value with some leading whitespaces + // as in = pos1 - * + * * Note that this function is designed to work on CSSUtils info.values array, * so this could be made a method if that is converted to an object. * @@ -555,7 +554,7 @@ define(function (require, exports, module) { /** * Finds next position in array of specified char. - * + * * Note that this function is designed to work on CSSUtils info.values array, * so this could be made a method if that is converted to an object. * From 82123f6d0fc3954afdddddb6d2d0b5c16da57f60 Mon Sep 17 00:00:00 2001 From: Peter Thiess Date: Fri, 4 Oct 2013 13:25:10 -0700 Subject: [PATCH 0063/1140] Updating NOTICE file. --- NOTICE | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/NOTICE b/NOTICE index a28c4c8bab4..606a786e177 100644 --- a/NOTICE +++ b/NOTICE @@ -2426,3 +2426,69 @@ Peter Zotov , Public Domain Notice (murmurhash3-js) The MurmurHash3 algorithm was created by Austin Appleby. This JavaScript port was authored * by Peter Zotov (based on Java port by Yonik Seeley) and is placed into the public domain. * The author hereby disclaims copyright to this source code. + + +node-methods is authored by TJ Holowaychuck under the terms of the MIT license. + +Felix Geisendörfer +Copyright (C) 2011 Felix Geisendörfer + +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. + +Andrew Kelley +Copyright (c) 2013 Andrew Kelley + +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. + +Marco Aurelio +Copyright (c) 2013 Marco Aurelio + +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. From c987753330da06be59dcd12e14c002062634a2ce Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 5 Oct 2013 00:53:20 +0200 Subject: [PATCH 0064/1140] Fix for adobe/brackets#5426 --- src/extensions/default/QuickView/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/QuickView/main.js b/src/extensions/default/QuickView/main.js index 3c1fcd48766..084db2c7c92 100644 --- a/src/extensions/default/QuickView/main.js +++ b/src/extensions/default/QuickView/main.js @@ -597,7 +597,7 @@ define(function (require, exports, module) { // Is there already a popover provider and range? if (popoverState) { if (popoverState.start && popoverState.end && - editor.posWithinRange(pos, popoverState.start, popoverState.end)) { + editor.posWithinRange(pos, popoverState.start, popoverState.end, 1)) { // That one's still relevant - nothing more to do return; } else { From 70c1723289e2cf1ca8daef48876f4ffd1952394b Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Sat, 5 Oct 2013 09:14:33 +0200 Subject: [PATCH 0065/1140] Remove preferences migration code --- src/LiveDevelopment/main.js | 32 +++++----- src/brackets.js | 2 - src/document/DocumentManager.js | 48 ++++++++------- src/editor/Editor.js | 58 +++++++++---------- src/extensions/default/RecentProjects/main.js | 26 ++++----- src/preferences/PreferencesManager.js | 50 +++++----------- src/project/ProjectManager.js | 52 ++++++++--------- src/project/WorkingSetSort.js | 26 ++++----- src/utils/Resizer.js | 44 +++++++------- src/utils/UpdateNotification.js | 46 +++++++-------- 10 files changed, 171 insertions(+), 213 deletions(-) diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index 96b68c1fba3..318f8e7bf0e 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -142,7 +142,7 @@ define(function main(require, exports, module) { /** Called on status change */ function _showStatusChangeReason(reason) { - // Destroy the previous twipsy (options are not updated otherwise) + // Destroy the previous twipsy (options are not updated otherwise) _$btnGoLive.twipsy("hide").removeData("twipsy"); // If there was no reason or the action was an explicit request by the user, don't show a twipsy @@ -178,7 +178,7 @@ define(function main(require, exports, module) { }); $(LiveDevelopment).on("statusChange", function statusChange(event, status, reason) { // status starts at -1 (error), so add one when looking up name and style - // See the comments at the top of LiveDevelopment.js for details on the + // See the comments at the top of LiveDevelopment.js for details on the // various status codes. _setLabel(_$btnGoLive, null, _statusStyle[status + 1], _statusTooltip[status + 1]); _showStatusChangeReason(reason); @@ -195,7 +195,7 @@ define(function main(require, exports, module) { function _setupGoLiveMenu() { $(LiveDevelopment).on("statusChange", function statusChange(event, status) { // Update the checkmark next to 'Live Preview' menu item - // Add checkmark when status is STATUS_ACTIVE; otherwise remove it + // Add checkmark when status is STATUS_ACTIVE; otherwise remove it CommandManager.get(Commands.FILE_LIVE_FILE_PREVIEW).setChecked(status === LiveDevelopment.STATUS_ACTIVE); CommandManager.get(Commands.FILE_LIVE_HIGHLIGHT).setEnabled(status === LiveDevelopment.STATUS_ACTIVE); }); @@ -257,8 +257,6 @@ define(function main(require, exports, module) { // init prefs prefs = PreferencesManager.getPreferenceStorage(module, {highlight: true}); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(prefs, "com.adobe.brackets.live-development"); config.highlight = prefs.getValue("highlight"); diff --git a/src/brackets.js b/src/brackets.js index cde040b4184..16fa64ce559 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -216,8 +216,6 @@ define(function (require, exports, module) { // an old version that might not have set the "afterFirstLaunch" pref.) var prefs = PreferencesManager.getPreferenceStorage(module), deferred = new $.Deferred(); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(prefs, "com.adobe.brackets.startup"); if (!params.get("skipSampleProjectLoad") && !prefs.getValue("afterFirstLaunch")) { prefs.setValue("afterFirstLaunch", "true"); diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 867dd54de04..da9853e387a 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -28,7 +28,7 @@ /** * DocumentManager maintains a list of currently 'open' Documents. It also owns the list of files in * the working set, and the notion of which Document is currently shown in the main editor UI area. - * + * * Document is the model for a file's contents; it dispatches events whenever those contents change. * To transiently inspect a file's content, simply get a Document and call getText() on it. However, * to be notified of Document changes or to modify a Document, you MUST call addRef() to ensure the @@ -36,7 +36,7 @@ * Documents are all Documents that are 'kept alive', i.e. have ref count > 0). * * To get a Document, call getDocumentForPath(); never new up a Document yourself. - * + * * Secretly, a Document may use an Editor instance to act as the model for its internal state. (This * is unavoidable because CodeMirror does not separate its model from its UI). Documents are not * modifiable until they have a backing 'master Editor'. Creation of the backing Editor is owned by @@ -54,7 +54,7 @@ * * - dirtyFlagChange -- When any Document's isDirty flag changes. The 2nd arg to the listener is the * Document whose flag changed. - * - documentSaved -- When a Document's changes have been saved. The 2nd arg to the listener is the + * - documentSaved -- When a Document's changes have been saved. The 2nd arg to the listener is the * Document that has been saved. * - documentRefreshed -- When a Document's contents have been reloaded from disk. The 2nd arg to the * listener is the Document that has been refreshed. @@ -72,7 +72,7 @@ * The 2nd arg to the listener is the array of removed FileEntry objects. * - workingSetSort -- When the workingSet array is reordered without additions or removals. * Listener receives no arguments. - * + * * - workingSetDisableAutoSorting -- Dispatched in addition to workingSetSort when the reorder was caused * by manual dragging and dropping. Listener receives no arguments. * @@ -82,7 +82,7 @@ * * These are jQuery events, so to listen for them you do something like this: * $(DocumentManager).on("eventname", handler); - * + * * Document objects themselves also dispatch some events - see Document docs for details. */ define(function (require, exports, module) { @@ -182,7 +182,7 @@ define(function (require, exports, module) { return _workingSet.slice(0); } - /** + /** * Returns the index of the file matching fullPath in the working set. * Returns -1 if not found. * @param {!string} fullPath @@ -198,7 +198,7 @@ define(function (require, exports, module) { }); } - /** + /** * Returns the index of the file matching fullPath in _workingSetAddedOrder. * Returns -1 if not found. * @param {!string} fullPath @@ -465,7 +465,7 @@ define(function (require, exports, module) { * Changes currentDocument to the given Document, firing currentDocumentChange, which in turn * causes this Document's main editor UI to be shown in the editor pane, updates the selection * in the file tree / working set UI, etc. This call may also add the item to the working set. - * + * * @param {!Document} document The Document to make current. May or may not already be in the * working set. */ @@ -543,7 +543,7 @@ define(function (require, exports, module) { .fail(function () { // File chosen to be switched to could not be opened, and the original file // is still in editor. Close it again so code will try to open the next file, - // or empty the editor if there are no other files. + // or empty the editor if there are no other files. closeFullEditor(file); }); } else { @@ -817,7 +817,7 @@ define(function (require, exports, module) { * @param {boolean} isFolder True if path is a folder; False if it is a file. */ function notifyPathNameChanged(oldName, newName, isFolder) { - // Update open documents. This will update _currentDocument too, since + // Update open documents. This will update _currentDocument too, since // the current document is always open. var keysToDelete = []; CollectionUtils.forEach(_openDocuments, function (doc, path) { @@ -849,7 +849,7 @@ define(function (require, exports, module) { } /** - * Called after a file or folder has been deleted. This function is responsible + * Called after a file or folder has been deleted. This function is responsible * for updating underlying model data and notifying all views of the change. * * @param {string} path The path of the file/folder that has been deleted @@ -953,8 +953,6 @@ define(function (require, exports, module) { // Setup preferences _prefs = PreferencesManager.getPreferenceStorage(module); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(_prefs, "com.adobe.brackets.DocumentManager"); // Performance measurements PerfUtils.createPerfMeasurement("DOCUMENT_MANAGER_GET_DOCUMENT_FOR_PATH", "DocumentManager.getDocumentForPath()"); diff --git a/src/editor/Editor.js b/src/editor/Editor.js index 2f48ee98403..15c97832078 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -38,7 +38,7 @@ * * For now, direct access to the underlying CodeMirror object is still possible via _codeMirror -- * but this is considered deprecated and may go away. - * + * * The Editor object dispatches the following events: * - keyEvent -- When any key event happens in the editor (whether it changes the text or not). * Event handlers are passed ({Editor}, {KeyboardEvent}). The 2nd arg is the raw DOM event. @@ -82,8 +82,6 @@ define(function (require, exports, module) { /** Editor preferences */ var _prefs = PreferencesManager.getPreferenceStorage(module, defaultPrefs); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(_prefs, "com.adobe.brackets.Editor"); /** @type {boolean} Global setting: When inserting new text, use tab characters? (instead of spaces) */ var _useTabChar = _prefs.getValue("useTabChar"); @@ -120,13 +118,13 @@ define(function (require, exports, module) { */ function _handleTabKey(instance) { // Tab key handling is done as follows: - // 1. If the selection is before any text and the indentation is to the left of + // 1. If the selection is before any text and the indentation is to the left of // the proper indentation then indent it to the proper place. Otherwise, - // add another tab. In either case, move the insertion point to the + // add another tab. In either case, move the insertion point to the // beginning of the text. // 2. If the selection is multi-line, indent all the lines. - // 3. If the selection is after the first non-space character, and is an - // insertion point, insert a tab character or the appropriate number + // 3. If the selection is after the first non-space character, and is an + // insertion point, insert a tab character or the appropriate number // of spaces to pad to the nearest tab boundary. var from = instance.getCursor(true), to = instance.getCursor(false), @@ -171,7 +169,7 @@ define(function (require, exports, module) { /** * @private * Handle left arrow, right arrow, backspace and delete keys when soft tabs are used. - * @param {!CodeMirror} instance CodeMirror instance + * @param {!CodeMirror} instance CodeMirror instance * @param {number} direction Direction of movement: 1 for forward, -1 for backward * @param {function} functionName name of the CodeMirror function to call * @return {boolean} true if key was handled @@ -201,7 +199,7 @@ define(function (require, exports, module) { return false; } - // If we are on the tab boundary, jump by the full amount, + // If we are on the tab boundary, jump by the full amount, // but not beyond the start of the line. if (jump === 0) { jump = indentUnit; @@ -305,7 +303,7 @@ define(function (require, exports, module) { * * ALWAYS call destroy() when you are done with an Editor - otherwise it will leak a Document ref. * - * @param {!Document} document + * @param {!Document} document * @param {!boolean} makeMasterEditor If true, this Editor will set itself as the (secret) "master" * Editor for the Document. If false, this Editor will attach to the Document as a "slave"/ * secondary editor. @@ -492,7 +490,7 @@ define(function (require, exports, module) { }; - /** + /** * Selects all text and maintains the current scroll position. */ Editor.prototype.selectAllNoScroll = function () { @@ -650,7 +648,7 @@ define(function (require, exports, module) { /** - * Install event handlers on the CodeMirror instance, translating them into + * Install event handlers on the CodeMirror instance, translating them into * jQuery events on the Editor instance. */ Editor.prototype._installEditorListeners = function () { @@ -659,7 +657,7 @@ define(function (require, exports, module) { // onKeyEvent is an option in CodeMirror rather than an event--it's a // low-level hook for all keyboard events rather than a specific event. For // our purposes, though, it's convenient to treat it as an event internally, - // so we bridge it to jQuery events the same way we do ordinary CodeMirror + // so we bridge it to jQuery events the same way we do ordinary CodeMirror // events. this._codeMirror.setOption("onKeyEvent", function (instance, event) { $(self).triggerHandler("keyEvent", [self, event]); @@ -812,7 +810,7 @@ define(function (require, exports, module) { var $scrollerElement = $(this.getScrollerElement()); var editorHeight = $scrollerElement.height(); - // we need to make adjustments for the statusbar's padding on the bottom and the menu bar on top. + // we need to make adjustments for the statusbar's padding on the bottom and the menu bar on top. var statusBarHeight = $scrollerElement.outerHeight() - editorHeight; var menuBarHeight = $scrollerElement.offset().top; @@ -1242,7 +1240,7 @@ define(function (require, exports, module) { }; /** - * Sets the height of an inline widget in this editor. + * Sets the height of an inline widget in this editor. * @param {!InlineWidget} inlineWidget The widget whose height should be set. * @param {!number} height The height of the widget. * @param {boolean} ensureVisible Whether to scroll the entire widget into view. @@ -1304,7 +1302,7 @@ define(function (require, exports, module) { /** * @private * Get the starting line number for an inline widget. - * @param {!InlineWidget} inlineWidget + * @param {!InlineWidget} inlineWidget * @return {number} The line number of the widget or -1 if not found. */ Editor.prototype._getInlineWidgetLineNumber = function (inlineWidget) { @@ -1341,7 +1339,7 @@ define(function (require, exports, module) { */ Editor.prototype.refresh = function (handleResize) { // If focus is currently in a child of the CodeMirror editor (e.g. in an inline widget), but not in - // the CodeMirror input field itself, remember the focused item so we can restore focus after the + // the CodeMirror input field itself, remember the focused item so we can restore focus after the // refresh (which might cause the widget to be removed from the display list temporarily). var focusedItem = window.document.activeElement, restoreFocus = $.contains(this._codeMirror.getScrollerElement(), focusedItem); @@ -1407,7 +1405,7 @@ define(function (require, exports, module) { * A-B-A would return A as the mode, not null). * * @return {?(Object|string)} Name of syntax-highlighting mode, or object containing a "name" property - * naming the mode along with configuration options required by the mode. + * naming the mode along with configuration options required by the mode. * See {@link LanguageManager#getLanguageForPath()} and {@link Language#getMode()}. */ Editor.prototype.getModeForSelection = function () { diff --git a/src/extensions/default/RecentProjects/main.js b/src/extensions/default/RecentProjects/main.js index 654cfad26e0..97f11640fca 100644 --- a/src/extensions/default/RecentProjects/main.js +++ b/src/extensions/default/RecentProjects/main.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */ @@ -48,8 +48,6 @@ define(function (require, exports, module) { var KeyboardPrefs = JSON.parse(require("text!keyboard.json")); var prefs = PreferencesManager.getPreferenceStorage(module); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(prefs, "com.adobe.brackets.brackets-recent-projects"); /** @const {string} Recent Projects commands ID */ var TOGGLE_DROPDOWN = "recentProjects.toggle"; diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index edf3f1f4cee..a8624bbe900 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -107,7 +107,7 @@ define(function (require, exports, module) { * Retreive the preferences data for the given clientID. * @param {string|{id: string, uri: string}} clientID - A unique identifier or a requireJS module object * @param {string} defaults - Default preferences stored as JSON - * @return {PreferenceStorage} + * @return {PreferenceStorage} */ function getPreferenceStorage(clientID, defaults) { if (!clientID || (typeof clientID === "object" && (!clientID.id || !clientID.uri))) { @@ -172,29 +172,6 @@ define(function (require, exports, module) { _reset(); } } - - /** - * This method handles the copy of all old prefs to the new prefs - * TODO: remove All calls to this function and the function itself - * - * @param {!PreferenceStorage} newPrefs The new PreferenceStorage - * @param {!string} oldID The id of the old PreferenceStorage - */ - function handleClientIdChange(newPrefs, oldID) { - if (prefStorage[oldID]) { - var oldPrefs = getPreferenceStorage(oldID); - - if (!newPrefs.getValue("newClientID")) { - var data = oldPrefs.getAllValues(); - - if (!$.isEmptyObject(data)) { - newPrefs.setAllValues(data, true); - } - newPrefs.setValue("newClientID", true); - } - delete prefStorage[oldID]; - } - } // Check localStorage for a preferencesKey. Production and unit test keys // are used to keep preferences separate within the same storage implementation. @@ -215,7 +192,6 @@ define(function (require, exports, module) { // Public API exports.getPreferenceStorage = getPreferenceStorage; exports.savePreferences = savePreferences; - exports.handleClientIdChange = handleClientIdChange; exports.getClientID = getClientID; // Unit test use only diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index c5ea86057e5..abc5c36971b 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ @@ -33,7 +33,7 @@ * - beforeProjectClose -- before _projectRoot changes * - beforeAppClose -- before Brackets quits entirely * - projectOpen -- after _projectRoot changes and the tree is re-rendered - * - projectRefresh -- when project tree is re-rendered for a reason other than + * - projectRefresh -- when project tree is re-rendered for a reason other than * a project being opened (e.g. from the Refresh command) * - projectFilesChange -- sent if one of the project files has changed-- * added, removed, renamed, etc. @@ -162,7 +162,7 @@ define(function (require, exports, module) { /** * @private * RegEx to validate if a filename is not allowed even if the system allows it. - * This is done to prevent cross-platform issues. + * This is done to prevent cross-platform issues. */ var _illegalFilenamesRegEx = /^(\.+|com[1-9]|lpt[1-9]|nul|con|prn|aux)$/i; @@ -476,8 +476,8 @@ define(function (require, exports, module) { var result = new $.Deferred(); // For #1542, make sure the tree is scrolled to the top before refreshing. - // If we try to do this later (e.g. after the tree has been refreshed), it - // doesn't seem to work properly. + // If we try to do this later (e.g. after the tree has been refreshed), it + // doesn't seem to work properly. $projectTreeContainer.scrollTop(0); // Instantiate tree widget @@ -739,7 +739,7 @@ define(function (require, exports, module) { .addClass(classToAdd); // This is a workaround for a part of issue #2085, where the file creation process - // depends on the open_node.jstree event being triggered, which doesn't happen on + // depends on the open_node.jstree event being triggered, which doesn't happen on // empty folders if (!wasNodeOpen) { treeNode.trigger("open_node.jstree"); @@ -835,7 +835,7 @@ define(function (require, exports, module) { /** * Initial project path is stored in prefs, which defaults to the welcome project on - * first launch. + * first launch. */ function getInitialProjectPath() { return updateWelcomeProjectPath(_prefs.getValue("projectPath")); @@ -845,7 +845,7 @@ define(function (require, exports, module) { * Loads the given folder as a project. Normally, you would call openProject() instead to let the * user choose a folder. * - * @param {string} rootPath Absolute path to the root folder of the project. + * @param {string} rootPath Absolute path to the root folder of the project. * If rootPath is undefined or null, the last open project will be restored. * @param {boolean=} isUpdating If true, indicates we're just updating the tree; * if false, a different project is being loaded. @@ -899,7 +899,7 @@ define(function (require, exports, module) { _projectRoot = rootEntry; _projectBaseUrl = _prefs.getValue(_getBaseUrlKey()) || ""; - // If this is the current welcome project, record it. In future launches, we always + // If this is the current welcome project, record it. In future launches, we always // want to substitute the welcome project for the current build instead of using an // outdated one (when loading recent projects or the last opened project). if (canonPath === _getWelcomeProjectPath()) { @@ -944,7 +944,7 @@ define(function (require, exports, module) { error.name ) ).done(function () { - // The project folder stored in preference doesn't exist, so load the default + // The project folder stored in preference doesn't exist, so load the default // project directory. // TODO (issue #267): When Brackets supports having no project directory // defined this code will need to change @@ -965,7 +965,7 @@ define(function (require, exports, module) { /** * Finds the tree node corresponding to the given file/folder (rejected if the path lies * outside the project, or if it doesn't exist). - * + * * @param {!Entry} entry FileEntry or DirectoryEntry to find * @return {$.Promise} Resolved with jQ obj for the jsTree tree node; or rejected if not found */ @@ -1050,7 +1050,7 @@ define(function (require, exports, module) { /** * Expands tree nodes to show the given file or folder and selects it. Silently no-ops if the * path lies outside the project, or if it doesn't exist. - * + * * @param {!Entry} entry FileEntry or DirectoryEntry to show * @return {$.Promise} Resolved when done; or rejected if not found */ @@ -1067,7 +1067,7 @@ define(function (require, exports, module) { * Open a new project. Currently, Brackets must always have a project open, so * this method handles both closing the current project and opening a new project. * - * @param {string=} path Optional absolute path to the root folder of the project. + * @param {string=} path Optional absolute path to the root folder of the project. * If path is undefined or null, displays a dialog where the user can choose a * folder to load. If the user cancels the dialog, nothing more happens. * @return {$.Promise} A promise object that will be resolved when the @@ -1500,7 +1500,7 @@ define(function (require, exports, module) { _findTreeNode(entry).done(function ($node) { _projectTree.one("delete_node.jstree", function () { // When a node is deleted, the previous node is automatically selected. - // This works fine as long as the previous node is a file, but doesn't + // This works fine as long as the previous node is a file, but doesn't // work so well if the node is a folder var sel = _projectTree.jstree("get_selected"), entry = sel ? sel.data("entry") : null; @@ -1570,8 +1570,6 @@ define(function (require, exports, module) { projectPath: _getWelcomeProjectPath() /* initialize to welcome project */ }; _prefs = PreferencesManager.getPreferenceStorage(module, defaults); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(_prefs, "com.adobe.brackets.ProjectManager"); // Event Handlers $(FileViewController).on("documentSelectionFocusChange", _documentSelectionFocusChange); diff --git a/src/project/WorkingSetSort.js b/src/project/WorkingSetSort.js index a38f5ed1dd3..d33430b6309 100644 --- a/src/project/WorkingSetSort.js +++ b/src/project/WorkingSetSort.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -323,8 +323,6 @@ define(function (require, exports, module) { // Initialize PreferenceStorage _prefs = PreferencesManager.getPreferenceStorage(module, defaultPrefs); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(_prefs, "com.adobe.brackets.WorkingSetSort"); // Initialize items dependent on extensions/workingSet AppInit.appReady(function () { diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index c97f7d38748..3450b8024ba 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ @@ -27,10 +27,10 @@ /** * Resizer is a Module utility to inject resizing capabilities to any element * inside Brackets. - * - * On initialization, Resizer discovers all nodes tagged as "vert-resizable" - * and "horz-resizable" to add the resizer handler. Additionally, "top-resizer", - * "bottom-resizer", "left-resizer" and "right-resizer" classes control the + * + * On initialization, Resizer discovers all nodes tagged as "vert-resizable" + * and "horz-resizable" to add the resizer handler. Additionally, "top-resizer", + * "bottom-resizer", "left-resizer" and "right-resizer" classes control the * position of the resizer on the element. * * An element can be made resizable at any time using the `makeResizable()` API. @@ -38,7 +38,7 @@ * again in a subsequent launch. * * The resizable elements trigger a panelResizeStart, panelResizeUpdate and panelResizeEnd - * event that can be used to create performance optimizations (such as hiding/showing elements + * event that can be used to create performance optimizations (such as hiding/showing elements * while resizing), custom layout logic, etc. See makeResizable() for details on the events. * * A resizable element can be collapsed/expanded using the `show`, `hide` and `toggle` APIs or @@ -242,8 +242,8 @@ define(function (require, exports, module) { _prefs.setValue(elementID, elementPrefs); }); - // If the resizer is positioned right or bottom of the panel, we need to listen to - // reposition it if the element size changes externally + // If the resizer is positioned right or bottom of the panel, we need to listen to + // reposition it if the element size changes externally function repositionResizer(elementSize) { var resizerPosition = elementSize || 1; if (position === POSITION_RIGHT || position === POSITION_BOTTOM) { @@ -274,7 +274,7 @@ define(function (require, exports, module) { } function doRedraw() { - // only run this if the mouse is down so we don't constantly loop even + // only run this if the mouse is down so we don't constantly loop even // after we're done resizing. if (!isMouseDown) { return; @@ -295,7 +295,7 @@ define(function (require, exports, module) { $element.trigger("panelResizeStart", newSize); } - // Resize the main element to the new size. If there is a content element, + // Resize the main element to the new size. If there is a content element, // its size is the new size minus the size of the non-resizable elements resizeElement(newSize, (newSize - baseSize)); adjustSibling(newSize); @@ -406,8 +406,6 @@ define(function (require, exports, module) { // Init PreferenceStorage _prefs = PreferencesManager.getPreferenceStorage(module); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(_prefs, module.id); // Scan DOM for horz-resizable and vert-resizable classes and make them resizable AppInit.htmlReady(function () { diff --git a/src/utils/UpdateNotification.js b/src/utils/UpdateNotification.js index f6fbe80fbe0..be4e7c18d90 100644 --- a/src/utils/UpdateNotification.js +++ b/src/utils/UpdateNotification.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */ @@ -49,8 +49,6 @@ define(function (require, exports, module) { // PreferenceStorage var _prefs = PreferencesManager.getPreferenceStorage(module, defaultPrefs); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(_prefs, module.id); // This is the last version we notified the user about. If checkForUpdate() // is called with "false", only show the update notification dialog if there @@ -60,13 +58,13 @@ define(function (require, exports, module) { // Last time the versionInfoURL was fetched var _lastInfoURLFetchTime = _prefs.getValue("lastInfoURLFetchTime"); - // URL to load version info from. By default this is loaded no more than once a day. If + // 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. // URL to fetch the version information. var _versionInfoURL; - // Information on all posted builds of Brackets. This is an Array, where each element is + // Information on all posted builds of Brackets. This is an Array, where each element is // an Object with the following fields: // // {Number} buildNumber Number of the build @@ -91,7 +89,7 @@ define(function (require, exports, module) { * * If force is true, the information is always fetched from _versionInfoURL. * If force is false, we try to use cached information. If more than - * 24 hours have passed since the last fetch, or if cached data can't be found, + * 24 hours have passed since the last fetch, or if cached data can't be found, * the data is fetched again. * * If new data is fetched and dontCache is false, the data is saved in preferences @@ -140,7 +138,7 @@ define(function (require, exports, module) { } }, error: function (jqXHR, status, error) { - // When loading data for unit tests, the error handler is + // When loading data for unit tests, the error handler is // called but the responseText is valid. Try to use it here, // but *don't* save the results in prefs. @@ -191,7 +189,7 @@ define(function (require, exports, module) { } /** - * Show a dialog that shows the update + * Show a dialog that shows the update */ function _showUpdateNotificationDialog(updates) { Dialogs.showModalDialogUsingTemplate(Mustache.render(UpdateDialogTemplate, Strings)) @@ -211,10 +209,10 @@ define(function (require, exports, module) { } /** - * Check for updates. If "force" is true, update notification dialogs are always displayed - * (if an update is available). If "force" is false, the update notification is only + * Check for updates. If "force" is true, update notification dialogs are always displayed + * (if an update is available). If "force" is false, the update notification is only * displayed for newly available updates. - * + * * If an update is available, show the "update available" notification icon in the title bar. * * @param {boolean} force If true, always show the notification dialog. @@ -257,7 +255,7 @@ define(function (require, exports, module) { // Get all available updates var allUpdates = _stripOldVersionInfo(versionInfo, _buildNumber); - // When running directly from GitHub source (as opposed to + // When running directly from GitHub source (as opposed to // an installed build), _buildNumber is 0. In this case, if the // test is not forced, don't show the update notification icon or // dialog. @@ -278,7 +276,7 @@ define(function (require, exports, module) { }); } - // Only show the update dialog if force = true, or if the user hasn't been + // Only show the update dialog if force = true, or if the user hasn't been // alerted of this update if (force || allUpdates[0].buildNumber > _lastNotifiedBuildNumber) { _showUpdateNotificationDialog(allUpdates); From b1ad00c09b322ebb0019a7fea64c55a7dce9bdf9 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Sat, 5 Oct 2013 07:31:33 -0700 Subject: [PATCH 0066/1140] Convert file system to use callbacks instead of promises. --- src/brackets.js | 10 +- src/document/Document.js | 10 +- src/document/DocumentCommandHandlers.js | 27 +-- src/document/DocumentManager.js | 10 +- src/extensions/default/DebugCommands/main.js | 17 +- .../JavaScriptCodeHints/ScopeManager.js | 10 +- src/extensions/default/UrlCodeHints/main.js | 7 +- src/file/FileUtils.js | 24 +- src/filesystem/Directory.js | 21 +- src/filesystem/File.js | 41 ++-- src/filesystem/FileSystem.js | 153 +++++-------- src/filesystem/FileSystemEntry.js | 88 ++------ src/filesystem/InMemoryFile.js | 43 ++-- src/language/JSUtils.js | 10 +- src/project/FileSyncManager.js | 10 +- src/project/ProjectManager.js | 210 +++++++++--------- src/search/FindInFiles.js | 10 +- src/utils/ExtensionLoader.js | 20 +- test/SpecRunner.js | 10 +- test/spec/ExtensionInstallation-test.js | 30 +-- test/spec/ProjectManager-test.js | 92 ++++---- test/spec/SpecRunnerUtils.js | 99 +++++---- 22 files changed, 450 insertions(+), 502 deletions(-) diff --git a/src/brackets.js b/src/brackets.js index c85ad1473dd..6ae6e372d8a 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -220,14 +220,14 @@ define(function (require, exports, module) { if (!params.get("skipSampleProjectLoad") && !prefs.getValue("afterFirstLaunch")) { prefs.setValue("afterFirstLaunch", "true"); if (ProjectManager.isWelcomeProjectPath(initialProjectPath)) { - brackets.appFileSystem.resolve(initialProjectPath + "/index.html") - .done(function (file) { + brackets.appFileSystem.resolve(initialProjectPath + "/index.html", function (err, file) { + if (!err) { var promise = CommandManager.execute(Commands.FILE_ADD_TO_WORKING_SET, { fullPath: file.fullPath }); promise.then(deferred.resolve, deferred.reject); - }) - .fail(function () { + } else { deferred.reject(); - }); + } + }); } else { deferred.resolve(); } diff --git a/src/document/Document.js b/src/document/Document.js index cda5f6e11b3..79525f2d914 100644 --- a/src/document/Document.js +++ b/src/document/Document.js @@ -415,15 +415,15 @@ define(function (require, exports, module) { // TODO: (issue #295) fetching timestamp async creates race conditions (albeit unlikely ones) var thisDoc = this; - this.file.stat() - .done(function (stat) { + this.file.stat(function (err, stat) { + if (!err) { thisDoc.diskTimestamp = stat.mtime; $(exports).triggerHandler("_documentSaved", thisDoc); - }) - .fail(function (err) { + } else { console.log("Error updating timestamp after saving file: " + thisDoc.file.fullPath); $(exports).triggerHandler("_documentSaved", thisDoc); - }); + } + }); }; /* (pretty toString(), to aid debugging) */ diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index b624c5fd0c8..63244573938 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -236,8 +236,8 @@ define(function (require, exports, module) { _defaultOpenDialogFullPath = ProjectManager.getProjectRoot().fullPath; } // Prompt the user with a dialog - fileSystem.showOpenDialog(true, false, Strings.OPEN_FILE, _defaultOpenDialogFullPath, null) - .done(function (paths) { + fileSystem.showOpenDialog(true, false, Strings.OPEN_FILE, _defaultOpenDialogFullPath, null, function (err, paths) { + if (!err) { if (paths.length > 0) { // Add all files to the working set without verifying that // they still exist on disk (for faster opening) @@ -259,7 +259,8 @@ define(function (require, exports, module) { // Reject if the user canceled the dialog result.reject(); } - }); + } + }); } else { result = doOpen(fullPath, silent); } @@ -497,14 +498,14 @@ define(function (require, exports, module) { var file = docToSave.file; var writeError = false; - file.write(docToSave.getText(true)) - .done(function () { + file.write(docToSave.getText(true), function (err) { + if (!err) { docToSave.notifySaved(); result.resolve(); - }) - .fail(function (err) { + } else { handleError(err, file); - }); + } + }); } else { result.resolve(fileEntry); } @@ -648,13 +649,13 @@ define(function (require, exports, module) { saveAsDefaultPath = FileUtils.getDirectoryPath(origPath); } defaultName = FileUtils.getBaseName(origPath); - fileSystem.showSaveDialog(Strings.SAVE_FILE_AS, saveAsDefaultPath, defaultName) - .done(function (selection) { + fileSystem.showSaveDialog(Strings.SAVE_FILE_AS, saveAsDefaultPath, defaultName, function (err, selection) { + if (!err) { _doSaveAfterSaveDialog(selection); - }) - .fail(function (err) { + } else { result.reject(err); - }); + } + }); } else { result.reject(); } diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 8f360c55fbd..90f17671d16 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -615,8 +615,8 @@ define(function (require, exports, module) { return promise; } - fileSystem.pathExists(fullPath) - .done(function () { + fileSystem.pathExists(fullPath, function (exists) { + if (exists) { // log this document's Promise as pending getDocumentForPath._pendingDocumentPromises[fullPath] = promise; @@ -646,10 +646,10 @@ define(function (require, exports, module) { .fail(function (fileError) { result.reject(fileError); }); - }) - .fail(function () { + } else { result.reject(); // TODO: FileSystem error not found - }); + } + }); return promise; } diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index a43c8b45fe6..9a2ed939a8c 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -140,8 +140,8 @@ define(function (require, exports, module) { function _handleSwitchLanguage() { var stringsPath = FileUtils.getNativeBracketsDirectoryPath() + "/nls"; - brackets.appFileSystem.getDirectoryContents(brackets.appFileSystem.getDirectoryForPath(stringsPath)) - .done(function (contents) { + brackets.appFileSystem.getDirectoryContents(brackets.appFileSystem.getDirectoryForPath(stringsPath), function (err, contents) { + if (!err) { var $dialog, $submit, $select, @@ -149,19 +149,19 @@ define(function (require, exports, module) { curLocale = (brackets.isLocaleDefault() ? null : brackets.getLocale()), languages = []; - function setLanguage(event) { + var setLanguage = function (event) { locale = $select.val(); $submit.prop("disabled", locale === (curLocale || "")); - } + }; // returns the localized label for the given locale // or the locale, if nothing found - function getLocalizedLabel(locale) { + var getLocalizedLabel = function (locale) { var key = "LOCALE_" + locale.toUpperCase().replace("-", "_"), i18n = Strings[key]; return i18n === undefined ? locale : i18n; - } + }; // add system default languages.push({label: Strings.LANGUAGE_SYSTEM_DEFAULT, language: null}); @@ -200,7 +200,8 @@ define(function (require, exports, module) { $select = $dialog.find("select"); $select.on("change", setLanguage).val(curLocale); - }); + } + }); } function _enableRunTestsMenuItem() { @@ -213,7 +214,7 @@ define(function (require, exports, module) { FileUtils.getNativeBracketsDirectoryPath() + "/../test/SpecRunner.html" ); - file.exists().done(function (exists) { + file.exists(function (exists) { if (exists) { CommandManager.get(DEBUG_RUN_UNIT_TESTS).setEnabled(true); } diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js index e4f9cce0873..9cc9589c99a 100644 --- a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js +++ b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js @@ -179,8 +179,8 @@ define(function (require, exports, module) { directory = fileSystem.getDirectoryForPath(dir), files = []; - fileSystem.getDirectoryContents(directory) - .done(function (contents) { + fileSystem.getDirectoryContents(directory, function (err, contents) { + if (!err) { contents.slice(0, preferences.getMaxFileCount()).forEach(function (entry) { var path = entry.fullPath, split = HintUtils.splitPath(path), @@ -202,13 +202,13 @@ define(function (require, exports, module) { } }); doneCallback(); - }) - .fail(function (err) { + } else { if (errorCallback) { errorCallback(err); } console.log("Unable to refresh directory: ", err); - }); + } + }); } /** diff --git a/src/extensions/default/UrlCodeHints/main.js b/src/extensions/default/UrlCodeHints/main.js index d68044fe9ac..9861e83a34b 100644 --- a/src/extensions/default/UrlCodeHints/main.js +++ b/src/extensions/default/UrlCodeHints/main.js @@ -132,8 +132,8 @@ define(function (require, exports, module) { self.cachedHints.deferred = $.Deferred(); self.cachedHints.unfiltered = []; - fileSystem.getDirectoryContents(directory) - .done(function (contents) { + fileSystem.getDirectoryContents(directory, function (err, contents) { + if (!err) { contents.forEach(function (entry) { if (fileSystem.shouldShow(entry.fullPath)) { // convert to doc relative path @@ -170,7 +170,8 @@ define(function (require, exports, module) { } } } - }); + } + }); return self.cachedHints.deferred; } diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js index 415aa4fbf72..725e703f975 100644 --- a/src/file/FileUtils.js +++ b/src/file/FileUtils.js @@ -58,14 +58,14 @@ define(function (require, exports, module) { }); // Read file - file.readAsText() - .done(function (data, stat) { + file.readAsText(function (err, data, stat) { + if (!err) { result.resolve(data, stat.mtime); - }) - .fail(function (err) { + } else { result.reject(err); - }); - + } + }); + return result.promise(); } @@ -79,15 +79,13 @@ define(function (require, exports, module) { function writeText(file, text) { var result = new $.Deferred(); - file.write(text) - .done(function () { + file.write(text, function (err) { + if (!err) { result.resolve(); - }) - .fail(function (err) { + } else { result.reject(err); - }); - - return result.promise(); + } + }); } /** @const */ diff --git a/src/filesystem/Directory.js b/src/filesystem/Directory.js index e59e0e17628..b4380954c0e 100644 --- a/src/filesystem/Directory.js +++ b/src/filesystem/Directory.js @@ -52,25 +52,24 @@ define(function (require, exports, module) { /** * Create a directory * - * @param {int=} mode The mode for the directory. - * - * @return {$.Promise} Promise that is resolved with the stat from the new directory. + * @param {number=} mode The mode for the directory. + * @param {function (number, object)=} callback */ - Directory.prototype.create = function (mode) { - var result = new $.Deferred(); + Directory.prototype.create = function (mode, callback) { + if (typeof (mode) === "function") { + callback = mode; + } // TODO: support mode this._impl.mkdir(this._path, function (err, stat) { - if (err) { - result.reject(err); - } else { + if (!err) { this._stat = stat; - result.resolve(stat); + } + if (callback) { + callback(err, stat); } }.bind(this)); - - return result.promise(); }; // Export this class diff --git a/src/filesystem/File.js b/src/filesystem/File.js index fc04f48a476..bdd981ee7a6 100644 --- a/src/filesystem/File.js +++ b/src/filesystem/File.js @@ -56,28 +56,25 @@ define(function (require, exports, module) { * Read a file as text. * * @param {string=} encoding Encoding for reading. Defaults to UTF-8. - * - * @return {$.Promise} Promise that is resolved with the text and stats from the file, - * or rejected if an error occurred. + * @param {function (number, string, object)} callback */ - File.prototype.readAsText = function (encoding) { - var result = new $.Deferred(); + File.prototype.readAsText = function (encoding, callback) { + if (typeof (encoding) === "function") { + callback = encoding; + encoding = null; + } if (this._contents && this._stat) { - result.resolve(this._contents, this._stat); + callback(null, this._contents, this._stat); } else { this._impl.readFile(this._path, encoding ? {encoding: encoding} : {}, function (err, data, stat) { - if (err) { - result.reject(err); - } else { + if (!err) { this._stat = stat; this._contents = data; - result.resolve(data, stat); } + callback(err, data, stat); }.bind(this)); } - - return result.promise(); }; /** @@ -85,24 +82,22 @@ define(function (require, exports, module) { * * @param {string} data Data to write. * @param {string=} encoding Encoding for data. Defaults to UTF-8. - * - * @return {$.Promise} Promise that is resolved with the file's new stats when the - * writing is complete, or rejected if an error occurred. + * @param {function (err, object)=} callback Callback that is passed the + * error code and the file's new stats if the write is sucessful. */ - File.prototype.write = function (data, encoding) { - var result = new $.Deferred(); + File.prototype.write = function (data, encoding, callback) { + if (typeof (encoding) === "function") { + callback = encoding; + encoding = null; + } this._impl.writeFile(this._path, data, encoding ? {encoding: encoding} : {}, function (err, stat) { - if (err) { - result.reject(err); - } else { + if (!err) { this._stat = stat; this._contents = data; - result.resolve(stat); } + callback(err, stat); }.bind(this)); - - return result.promise(); }; // Export this class diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js index fa7b4400ac1..c830798e7dd 100644 --- a/src/filesystem/FileSystem.js +++ b/src/filesystem/FileSystem.js @@ -159,77 +159,59 @@ define(function (require, exports, module) { * Check if the specified path exists. * * @param {string} path The path to test - * @return {$.Promise} Promise that is resolved if the path exists, or rejected if it doesn't. + * @param {function (boolean)} callback */ - FileSystem.prototype.pathExists = function (path) { - var result = new $.Deferred(); - + FileSystem.prototype.pathExists = function (path, callback) { this._impl.exists(path, function (exists) { - if (exists) { - result.resolve(this._index.getEntry(path)); - } else { - result.reject(); - } + callback(exists); }.bind(this)); - - return result.promise(); }; /** * Resolve a path. * * @param {string} path The path to resolve - * @return {$.Promise} Promise that is resolved with a File or Directory object, if it exists, - * or rejected if there is an error. + * @param {function (err, object)} callback */ - FileSystem.prototype.resolve = function (path) { - var result = new $.Deferred(); - - this.pathExists(path) - .done(function () { - this._impl.stat(path, function (err, stat) { - var item; - - if (err) { - result.reject(err); - return; - } - if (stat.isFile()) { - item = this.getFileForPath(path); - } else { - item = this.getDirectoryForPath(path); - } - result.resolve(item); - }.bind(this)); - }.bind(this)) - .fail(function () { - result.reject(); - }); - - return result.promise(); + FileSystem.prototype.resolve = function (path, callback) { + this._impl.stat(path, function (err, stat) { + var item; + + if (!err) { + if (stat.isFile()) { + item = this.getFileForPath(path); + } else { + item = this.getDirectoryForPath(path); + } + } + callback(err, item); + }.bind(this)); }; /** * Read the contents of a Directory. * * @param {Directory} directory Directory whose contents you want to get - * - * @return {$.Promise} Promise that is resolved with the contents of the directory. - * Contents is an Array of File and Directory objects. + * @param {function (number, array)} callback Callback that is passed + * and error code and the contents of the directory. */ - FileSystem.prototype.getDirectoryContents = function (directory) { - var i, entryPath, entry, result = new $.Deferred(); + FileSystem.prototype.getDirectoryContents = function (directory, callback) { + var i, entryPath, entry; - if (directory._contentsPromise) { - // Existing promise for this directory's contents. Return it. - return directory._contentsPromise; + if (directory._contentsCallbacks) { + // There is already a pending call for this directorie's contents. + // Push the new callback onto the stack and return. + directory._contentsCallbacks.push(callback); + return; } if (directory._contents) { - // Return cached directory contents - result.resolve(directory._contents); - return result.promise(); + // Return cached contents + callback(null, directory._contents); + return; } + + directory._contentsCallbacks = [callback]; this._impl.readdir(directory.fullPath, function (err, contents, stats) { directory._contents = []; @@ -254,12 +236,13 @@ define(function (require, exports, module) { } directory._contentsPromise = null; - result.resolve(directory._contents); + + // Invoke all saved callbacks + directory._contentsCallbacks.forEach(function (cb) { + cb(err, directory._contents); + }); + directory._contentsCallbacks = null; }.bind(this)); - - directory._contentsPromise = result.promise(); - - return result.promise(); }; /** @@ -292,27 +275,16 @@ define(function (require, exports, module) { * browsed folder depending on the OS preferences * @param {Array.} fileTypes List of extensions that are allowed to be opened. A null value * allows any extension to be selected. - * - * @return {$.Promise} Promise that will be resolved with the selected file(s)/directories, - * or rejected if an error occurred. + * @param {function (number, array)} callback Callback resolved with the selected file(s)/directories. */ FileSystem.prototype.showOpenDialog = function (allowMultipleSelection, chooseDirectories, title, initialPath, - fileTypes) { + fileTypes, + callback) { - var result = new $.Deferred(); - - this._impl.showOpenDialog(allowMultipleSelection, chooseDirectories, title, initialPath, fileTypes, function (err, data) { - if (err) { - result.reject(err); - } else { - result.resolve(data); - } - }); - - return result.promise(); + this._impl.showOpenDialog(allowMultipleSelection, chooseDirectories, title, initialPath, fileTypes, callback); }; /** @@ -324,22 +296,10 @@ define(function (require, exports, module) { * browsed folder depending on the OS preferences. * @param {string} proposedNewFilename Provide a new file name for the user. This could be based on * on the current file name plus an additional suffix - * - * @return {$.Promise} Promise that will be resolved with the name of the file to save, - * or rejected if an error occurred. + * @param {function (number, string)} callback Callback that is called with the name of the file to save. */ - FileSystem.prototype.showSaveDialog = function (title, initialPath, proposedNewFilename) { - var result = new $.Deferred(); - - this._impl.showSaveDialog(title, initialPath, proposedNewFilename, function (err, selection) { - if (err) { - result.reject(err); - } else { - result.resolve(selection); - } - }); - - return result.promise(); + FileSystem.prototype.showSaveDialog = function (title, initialPath, proposedNewFilename, callback) { + this._impl.showSaveDialog(title, initialPath, proposedNewFilename, callback); }; /** @@ -349,12 +309,14 @@ define(function (require, exports, module) { FileSystem.prototype._scanDirectory = function (directoryPath) { var directory = this.getDirectoryForPath(directoryPath); - this.getDirectoryContents(directory).done(function (entries) { - var i; - - for (i = 0; i < entries.length; i++) { - if (entries[i].isDirectory()) { - this._scanDirectory(entries[i].fullPath); + this.getDirectoryContents(directory, function (err, entries) { + if (!err) { + var i; + + for (i = 0; i < entries.length; i++) { + if (entries[i].isDirectory()) { + this._scanDirectory(entries[i].fullPath); + } } } }.bind(this)); @@ -391,13 +353,13 @@ define(function (require, exports, module) { entry._contents = entry._contentsPromise = undefined; // Read new contents - this.getDirectoryContents(entry) - .done(function (contents) { + this.getDirectoryContents(entry, function (err, contents) { + if (!err) { var i, len, item, path; - function _isInPath(item) { + var _isInPath = function (item) { return item.fullPath.indexOf(path) === 0; - } + }; // Check for deleted entries len = oldContents ? oldContents.length : 0; @@ -435,7 +397,8 @@ define(function (require, exports, module) { } } } - }.bind(this)); + } + }.bind(this)); } // Trigger a change event diff --git a/src/filesystem/FileSystemEntry.js b/src/filesystem/FileSystemEntry.js index 22924c93b94..60774259771 100644 --- a/src/filesystem/FileSystemEntry.js +++ b/src/filesystem/FileSystemEntry.js @@ -84,119 +84,75 @@ define(function (require, exports, module) { }; /** - * Returns true if the entry exists on disk. + * Check to see if the entry exists on disk. * - * @return {$.Promise} Promise that is resolved with true if the entry exists, - * or false if it doesn't. + * @param {function (boolean)} callback Callback with a single parameter. */ - FileSystemEntry.prototype.exists = function () { - var result = new $.Deferred(); - + FileSystemEntry.prototype.exists = function (callback) { // If we have _stat, the entry must exist if (this._stat) { - result.resolve(true); + callback(true); } else { // No _stat object yet, query the system this._impl.exists(this._path, function (val) { - result.resolve(val); + callback(val); }); } - - return result.promise(); }; /** * Returns the stats for the entry. * - * @return {$.Promise} Promise that is resolved with the entries stats, or rejected - * if an error occurred. + * @param {function (err, object)} callback Callback that is resolved with the entries + * stats. */ - FileSystemEntry.prototype.stat = function () { - var result = new $.Deferred(); - + FileSystemEntry.prototype.stat = function (callback) { if (this._stat) { - result.resolve(this._stat); + callback(null, this._stat); } else { this._impl.stat(this._path, function (err, stat) { - if (err) { - result.reject(err); - } else { + if (!err) { this._stat = stat; - result.resolve(this._stat); } + callback(err, stat); }.bind(this)); } - - return result.promise(); }; /** * Rename this entry. * * @param {String} newName New name for this entry. - * - * @return {$.Promise} Promise that is resolved with the entries stats, or rejected - * if an error occurred. + * @param {function (number)} callback */ - FileSystemEntry.prototype.rename = function (newName) { - var result = new $.Deferred(); - - this._impl.rename(this._path, newName, function (err) { - if (err) { - result.reject(err); - } else { - result.resolve(); - } - }); - - return result.promise(); + FileSystemEntry.prototype.rename = function (newName, callback) { + this._impl.rename(this._path, newName, callback); }; /** * Unlink (delete) this entry. * - * @return {$.Promise} Promise that is resolved if the unlink succeeded, or rejected - * if an error occurred. + * @param {function (number)} callback */ - FileSystemEntry.prototype.unlink = function () { - var result = new $.Deferred(); - + FileSystemEntry.prototype.unlink = function (callback) { this._stat = null; - this._impl.unlink(this._path, function (err) { - if (err) { - result.reject(err); - } else { - result.resolve(); - } - }); - - return result.promise(); + this._impl.unlink(this._path, callback || function () {}); }; /** * Move this entry to the trash. If the underlying file system doesn't support move * to trash, the item is permanently deleted. * - * @return {$.Promise} Promise that is resolved if the moveToTrash succeeded, or rejected - * if an error occurred. + * @param {function (number)} callback */ - FileSystemEntry.prototype.moveToTrash = function () { + FileSystemEntry.prototype.moveToTrash = function (callback) { if (!this._impl.moveToTrash) { - return this.unlink(); + this.unlink(callback); + return; } - var result = new $.Deferred(); - this._stat = null; - this._impl.moveToTrash(this._path, function (err) { - if (err) { - result.reject(err); - } else { - result.resolve(); - } - }); - - return result.promise(); + this._impl.moveToTrash(this._path, callback || function () {}); }; // Export this class diff --git a/src/filesystem/InMemoryFile.js b/src/filesystem/InMemoryFile.js index 69af919d888..5a19849df45 100644 --- a/src/filesystem/InMemoryFile.js +++ b/src/filesystem/InMemoryFile.js @@ -50,12 +50,16 @@ define(function (require, exports, module) { /** * Reject any attempts to read the file. * - * @param {string=} encoding Encoding for reading. Defaults to UTF-8. + * Read a file as text. * - * @return {$.Promise} Promise that is always rejected. + * @param {string=} encoding Encoding for reading. Defaults to UTF-8. + * @param {function (number, string, object)} callback */ - InMemoryFile.prototype.readAsText = function (encoding) { - return new $.Deferred().reject().promise(); // TODO: Error code? + InMemoryFile.prototype.readAsText = function (encoding, callback) { + if (typeof (encoding) === "function") { + callback = encoding; + } + callback(1); // TODO: Error code }; /** @@ -63,32 +67,35 @@ define(function (require, exports, module) { * * @param {string} data Data to write. * @param {string=} encoding Encoding for data. Defaults to UTF-8. - * - * @return {$.Promise} Promise that is always rejected. + * @param {function (err, object)=} callback Callback that is passed the + * error code and the file's new stats if the write is sucessful. */ - InMemoryFile.prototype.write = function (data, encoding) { - return new $.Deferred().reject().promise(); // TODO: Error code? + InMemoryFile.prototype.write = function (data, encoding, callback) { + if (typeof (encoding) === "function") { + callback = encoding; + } + callback(1); // TODO: Error code }; // Stub out invalid calls inherited from FileSystemEntry - InMemoryFile.prototype.exists = function () { - return new $.Deferred().resolve(false).promise(); + InMemoryFile.prototype.exists = function (callback) { + callback(false); }; - InMemoryFile.prototype.stat = function () { - return new $.Deferred().reject().promise(); // TODO: Error + InMemoryFile.prototype.stat = function (callback) { + callback(1); // TODO: Error }; - InMemoryFile.prototype.unlink = function () { - return new $.Deferred().reject().promise(); // TODO: Error + InMemoryFile.prototype.unlink = function (callback) { + callback(1); // TODO: Error }; - InMemoryFile.prototype.rename = function (newName) { - return new $.Deferred().reject().promise(); // TODO: Error + InMemoryFile.prototype.rename = function (newName, callback) { + callback(1); // TODO: Error }; - InMemoryFile.prototype.moveToTrash = function () { - return new $.Deferred().reject().promise(); // TODO: Error + InMemoryFile.prototype.moveToTrash = function (callback) { + callback(1); // TODO: Error }; // Export this class diff --git a/src/language/JSUtils.js b/src/language/JSUtils.js index c0412f5e9e8..05d06294d75 100644 --- a/src/language/JSUtils.js +++ b/src/language/JSUtils.js @@ -231,13 +231,13 @@ define(function (require, exports, module) { // If a cache exists, check the timestamp on disk var file = ProjectManager.getFileSystem().getFileForPath(fileInfo.fullPath); - file.stat() - .done(function (stat) { + file.stat(function (err, stat) { + if (!err) { result.resolve(fileInfo.JSUtils.timestamp === stat.mtime); - }) - .fail(function (err) { + } else { result.reject(err); - }); + } + }); } } else { // Use the cache if the file did not change and the cache exists diff --git a/src/project/FileSyncManager.js b/src/project/FileSyncManager.js index 7acf4bb376f..d1e0b6352e8 100644 --- a/src/project/FileSyncManager.js +++ b/src/project/FileSyncManager.js @@ -104,8 +104,8 @@ define(function (require, exports, module) { if (doc.isUntitled()) { result.resolve(); } else { - doc.file.stat() - .done(function (stat) { + doc.file.stat(function (err, stat) { + if (!err) { // Does file's timestamp differ from last sync time on the Document? if (stat.mtime.getTime() !== doc.diskTimestamp.getTime()) { if (doc.isDirty) { @@ -115,8 +115,7 @@ define(function (require, exports, module) { } } result.resolve(); - }) - .fail(function (err) { + } else { // File has been deleted externally // TODO: FileSystem error... if (err.name === NativeFileError.NOT_FOUND_ERR) { @@ -131,7 +130,8 @@ define(function (require, exports, module) { console.log("Error checking modification status of " + doc.file.fullPath, err); result.reject(); } - }); + } + }); } return result.promise(); diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index aca0821e3cf..fbe4e8e2caa 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -753,11 +753,10 @@ define(function (require, exports, module) { } // Fetch dirEntry's contents - _fileSystem.getDirectoryContents(dirEntry) - .done(function (contents) { + _fileSystem.getDirectoryContents(dirEntry, function (err, contents) { + if (!err) { processEntries(contents); - }) - .fail(function (err) { + } else { Dialogs.showModalDialog( DefaultDialogs.DIALOG_ID_ERROR, Strings.ERROR_LOADING_PROJECT, @@ -769,7 +768,8 @@ define(function (require, exports, module) { ); // Reject the render promise so we can move on. deferred.reject(); - }); + } + }); /* TODO: FileSystem - handle partial errors. See below. dirEntry.createReader().readEntries( @@ -925,76 +925,75 @@ define(function (require, exports, module) { ensureFileSystem().done(function () { // Point at a real folder structure on local disk var rootEntry = _fileSystem.getDirectoryForPath(rootPath); - rootEntry.exists() - .done(function (exists) { - if (exists) { - var projectRootChanged = (!_projectRoot || !rootEntry) || - _projectRoot.fullPath !== rootEntry.fullPath; - var i; - - // Success! - var perfTimerName = PerfUtils.markStart("Load Project: " + rootPath), - canonPath = FileUtils.canonicalizeFolderPath(rootPath); - - _projectRoot = rootEntry; - _projectBaseUrl = _prefs.getValue(_getBaseUrlKey()) || ""; - - // If this is the current welcome project, record it. In future launches, we always - // want to substitute the welcome project for the current build instead of using an - // outdated one (when loading recent projects or the last opened project). - if (canonPath === _getWelcomeProjectPath()) { - var welcomeProjects = _prefs.getValue("welcomeProjects") || []; - if (welcomeProjects.indexOf(canonPath) === -1) { - welcomeProjects.push(canonPath); - _prefs.setValue("welcomeProjects", welcomeProjects); - } + rootEntry.exists(function (exists) { + if (exists) { + var projectRootChanged = (!_projectRoot || !rootEntry) || + _projectRoot.fullPath !== rootEntry.fullPath; + var i; + + // Success! + var perfTimerName = PerfUtils.markStart("Load Project: " + rootPath), + canonPath = FileUtils.canonicalizeFolderPath(rootPath); + + _projectRoot = rootEntry; + _projectBaseUrl = _prefs.getValue(_getBaseUrlKey()) || ""; + + // If this is the current welcome project, record it. In future launches, we always + // want to substitute the welcome project for the current build instead of using an + // outdated one (when loading recent projects or the last opened project). + if (canonPath === _getWelcomeProjectPath()) { + var welcomeProjects = _prefs.getValue("welcomeProjects") || []; + if (welcomeProjects.indexOf(canonPath) === -1) { + welcomeProjects.push(canonPath); + _prefs.setValue("welcomeProjects", welcomeProjects); } - - // The tree will invoke our "data provider" function to populate the top-level items, then - // go idle until a node is expanded - at which time it'll call us again to fetch the node's - // immediate children, and so on. - resultRenderTree = _renderTree(_treeDataProvider); - - resultRenderTree.always(function () { - if (projectRootChanged) { - // Allow asynchronous event handlers to finish before resolving result by collecting promises from them - var promises = []; - $(exports).triggerHandler({ type: "projectOpen", promises: promises }, [_projectRoot]); - $.when.apply($, promises).then(result.resolve, result.reject); - } else { - result.resolve(); - } - }); - resultRenderTree.fail(function () { + } + + // The tree will invoke our "data provider" function to populate the top-level items, then + // go idle until a node is expanded - at which time it'll call us again to fetch the node's + // immediate children, and so on. + resultRenderTree = _renderTree(_treeDataProvider); + + resultRenderTree.always(function () { + if (projectRootChanged) { + // Allow asynchronous event handlers to finish before resolving result by collecting promises from them + var promises = []; + $(exports).triggerHandler({ type: "projectOpen", promises: promises }, [_projectRoot]); + $.when.apply($, promises).then(result.resolve, result.reject); + } else { + result.resolve(); + } + }); + resultRenderTree.fail(function () { // PerfUtils.terminateMeasurement(perfTimerName); + result.reject(); + }); + resultRenderTree.always(function () { + PerfUtils.addMeasurement(perfTimerName); + }); + } else { + Dialogs.showModalDialog( + DefaultDialogs.DIALOG_ID_ERROR, + Strings.ERROR_LOADING_PROJECT, + StringUtils.format( + Strings.REQUEST_NATIVE_FILE_SYSTEM_ERROR, + StringUtils.breakableUrl(rootPath), + "" // TODO: FileSystem error -- error.name + ) + ).done(function () { + // The project folder stored in preference doesn't exist, so load the default + // project directory. + // TODO (issue #267): When Brackets supports having no project directory + // defined this code will need to change + _loadProject(_getWelcomeProjectPath()).always(function () { + // Make sure not to reject the original deferred until the fallback + // project is loaded, so we don't violate expectations that there is always + // a current project before continuing after _loadProject(). result.reject(); }); - resultRenderTree.always(function () { - PerfUtils.addMeasurement(perfTimerName); - }); - } else { - Dialogs.showModalDialog( - DefaultDialogs.DIALOG_ID_ERROR, - Strings.ERROR_LOADING_PROJECT, - StringUtils.format( - Strings.REQUEST_NATIVE_FILE_SYSTEM_ERROR, - StringUtils.breakableUrl(rootPath), - "" // TODO: FileSystem error -- error.name - ) - ).done(function () { - // The project folder stored in preference doesn't exist, so load the default - // project directory. - // TODO (issue #267): When Brackets supports having no project directory - // defined this code will need to change - _loadProject(_getWelcomeProjectPath()).always(function () { - // Make sure not to reject the original deferred until the fallback - // project is loaded, so we don't violate expectations that there is always - // a current project before continuing after _loadProject(). - result.reject(); - }); - }); - } - }); + }); + } + }); }); } @@ -1129,8 +1128,8 @@ define(function (require, exports, module) { _loadProject(path, false, filesystem).then(result.resolve, result.reject); } else { // Pop up a folder browse dialog - _fileSystem.showOpenDialog(false, true, Strings.CHOOSE_FOLDER, _projectRoot.fullPath, null) - .done(function (files) { + _fileSystem.showOpenDialog(false, true, Strings.CHOOSE_FOLDER, _projectRoot.fullPath, null, function (err, files) { + if (!err) { // If length == 0, user canceled the dialog; length should never be > 1 if (files.length > 0) { // Load the new project into the folder tree @@ -1138,15 +1137,15 @@ define(function (require, exports, module) { } else { result.reject(); } - }) - .fail(function (error) { + } else { Dialogs.showModalDialog( DefaultDialogs.DIALOG_ID_ERROR, Strings.ERROR_LOADING_PROJECT, - StringUtils.format(Strings.OPEN_DIALOG_ERROR, error.name) + StringUtils.format(Strings.OPEN_DIALOG_ERROR, err.name) ); result.reject(); - }); + } + }); } }) .fail(function () { @@ -1334,35 +1333,35 @@ define(function (require, exports, module) { var newItemPath = selectionEntry.fullPath + "/" + data.rslt.name; - _fileSystem.resolve(newItemPath) - .done(function (item) { + _fileSystem.resolve(newItemPath, function (err, item) { + if (!err) { // Item already exists, fail with error errorCallback(2); // TODO: FileSystem error code - }) - .fail(function () { + } else { if (isFolder) { var directory = _fileSystem.getDirectoryForPath(newItemPath); - directory.create() - .done(function () { - successCallback(directory); - }) - .fail(function (err) { + directory.create(function (err) { + if (err) { errorCallback(err); - }); + } else { + successCallback(directory); + } + }); } else { // Create an empty file var file = _fileSystem.getFileForPath(newItemPath); - file.write("") - .done(function () { + file.write("", function (err) { + if (!err) { successCallback(file); - }) - .fail(function (err) { + } else { errorCallback(err); - }); + } + }); } - }); + } + }); } else { //escapeKeyPressed errorCleanup(); @@ -1426,9 +1425,21 @@ define(function (require, exports, module) { // TODO: This should call FileEntry.moveTo(), but that isn't implemented // yet. For now, call directly to the low-level fs.rename() // TODO: FileSystem.... + /* return _fileSystem.resolve(oldName) .then(function (oldFSEntry) { - return oldFSEntry.rename(newName); + var result = new $.Deferred(); + + // TODO: FileSystem - this is probably completely wrong... + oldFSEntry.rename(newName, function (err) { + if (!err) { + result.resolve(oldFSEntry); + } else { + result.reject(); + } + }); + + return result.promise(); }) .then(function (newFSEntry) { // Update all nodes in the project tree. @@ -1472,6 +1483,7 @@ define(function (require, exports, module) { ) ); }); + */ } /** @@ -1546,8 +1558,8 @@ define(function (require, exports, module) { function deleteItem(entry) { var result = new $.Deferred(); - entry.moveToTrash() - .done(function () { + entry.moveToTrash(function (err) { + if (!err) { _findTreeNode(entry).done(function ($node) { _projectTree.one("delete_node.jstree", function () { // When a node is deleted, the previous node is automatically selected. @@ -1578,8 +1590,7 @@ define(function (require, exports, module) { _redraw(true); result.resolve(); - }) - .fail(function (err) { + } else { // Show an error alert Dialogs.showModalDialog( Dialogs.DIALOG_ID_ERROR, @@ -1592,7 +1603,8 @@ define(function (require, exports, module) { ); result.reject(err); - }); + } + }); return result.promise(); } diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js index 2f653ef669b..bd7e9fa4dc8 100644 --- a/src/search/FindInFiles.js +++ b/src/search/FindInFiles.js @@ -751,16 +751,16 @@ define(function (require, exports, module) { result.resolve(); } else { // Search one file - file.readAsText() - .done(function (contents) { + file.readAsText(function (err, contents) { + if (!err) { _addSearchMatches(file.fullPath, contents, currentQueryExpr); result.resolve(); - }) - .fail(function (error) { + } else { // Error reading this file. This is most likely because the file isn't a text file. // Resolve here so we move on to the next file. result.resolve(); - }); + } + }); } return result.promise(); }) diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js index 50b7c9879d8..79b8c818ca5 100644 --- a/src/utils/ExtensionLoader.js +++ b/src/utils/ExtensionLoader.js @@ -195,8 +195,8 @@ define(function (require, exports, module) { var fileExists = false, statComplete = false; var file = brackets.appFileSystem.getFileForPath(extensionPath); - file.stat() - .done(function (stat) { + file.stat(function (err, stat) { + if (!err) { statComplete = true; if (stat.isFile()) { // unit test file exists @@ -214,10 +214,10 @@ define(function (require, exports, module) { } else { result.reject(); } - }) - .fail(function (err) { + } else { result.reject(); - }); + } + }); return result.promise(); } @@ -236,8 +236,8 @@ define(function (require, exports, module) { function _loadAll(directory, config, entryPoint, processExtension) { var result = new $.Deferred(); - brackets.appFileSystem.getDirectoryContents(brackets.appFileSystem.getDirectoryForPath(directory)) - .done(function (contents) { + brackets.appFileSystem.getDirectoryContents(brackets.appFileSystem.getDirectoryForPath(directory), function (err, contents) { + if (!err) { var i, extensions = []; @@ -264,11 +264,11 @@ define(function (require, exports, module) { // Always resolve the promise even if some extensions had errors result.resolve(); }); - }) - .fail(function (err) { + } else { console.error("[Extension] Error -- could not read native directory: " + directory); result.reject(); - }); + } + }); return result.promise(); } diff --git a/test/SpecRunner.js b/test/SpecRunner.js index 7bbdd078a73..0d5dbcf2c89 100644 --- a/test/SpecRunner.js +++ b/test/SpecRunner.js @@ -147,12 +147,11 @@ define(function (require, exports, module) { function writeResults(path, text) { // check if the file already exists - brackets.appFileSystem.pathExists(path) - .done(function () { + brackets.appFileSystem.pathExists(path, function (exists) { + if (exists) { // file exists, do not overwrite _writeResults.reject(); - }) - .fail(function () { + } else { // file not found, write the new file with xml content var file = brackets.appFileSystem.getFileForPath(path); FileUtils.writeText(file, text) @@ -162,7 +161,8 @@ define(function (require, exports, module) { .fail(function (err) { _writeResults.reject(err); }); - }); + } + }); } /** diff --git a/test/spec/ExtensionInstallation-test.js b/test/spec/ExtensionInstallation-test.js index fdcf704efa7..a018110650f 100644 --- a/test/spec/ExtensionInstallation-test.js +++ b/test/spec/ExtensionInstallation-test.js @@ -158,14 +158,14 @@ define(function (require, exports, module) { var expectedPath = mockGetUserExtensionPath() + "/basic-valid-extension"; expect(lastExtensionLoad.config.baseUrl).toEqual(expectedPath); expect(lastExtensionLoad.entryPoint).toEqual("main"); - brackets.appFileSystem.pathExists(extensionsRoot + "/user/basic-valid-extension/main.js") - .done(function () { + brackets.appFileSystem.pathExists(extensionsRoot + "/user/basic-valid-extension/main.js", function (exists) { + if (exists) { mainCheckComplete = true; - }) - .fail(function () { + } else { mainCheckComplete = true; expect("basic-valid-extension directory and main.js to exist").toEqual(true); - }); + } + }); }); waitsFor(function () { return mainCheckComplete; }, 1000, "checking for main.js file"); @@ -181,14 +181,14 @@ define(function (require, exports, module) { expect(packageData.disabledReason).not.toBeNull(); expect(packageData.name).toEqual("incompatible-version"); expect(lastExtensionLoad).toEqual({}); - brackets.appFileSystem.pathExists(extensionsRoot + "/disabled/incompatible-version") - .done(function () { + brackets.appFileSystem.pathExists(extensionsRoot + "/disabled/incompatible-version", function (exists) { + if (exists) { directoryCheckComplete = true; - }) - .fail(function () { + } else { directoryCheckComplete = true; expect("incompatible-version path to exist in the disabled directory").toEqual(true); - }); + } + }); waitsFor(function () { return directoryCheckComplete; }, 1000, "checking for disabled extension directory"); @@ -203,14 +203,14 @@ define(function (require, exports, module) { handlePackage(installPath, Package.remove); }); runs(function () { - brackets.appFileSystem.pathExists(installPath) - .done(function () { + brackets.appFileSystem.pathExists(installPath, function (exists) { + if (exists) { checkComplete = true; expect("installation path was removed").toEqual(true); - }) - .fail(function () { + } else { checkComplete = true; - }); + } + }); waitsFor(function () { return checkComplete; }, 1000, "checking for extension folder removal"); }); diff --git a/test/spec/ProjectManager-test.js b/test/spec/ProjectManager-test.js index 091ba918770..87d660babd3 100644 --- a/test/spec/ProjectManager-test.js +++ b/test/spec/ProjectManager-test.js @@ -84,16 +84,16 @@ define(function (require, exports, module) { var file = fileSystem.getFileForPath(filePath); runs(function () { - file.stat() - .done(function (_stat) { + file.stat(function (err, _stat) { + if (!err) { error = 0; stat = _stat; complete = true; - }) - .fail(function (err) { + } else { error = err; complete = true; - }); + } + }); }); waitsFor(function () { return complete; }, 1000); @@ -105,15 +105,15 @@ define(function (require, exports, module) { // delete the new file complete = false; - file.unlink() - .done(function () { + file.unlink(function (err) { + if (!err) { unlinkError = 0; complete = true; - }) - .fail(function (err) { + } else { unlinkError = err; complete = true; - }); + } + }); }); waitsFor( function () { @@ -247,8 +247,9 @@ define(function (require, exports, module) { // by explicitly deleting the test file if it exists. runs(function () { complete = false; - newFile.unlink() - .always(function () { complete = true; }); + newFile.unlink(function (err) { + complete = true; + }); }); waitsFor(function () { return complete; }, "clean up leftover files timeout", 1000); @@ -263,15 +264,15 @@ define(function (require, exports, module) { runs(function () { complete = false; error = 0; - newFile.stat() - .done(function (_stat) { + newFile.stat(function (err, _stat) { + if (!err) { stat = _stat; complete = true; - }) - .fail(function (err) { + } else { error = err; complete = true; - }); + } + }); }); waitsFor(function () { return complete; }, 1000); @@ -297,15 +298,15 @@ define(function (require, exports, module) { runs(function () { complete = false; error = 0; - newFile.stat() - .done(function (_stat) { + newFile.stat(function (err, _stat) { + if (!err) { stat = _stat; complete = true; - }) - .fail(function (err) { + } else { error = err; complete = true; - }); + } + }); }); waitsFor(function () { return complete; }, 1000); @@ -333,10 +334,9 @@ define(function (require, exports, module) { runs(function () { var rootFolder = fileSystem.getDirectoryForPath(rootFolderName); complete = false; - rootFolder.moveToTrash() - .always(function () { - complete = true; - }); + rootFolder.moveToTrash(function (err) { + complete = true; + }); }); waitsFor(function () { return complete; }, "clean up leftover files timeout", 1000); @@ -351,16 +351,16 @@ define(function (require, exports, module) { runs(function () { var newFolder = fileSystem.getDirectoryForPath(newFolderName); complete = false; - newFolder.stat() - .done(function (_stat) { + newFolder.stat(function (err, _stat) { + if (!err) { error = 0; stat = _stat; complete = true; - }) - .fail(function (err) { + } else { error = err; complete = true; - }); + } + }); }); waitsFor(function () { return complete; }, 1000); @@ -386,16 +386,16 @@ define(function (require, exports, module) { newFolderName += "/toDelete1"; newFolder = fileSystem.getDirectoryForPath(newFolderName); complete = false; - newFolder.stat() - .done(function (_stat) { + newFolder.stat(function (err, _stat) { + if (!err) { error = 0; stat = _stat; complete = true; - }) - .fail(function (err) { + } else { error = err; complete = true; - }); + } + }); }); waitsFor(function () { return complete; }, 1000); @@ -415,16 +415,16 @@ define(function (require, exports, module) { runs(function () { var file = fileSystem.getFileForPath(newFolderName + "/toDelete2.txt"); complete = false; - file.stat() - .done(function (_stat) { + file.stat(function (err, _stat) { + if (!err) { error = 0; stat = _stat; complete = true; - }) - .fail(function (err) { + } else { error = err; complete = true; - }); + } + }); }); waitsFor(function () { return complete; }, 1000); @@ -446,16 +446,16 @@ define(function (require, exports, module) { runs(function () { var rootFolder = fileSystem.getDirectoryForPath(rootFolderName); complete = false; - rootFolder.stat() - .done(function (_stat) { + rootFolder.stat(function (err, _stat) { + if (!err) { error = 0; stat = _stat; complete = true; - }) - .fail(function (err) { + } else { error = err; complete = true; - }); + } + }); }); waitsFor(function () { return complete; }, 1000); diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index 6094bcac0d3..2a4f2cc09d7 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -60,13 +60,12 @@ define(function (require, exports, module) { */ function deletePath(fullPath, silent) { var result = new $.Deferred(); - brackets.appFileSystem.resolve(fullPath) - .done(function (item) { - item.unlink() - .done(function () { + brackets.appFileSystem.resolve(fullPath, function (err, item) { + if (!err) { + item.unlink(function (err) { + if (!err) { result.resolve(); - }) - .fail(function (err) { + } else { // TODO: fix error code if (err === brackets.fs.ERR_NOT_FOUND && silent) { result.resolve(); @@ -74,11 +73,16 @@ define(function (require, exports, module) { console.error("Unable to remove " + fullPath, err); result.reject(err); } - }); - }) - .fail(function (err) { - result.reject(err); - }); + } + }); + } else { + if (err === brackets.fs.ERR_NOT_FOUND && silent) { + result.resolve(); + } else { + result.reject(err); + } + } + }); return result.promise(); } @@ -141,7 +145,17 @@ define(function (require, exports, module) { * rejected when any error occurs. */ function resolveNativeFileSystemPath(path) { - return brackets.appFileSystem.resolve(path); + var result = new $.Deferred(); + + brackets.appFileSystem.resolve(path, function (err, item) { + if (!err) { + result.resolve(item); + } else { + result.reject(err); + } + }); + + return result.promise(); } @@ -214,13 +228,13 @@ define(function (require, exports, module) { var deferred = new $.Deferred(); runs(function () { - var dir = brackets.appFileSystem.getDirectoryForPath(getTempDirectory()).create() - .done(function () { - deferred.resolve(); - }) - .fail(function () { + var dir = brackets.appFileSystem.getDirectoryForPath(getTempDirectory()).create(function (err) { + if (err) { deferred.reject(); - }); + } else { + deferred.resolve(); + } + }); }); waitsForDone(deferred, "Create temp directory", 500); @@ -232,6 +246,7 @@ define(function (require, exports, module) { function _stat(pathname) { var promise = new $.Deferred(); + // TODO: FileSystem brackets.fs.stat(pathname, function (err, _stat) { if (err === brackets.fs.NO_ERROR) { promise.resolve(_stat); @@ -746,13 +761,13 @@ define(function (require, exports, module) { var deferred = new $.Deferred(), file = brackets.appFileSystem.getFileForPath(path); - file.write(text) - .done(function () { + file.write(text, function (err) { + if (!err) { deferred.resolve(file); - }) - .fail(function (err) { + } else { deferred.reject(err); - }); + } + }); return deferred.promise(); } @@ -826,10 +841,10 @@ define(function (require, exports, module) { destDir = brackets.appFileSystem.getDirectoryForPath(destination); // create the destination folder - destDir.create() - .done(function () { - brackets.appFileSystem.getDirectoryContents(source) - .done(function (contents) { + destDir.create(function (err) { + if (!err) { + brackets.appFileSystem.getDirectoryContents(source, function (err, contents) { + if (!err) { // copy all children of this directory var copyChildrenPromise = Async.doInParallel( contents, @@ -859,24 +874,24 @@ define(function (require, exports, module) { ); copyChildrenPromise.then(deferred.resolve, deferred.reject); - }) - .fail(function (err) { + } else { deferred.reject(err); - }); - }) - .fail(function () { - deferred.reject(); - }); - - deferred.always(function () { - // remove destination path prefix - if (removePrefix && options.infos) { - var shortKey; - Object.keys(options.infos).forEach(function (key) { - shortKey = key.substr(destination.length + 1); - options.infos[shortKey] = options.infos[key]; + } }); + } else { + deferred.reject(); } + + deferred.always(function () { + // remove destination path prefix + if (removePrefix && options.infos) { + var shortKey; + Object.keys(options.infos).forEach(function (key) { + shortKey = key.substr(destination.length + 1); + options.infos[shortKey] = options.infos[key]; + }); + } + }); }); return deferred.promise(); From 798f585849cd49bba6592ff91ca01bfccad147ed Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Sat, 5 Oct 2013 19:20:17 +0200 Subject: [PATCH 0067/1140] Fix Tests for non English locales --- test/spec/InstallExtensionDialog-test.js | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/test/spec/InstallExtensionDialog-test.js b/test/spec/InstallExtensionDialog-test.js index 3bbef0e6a27..bbbe8c1cd7e 100644 --- a/test/spec/InstallExtensionDialog-test.js +++ b/test/spec/InstallExtensionDialog-test.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ @@ -32,7 +32,7 @@ define(function (require, exports, module) { var SpecRunnerUtils = require("spec/SpecRunnerUtils"), KeyEvent = require("utils/KeyEvent"), NativeApp = require("utils/NativeApp"), - Strings = require("strings"); + Strings; describe("Install Extension Dialog", function () { var testWindow, dialog, fields, goodInstaller, badInstaller, closed, @@ -43,6 +43,7 @@ define(function (require, exports, module) { beforeFirst(function () { SpecRunnerUtils.createTestWindowAndRun(this, function (w) { testWindow = w; + Strings = testWindow.require("strings"); }); }); From 440c7fb9eee7ad9b5c60b24311e1ec61a899770b Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 5 Oct 2013 21:24:44 +0200 Subject: [PATCH 0068/1140] Make the project-dropdown-toggle toggle the dropdown menu --- src/extensions/default/RecentProjects/main.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/extensions/default/RecentProjects/main.js b/src/extensions/default/RecentProjects/main.js index 654cfad26e0..99bb4221cc1 100644 --- a/src/extensions/default/RecentProjects/main.js +++ b/src/extensions/default/RecentProjects/main.js @@ -393,7 +393,11 @@ define(function (require, exports, module) { // Have to do this stopProp to avoid the html click handler from firing when this returns. e.stopPropagation(); - showDropdown(); + if ($dropdown) { + closeDropdown(); //close if it's already visible + } else { + showDropdown(); + } } /** From 0f39692e6517eb26a3eaafc4ea0db3b2b43d22e4 Mon Sep 17 00:00:00 2001 From: Thomas Erbe Date: Mon, 7 Oct 2013 20:10:32 +0100 Subject: [PATCH 0069/1140] Added close button to inline editor --- src/editor/InlineTextEditor.js | 9 +++++++++ src/styles/brackets.less | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/editor/InlineTextEditor.js b/src/editor/InlineTextEditor.js index b15407c0635..c678c671ef8 100644 --- a/src/editor/InlineTextEditor.js +++ b/src/editor/InlineTextEditor.js @@ -210,6 +210,15 @@ define(function (require, exports, module) { // header containing filename, dirty indicator, line number var $header = $("
    ").addClass("inline-editor-header"); + + // Close button + var $closeBtn = $header.append("×"); + + $closeBtn.on("mouseup", function(e) { + self.close(); + e.stopImmediatePropagation(); + }); + var $filenameInfo = $("").addClass("filename"); // dirty indicator, with file path stored on it diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 4cf338cfda3..96f88158d40 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -643,6 +643,10 @@ a, img { color: @inline-color-2; } } + + #inline-close { + margin-right: 10px; + } } .shadow { From 8d4476a5772d0bc4e7823c2b6be683aa5bcc772b Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 7 Oct 2013 15:28:50 -0400 Subject: [PATCH 0070/1140] Initial commit of new preferences model (no file access yet) --- src/preferences/PreferencesManager.js | 173 ++++++++++++++++- test/spec/PreferencesManager-test.js | 265 ++++++++++++++------------ 2 files changed, 316 insertions(+), 122 deletions(-) diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index edf3f1f4cee..36a53da43f9 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -24,6 +24,7 @@ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ /*global define, $, localStorage */ +/*unittests: Preferences Manager */ /** * PreferencesManager @@ -32,7 +33,7 @@ define(function (require, exports, module) { "use strict"; - var PreferenceStorage = require("preferences/PreferenceStorage").PreferenceStorage, + var OldPreferenceStorage = require("preferences/PreferenceStorage").PreferenceStorage, FileUtils = require("file/FileUtils"), ExtensionLoader = require("utils/ExtensionLoader"), CollectionUtils = require("utils/CollectionUtils"); @@ -133,7 +134,7 @@ define(function (require, exports, module) { }); } - return new PreferenceStorage(clientID, prefs); + return new OldPreferenceStorage(clientID, prefs); } /** @@ -221,4 +222,170 @@ define(function (require, exports, module) { // Unit test use only exports._reset = _reset; exports._getExtensionPaths = _getExtensionPaths; -}); + + // New implementation follows. Everything above is deprecated. + + function MemoryStorage(data) { + this.data = data || {}; + } + + MemoryStorage.prototype = { + load: function () { + var result = $.Deferred(); + result.resolve(this.data); + return result.promise(); + }, + + save: function (newData) { + var result = $.Deferred(); + this.data = newData; + result.resolve(); + return result.promise(); + } + }; + + function Scope(storage) { + this.storage = storage; + this.data = undefined; + this._dirty = false; + } + + Scope.prototype = { + load: function () { + var result = $.Deferred(); + this.storage.load().then(function (data) { + this.data = data; + result.resolve(); + }.bind(this)); + return result.promise(); + }, + + save: function () { + return this.storage.save(this.data); + }, + + setValue: function (id, value) { + this._dirty = true; + this.data[id] = value; + }, + + getValue: function (id, layers) { + var layerCounter; + for (layerCounter = 0; layerCounter < layers.length; layerCounter++) { + var result = layers[layerCounter](this.data, id); + if (result !== undefined) { + return result; + } + } + return this.data[id]; + } + }; + + function LanguageLayer() { + } + + LanguageLayer.prototype = { + setLanguage: function (languageID) { + this.language = languageID; + }, + + getValue: function (data, id) { + if (data.language && data.language[this.language]) { + return data.language[this.language][id]; + } + } + }; + + function PreferencesManager() { + this._knownPrefs = {}; + this._scopes = { + "default": new Scope(new MemoryStorage()) + }; + + // Memory-based scope loads synchronously + this._scopes["default"].load(); + this._scopeOrder = ["default"]; + this._pendingScopes = {}; + + + this._layers = {}; + this._layerGetters = []; + } + + PreferencesManager.prototype = { + definePreference: function (id, type, initial, options) { + options = options || {}; + if (this._knownPrefs.hasOwnProperty(id)) { + throw new Error("Preference " + id + " was redefined"); + } + this._knownPrefs[id] = { + type: type, + initial: initial, + name: options.name, + description: options.description + }; + this.setValue("default", id, initial); + }, + + addScope: function (id, scope, addBefore) { + if (this._scopes[id]) { + throw new Error("Attempt to redefine preferences scope: " + id); + } + + scope.load().then(function () { + this._scopes[id] = scope; + if (!addBefore) { + this._scopeOrder.push(id); + } else { + var addIndex = this._scopeOrder.indexOf(addBefore); + if (addIndex > -1) { + this._scopeOrder.splice(addIndex, 0, id); + } else { + var queue = this._pendingScopes[addBefore]; + if (!queue) { + queue = []; + this._pendingScopes[addBefore] = queue; + } + queue.unshift(id); + } + } + }.bind(this)); + }, + + addLayer: function (id, layer) { + if (this._layers[id]) { + throw new Error("Attempt to redefine preferences layer: " + id); + } + this._layers[id] = layer; + this._layerGetters.push(layer.getValue.bind(layer)); + }, + + setValue: function (scopeName, id, value) { + var scope = this._scopes[scopeName]; + if (!scope) { + throw new Error("Attempt to set preference in non-existent scope: " + scopeName); + } + + scope.setValue(id, value); + }, + + getValue: function (id, value) { + var scopeCounter, + scopeOrder = this._scopeOrder, + layerGetters = this._layerGetters; + + for (scopeCounter = 0; scopeCounter < scopeOrder.length; scopeCounter++) { + var scope = this._scopes[scopeOrder[scopeCounter]]; + var result = scope.getValue(id, layerGetters); + if (result !== undefined) { + return result; + } + } + } + }; + + exports.PreferencesManager = PreferencesManager; + exports.Scope = Scope; + exports.MemoryStorage = MemoryStorage; + exports.LanguageLayer = LanguageLayer; +}); \ No newline at end of file diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js index 74fef4dc862..54c4204c17b 100644 --- a/test/spec/PreferencesManager-test.js +++ b/test/spec/PreferencesManager-test.js @@ -22,139 +22,166 @@ */ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define: false, describe: false, it: false, expect: false, beforeEach: false, afterEach: false, waitsFor: false, runs: false, beforeFirst, afterLast, spyOn */ +/*global $, define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, beforeFirst, afterLast, spyOn */ +/*unittests: Preferences Manager*/ + define(function (require, exports, module) { 'use strict'; // Load dependent modules - var PreferenceStorage = require("preferences/PreferenceStorage").PreferenceStorage, - SpecRunnerUtils = require("spec/SpecRunnerUtils"), - PreferencesManager, - testWindow; + var PreferencesManager = require("preferences/PreferencesManager"); - var CLIENT_ID = "PreferencesManager-test"; - - describe("PreferenceStorage", function () { - - it("should read initial preferences from JSON", function () { - var store = new PreferenceStorage(CLIENT_ID, {"foo": "bar", hello: "world"}); - expect(store.getValue("foo")).toBe("bar"); - expect(store.getValue("hello")).toBe("world"); - }); - - it("should store values as JSON", function () { - var json = {}; - var store = new PreferenceStorage(CLIENT_ID, json); - store.setValue("foo", 42); - - expect(json.foo).toEqual(42); - expect(store.getValue("foo")).toBe(42); - }); - - it("should output preferences as JSON", function () { - var store = new PreferenceStorage(CLIENT_ID, {}); - store.setValue("foo", 42); - var json = store.getAllValues(); - - expect(json.foo).toEqual(42); - }); - - it("should remove values", function () { - var store = new PreferenceStorage(CLIENT_ID, {"foo": "bar"}); - expect(store.getValue("foo")).toBe("bar"); - - store.remove("foo"); - expect(store.getValue("foo")).toBe(undefined); + describe("Preferences Manager", function () { + describe("Memory Storage", function () { + it("should support get and save operations", function () { + var sampleData = { + foo: 1, + bar: 2 + }; + + var storage = new PreferencesManager.MemoryStorage(sampleData); + + // This storage is synchronous + storage.load().then(function (data) { + expect(data).toEqual(sampleData); + }); + + storage.save({ + foo: 3 + }).then(function () { + expect(storage.data).not.toEqual(sampleData); + expect(storage.data.foo).toEqual(3); + expect(storage.data.bar).not.toBeDefined(); + }); + }); }); - it("should use setAllValues to append multiple new name/value pairs", function () { - var initial = {"foo": "bar"}; - var store = new PreferenceStorage(CLIENT_ID, initial); + describe("Preferences Manager", function () { + it("should yield an error if a preference is redefined", function () { + var pm = new PreferencesManager.PreferencesManager(); + pm.definePreference("foo.bar", "string"); + try { + pm.definePreference("foo.bar", "string"); + expect("We should have gotten an exception").toEqual("but we didn't"); + } catch (e) { + } + }); - // append - store.setAllValues({"hello": ["world", "!"], "goodbye": 42}, true); - expect(store.getValue("foo")).toBe("bar"); - expect(store.getValue("hello")).toEqual(["world", "!"]); - expect(store.getValue("goodbye")).toBe(42); + it("should find the default values", function () { + var pm = new PreferencesManager.PreferencesManager(); + pm.definePreference("foo.bar", "number", 0); + expect(pm.getValue("nonexistent")).not.toBeDefined(); + expect(pm.getValue("foo.bar")).toBe(0); + }); - // overwrite - store.setAllValues({"winning": false}, false); - expect(store.getValue("foo")).toBe(undefined); - expect(store.getValue("hello")).toBe(undefined); - expect(store.getValue("goodbye")).toBe(undefined); - expect(store.getValue("winning")).toBe(false); - }); - - it("should throw errors for invalid values", function () { - var store = new PreferenceStorage(CLIENT_ID, {"foo": 42}); - var error = null; + it("should produce an error for setValue on undefined scope", function () { + var pm = new PreferencesManager.PreferencesManager(); + try { + pm.setValue("nonscope", "foo", false); + expect("Should have gotten an error for nonexistent scope").toBe("but didn't"); + } catch (e) { + expect(e.toString().indexOf("scope")).toBeGreaterThan(-1); + } + }); - expect(store.getValue("foo")).toBe(42); - // function data is not valid JSON - store.setValue("foo", function () {}); - expect(store.getValue("foo")).toBe(42); - - // number key is not valid JSON - store.setValue(42, "bar"); - expect(store.getValue(42)).toBe(undefined); - }); - - }); - - describe("PreferencesManager", function () { - beforeFirst(function () { - SpecRunnerUtils.createTestWindowAndRun(this, function (w) { - testWindow = w; - - // Load module instances from brackets.test - PreferencesManager = testWindow.brackets.test.PreferencesManager; + it("supports nested scopes", function () { + var pm = new PreferencesManager.PreferencesManager(); + pm.definePreference("useTabChar", "boolean", false); + pm.definePreference("tabSize", "number", 4); + pm.definePreference("spaceUnits", "number", 4); + var userScope = new PreferencesManager.Scope(new PreferencesManager.MemoryStorage()); + var projectScope = new PreferencesManager.Scope(new PreferencesManager.MemoryStorage()); + pm.addScope("user", userScope, "default"); + pm.addScope("project", projectScope, "user"); + + expect(pm.getValue("spaceUnits")).toEqual(4); + + pm.setValue("user", "useTabChar", true); + pm.setValue("user", "tabSize", 8); + pm.setValue("user", "spaceUnits", 8); + pm.setValue("project", "spaceUnits", 2); + + expect(pm.getValue("spaceUnits")).toBe(2); + expect(pm.getValue("useTabChar")).toBe(true); + expect(pm.getValue("tabSize")).toBe(8); + + // Test the default for the addBefore argument. + pm = new PreferencesManager.PreferencesManager(); + pm.definePreference("spaceUnits", "number", 4); + + pm.addScope("user", userScope); + pm.addScope("project", projectScope); + expect(pm.getValue("spaceUnits")).toBe(4); }); - }); - - afterLast(function () { - PreferencesManager = null; - SpecRunnerUtils.closeTestWindow(); - }); - - beforeEach(function () { - // SpecRunner.js already initializes the unit test instance of - // PreferencesManager to use the unit test key. All we need to do - // here is reset to clear callbacks and in-memory preferences. - PreferencesManager._reset(); - }); - - it("should use default preferences", function () { - var store = PreferencesManager.getPreferenceStorage(CLIENT_ID, {foo: "default"}); - expect(store.getValue("foo")).toEqual("default"); - }); - - describe("Create clientID for preference store", function () { - it("should return clientID for module that exists in extension directories", function () { - spyOn(PreferencesManager, "_getExtensionPaths").andCallFake(function () { - return ['/local/Extension/Folder/Extensions/', - '/User/test/Library/Application Support/Brackets/extensions/user/', - 'c:/Program Files (x86)/Brackets/wwww/extensions/default/']; + + it("handles asynchronously loaded scopes", function () { + // This test will mark storage1's prefs as higher precedence + // than storage2's prefs, but it will pretend to load storage1's + // prefs after storage2's to trigger a possible race. + + // Adding scopes is something that is not likely to happen much + // in extensions... the race is much more possible within + // Brackets itself depending on when the preferences load. + // Within Brackets itself, the order of scopes is very well defined. + var storage1 = new PreferencesManager.MemoryStorage({ + testKey: 1 }); - - var module = {id: 'utils/Resizer', uri: '/local/Extension/Folder/Extensions/utils/Resizer.js'}; - - var clientID = PreferencesManager.getClientID(module); - expect(clientID).toBe("com.adobe.brackets.utils/Resizer.js"); - - clientID = PreferencesManager.getClientID({id: 'main', uri: '/User/test/Library/Application Support/Brackets/extensions/user/HelloWorld/main.js'}); - expect(clientID).toBe("com.adobe.brackets.HelloWorld/main.js"); - clientID = PreferencesManager.getClientID({id: 'main', uri: 'c:/Program Files (x86)/Brackets/wwww/extensions/default/JSLint/main.js'}); - expect(clientID).toBe("com.adobe.brackets.JSLint/main.js"); - }); - - it("should always return a clientID for a module that doesn't exist in extension directories", function () { - spyOn(PreferencesManager, "_getExtensionPaths").andCallFake(function () { - return []; // no extension directories + var deferred1 = $.Deferred(); + storage1.load = function () { + return deferred1; + }; + + var storage2 = new PreferencesManager.MemoryStorage({ + testKey: 2 }); - - var clientID = PreferencesManager.getClientID({id: 'main', uri: '/path/is/not/an/Extension/directory/someExtension/main.js'}); - expect(clientID).toBe("com.adobe.brackets.main"); + + var deferred2 = $.Deferred(); + storage2.load = function () { + return deferred2; + }; + + var pm = new PreferencesManager.PreferencesManager(); + pm.definePreference("testKey", "number", 0); + pm.addScope("storage1", new PreferencesManager.Scope(storage1), "storage2"); + pm.addScope("storage2", new PreferencesManager.Scope(storage2), "default"); + + expect(pm.getValue("testKey")).toBe(0); + + deferred2.resolve(storage2.data); + expect(pm.getValue("testKey")).toBe(2); + + deferred1.resolve(storage1.data); + expect(pm.getValue("testKey")).toBe(1); + }); + + it("supports layers over the nested scopes", function () { + var pm = new PreferencesManager.PreferencesManager(); + var userScope = new PreferencesManager.Scope(new PreferencesManager.MemoryStorage({ + "spaceUnits": 4, + "language": { + "html": { + "spaceUnits": 2 + }, + "css": { + "spaceUnits": 8 + } + } + })); + pm.addScope("user", userScope); + var layer = new PreferencesManager.LanguageLayer(); + pm.addLayer("language", layer); + + expect(pm.getValue("spaceUnits")).toBe(4); + + layer.setLanguage("html"); + expect(pm.getValue("spaceUnits")).toBe(2); + + layer.setLanguage("css"); + expect(pm.getValue("spaceUnits")).toBe(8); + + layer.setLanguage("python"); + expect(pm.getValue("spaceUnits")).toBe(4); }); }); }); From c5c6c6c922980afb137465b8b8063c6147cf7087 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 7 Oct 2013 16:02:04 -0400 Subject: [PATCH 0071/1140] Fix the test for pending scopes to test properly. --- src/preferences/PreferencesManager.js | 50 +++++++++++++++++++-------- test/spec/PreferencesManager-test.js | 14 +++++--- 2 files changed, 45 insertions(+), 19 deletions(-) diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 36a53da43f9..b411138d73f 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -244,6 +244,10 @@ define(function (require, exports, module) { } }; + function FileStorage(path) { + this.path = path; + } + function Scope(storage) { this.storage = storage; this.data = undefined; @@ -327,29 +331,45 @@ define(function (require, exports, module) { this.setValue("default", id, initial); }, + addToScopeOrder: function (id, addBefore) { + if (!addBefore) { + this._scopeOrder.push(id); + } else { + var addIndex = this._scopeOrder.indexOf(addBefore); + if (addIndex > -1) { + this._scopeOrder.splice(addIndex, 0, id); + } else { + var queue = this._pendingScopes[addBefore]; + if (!queue) { + queue = []; + this._pendingScopes[addBefore] = queue; + } + queue.unshift(id); + } + } + if (this._pendingScopes[id]) { + var pending = this._pendingScopes[id]; + delete this._pendingScopes[id]; + pending.forEach(function (scopeID) { + this.addToScopeOrder(scopeID, id); + }.bind(this)); + } + }, + addScope: function (id, scope, addBefore) { if (this._scopes[id]) { throw new Error("Attempt to redefine preferences scope: " + id); } + var deferred = $.Deferred(); + scope.load().then(function () { this._scopes[id] = scope; - if (!addBefore) { - this._scopeOrder.push(id); - } else { - var addIndex = this._scopeOrder.indexOf(addBefore); - if (addIndex > -1) { - this._scopeOrder.splice(addIndex, 0, id); - } else { - var queue = this._pendingScopes[addBefore]; - if (!queue) { - queue = []; - this._pendingScopes[addBefore] = queue; - } - queue.unshift(id); - } - } + this.addToScopeOrder(id, addBefore); + deferred.resolve(id, scope); }.bind(this)); + + return deferred.promise(); }, addLayer: function (id, layer) { diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js index 54c4204c17b..9d00a2c9b3d 100644 --- a/test/spec/PreferencesManager-test.js +++ b/test/spec/PreferencesManager-test.js @@ -29,7 +29,10 @@ define(function (require, exports, module) { 'use strict'; // Load dependent modules - var PreferencesManager = require("preferences/PreferencesManager"); + var PreferencesManager = require("preferences/PreferencesManager"), + SpecRunnerUtils = require("spec/SpecRunnerUtils"); + + var testPath = SpecRunnerUtils.getTestPath("/spec/PreferencesManager-test-files"); describe("Preferences Manager", function () { describe("Memory Storage", function () { @@ -148,10 +151,10 @@ define(function (require, exports, module) { expect(pm.getValue("testKey")).toBe(0); - deferred2.resolve(storage2.data); - expect(pm.getValue("testKey")).toBe(2); - deferred1.resolve(storage1.data); + expect(pm.getValue("testKey")).toBe(0); + + deferred2.resolve(storage2.data); expect(pm.getValue("testKey")).toBe(1); }); @@ -183,6 +186,9 @@ define(function (require, exports, module) { layer.setLanguage("python"); expect(pm.getValue("spaceUnits")).toBe(4); }); + + it("can load preferences from disk", function () { + }); }); }); }); From 8705bbbee969b0db44480b4ed7a87c3d1f151ee8 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Mon, 7 Oct 2013 13:25:58 -0700 Subject: [PATCH 0072/1140] Fix new file (in project). --- src/document/DocumentCommandHandlers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index 63244573938..69b2e44c58f 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -366,7 +366,7 @@ define(function (require, exports, module) { var path = dir + "/" + suggestedName; var entry = isFolder ? fileSystem.getDirectoryForPath(path) : fileSystem.getFileForPath(path); - entry.exists().done(function (exists) { + entry.exists(function (exists) { if (exists) { //file exists, notify to the next progress result.notify(baseFileName + "-" + _nextUntitledIndexToUse + fileExt, _nextUntitledIndexToUse + 1); From b6b0c29d66a49536bd985000617fa72784c6919d Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 7 Oct 2013 18:52:01 -0400 Subject: [PATCH 0073/1140] Adds file loading --- src/preferences/PreferencesManager.js | 38 ++++++++++++++++++- .../brackets.settings.json | 8 ++++ test/spec/PreferencesManager-test.js | 18 ++++++++- 3 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 test/spec/PreferencesManager-test-files/brackets.settings.json diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index b411138d73f..19fe30e6f3d 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -35,6 +35,7 @@ define(function (require, exports, module) { var OldPreferenceStorage = require("preferences/PreferenceStorage").PreferenceStorage, FileUtils = require("file/FileUtils"), + NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem, ExtensionLoader = require("utils/ExtensionLoader"), CollectionUtils = require("utils/CollectionUtils"); @@ -248,6 +249,32 @@ define(function (require, exports, module) { this.path = path; } + FileStorage.prototype = { + load: function () { + var result = $.Deferred(); + var path = this.path; + NativeFileSystem.resolveNativeFileSystemPath(path, function (entry) { + FileUtils.readAsText(entry) + .then(function (text) { + try { + result.resolve(JSON.parse(text)); + } catch (e) { + result.reject("Invalid JSON settings at " + path + "(" + e.toString() + ")"); + } + }) + .fail(function (error) { + result.reject(error); + }); + }, function (error) { + result.reject(error); + }); + return result.promise(); + }, + + save: function (newData) { + } + }; + function Scope(storage) { this.storage = storage; this.data = undefined; @@ -333,7 +360,7 @@ define(function (require, exports, module) { addToScopeOrder: function (id, addBefore) { if (!addBefore) { - this._scopeOrder.push(id); + this._scopeOrder.unshift(id); } else { var addIndex = this._scopeOrder.indexOf(addBefore); if (addIndex > -1) { @@ -372,6 +399,14 @@ define(function (require, exports, module) { return deferred.promise(); }, + removeScope: function (id) { + delete this._scopes[id]; + var scopeIndex = this._scopeOrder.indexOf(id); + if (scopeIndex > -1) { + this._scopeOrder.splice(scopeIndex, 1); + } + }, + addLayer: function (id, layer) { if (this._layers[id]) { throw new Error("Attempt to redefine preferences layer: " + id); @@ -408,4 +443,5 @@ define(function (require, exports, module) { exports.Scope = Scope; exports.MemoryStorage = MemoryStorage; exports.LanguageLayer = LanguageLayer; + exports.FileStorage = FileStorage; }); \ No newline at end of file diff --git a/test/spec/PreferencesManager-test-files/brackets.settings.json b/test/spec/PreferencesManager-test-files/brackets.settings.json new file mode 100644 index 00000000000..bb8e6f5009b --- /dev/null +++ b/test/spec/PreferencesManager-test-files/brackets.settings.json @@ -0,0 +1,8 @@ +{ + "spaceUnits": 92, + "language": { + "go": { + "spaceUnits": 27 + } + } +} \ No newline at end of file diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js index 9d00a2c9b3d..182f44abb51 100644 --- a/test/spec/PreferencesManager-test.js +++ b/test/spec/PreferencesManager-test.js @@ -22,7 +22,7 @@ */ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global $, define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, beforeFirst, afterLast, spyOn */ +/*global $, define, describe, it, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, beforeFirst, afterLast, spyOn */ /*unittests: Preferences Manager*/ define(function (require, exports, module) { @@ -114,7 +114,9 @@ define(function (require, exports, module) { pm.addScope("user", userScope); pm.addScope("project", projectScope); - expect(pm.getValue("spaceUnits")).toBe(4); + expect(pm.getValue("spaceUnits")).toBe(2); + pm.removeScope("project"); + expect(pm.getValue("spaceUnits")).toBe(8); }); it("handles asynchronously loaded scopes", function () { @@ -188,6 +190,18 @@ define(function (require, exports, module) { }); it("can load preferences from disk", function () { + var filestorage = new PreferencesManager.FileStorage(testPath + "/brackets.settings.json"); + var pm = new PreferencesManager.PreferencesManager(); + var projectScope = new PreferencesManager.Scope(filestorage); + waitsForDone(pm.addScope("project", projectScope)); + runs(function () { + expect(pm.getValue("spaceUnits")).toBe(92); + + var layer = new PreferencesManager.LanguageLayer(); + layer.setLanguage("go"); + pm.addLayer("language", layer); + expect(pm.getValue("spaceUnits")).toBe(27); + }); }); }); }); From 29ad888fe08779c7259802049d7c75f7e73a53d8 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Mon, 7 Oct 2013 18:07:54 -0700 Subject: [PATCH 0074/1140] Add error codes. --- src/LiveDevelopment/LiveDevelopment.js | 2 +- src/document/DocumentCommandHandlers.js | 2 +- src/document/DocumentManager.js | 2 +- src/file/FileUtils.js | 12 ++++---- src/filesystem/Error.js | 41 +++++++++++++++++++++++++ src/project/FileSyncManager.js | 6 ++-- src/project/ProjectManager.js | 12 +++++--- test/spec/ExtensionManager-test.js | 1 - test/spec/ProjectManager-test.js | 5 +-- test/spec/SpecRunnerUtils.js | 7 +++-- 10 files changed, 67 insertions(+), 23 deletions(-) create mode 100644 src/filesystem/Error.js diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index 55bf4f6e0d9..d4293a59f5a 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -84,7 +84,7 @@ define(function LiveDevelopment(require, exports, module) { FileServer = require("LiveDevelopment/Servers/FileServer").FileServer, FileUtils = require("file/FileUtils"), LiveDevServerManager = require("LiveDevelopment/LiveDevServerManager"), - NativeFileError = require("file/NativeFileError"), + NativeFileError = require("file/NativeFileError"), // TODO: FileSystem - add app error codes? NativeApp = require("utils/NativeApp"), PreferencesDialogs = require("preferences/PreferencesDialogs"), ProjectManager = require("project/ProjectManager"), diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index 69b2e44c58f..800a54ecc28 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -519,7 +519,7 @@ define(function (require, exports, module) { * Reverts the Document to the current contents of its file on disk. Discards any unsaved changes * in the Document. * @param {Document} doc - * @return {$.Promise} a Promise that's resolved when done, or rejected with a NativeFileError if the + * @return {$.Promise} a Promise that's resolved when done, or rejected with a filesystem.Error if the * file cannot be read (after showing an error dialog to the user). */ function doRevert(doc) { diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 90f17671d16..3050ae69aac 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -592,7 +592,7 @@ define(function (require, exports, module) { * * @param {!string} fullPath * @return {$.Promise} A promise object that will be resolved with the Document, or rejected - * with a NativeFileError if the file is not yet open and can't be read from disk. + * with a filesystem.Error if the file is not yet open and can't be read from disk. */ function getDocumentForPath(fullPath) { var doc = _openDocuments[fullPath], diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js index 725e703f975..2fb16d48732 100644 --- a/src/file/FileUtils.js +++ b/src/file/FileUtils.js @@ -33,7 +33,7 @@ define(function (require, exports, module) { require("utils/Global"); - var NativeFileError = require("file/NativeFileError"), + var Error = require("filesystem/Error"), PerfUtils = require("utils/PerfUtils"), Dialogs = require("widgets/Dialogs"), DefaultDialogs = require("widgets/DefaultDialogs"), @@ -45,7 +45,7 @@ define(function (require, exports, module) { * Asynchronously reads a file as UTF-8 encoded text. * @param {!File} file File to read * @return {$.Promise} a jQuery promise that will be resolved with the - * file's text content plus its timestamp, or rejected with a NativeFileError if + * file's text content plus its timestamp, or rejected with a filesystem.Error if * the file can not be read. */ function readAsText(file) { @@ -74,7 +74,7 @@ define(function (require, exports, module) { * @param {!File} file File to write * @param {!string} text * @return {$.Promise} a jQuery promise that will be resolved when - * file writing completes, or rejected with a NativeFileError. + * file writing completes, or rejected with a filesystem.Error. */ function writeText(file, text) { var result = new $.Deferred(); @@ -141,11 +141,11 @@ define(function (require, exports, module) { // displayed with a generic "(error N)" message. var result; - if (name === NativeFileError.NOT_FOUND_ERR) { + if (name === Error.NOT_FOUND) { result = Strings.NOT_FOUND_ERR; - } else if (name === NativeFileError.NOT_READABLE_ERR) { + } else if (name === Error.NOT_READABLE) { result = Strings.NOT_READABLE_ERR; - } else if (name === NativeFileError.NO_MODIFICATION_ALLOWED_ERR) { + } else if (name === Error.NOT_WRITABLE) { result = Strings.NO_MODIFICATION_ALLOWED_ERR_FILE; } else { result = StringUtils.format(Strings.GENERIC_ERROR, name); diff --git a/src/filesystem/Error.js b/src/filesystem/Error.js new file mode 100644 index 00000000000..3236b2a385c --- /dev/null +++ b/src/filesystem/Error.js @@ -0,0 +1,41 @@ +/* + * 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, regexp: true, indent: 4, maxerr: 50 */ +/*global define */ + +define(function (require, exports, module) { + "use strict"; + + module.exports = { + UNKNOWN : "Unknown", + INVALID_PARAMS : "InvalidParams", + NOT_FOUND : "NotFound", + NOT_READABLE : "NotReadable", + NOT_WRITABLE : "NotWritable", + OUT_OF_SPACE : "OutOfSpace", + ALREADY_EXISTS : "AlreadyExists" + // TODO: Add remote connection errors: timeout, not logged in, connection err, etc. + }; +}); diff --git a/src/project/FileSyncManager.js b/src/project/FileSyncManager.js index d1e0b6352e8..697f7aab42f 100644 --- a/src/project/FileSyncManager.js +++ b/src/project/FileSyncManager.js @@ -51,7 +51,7 @@ define(function (require, exports, module) { Strings = require("strings"), StringUtils = require("utils/StringUtils"), FileUtils = require("file/FileUtils"), - NativeFileError = require("file/NativeFileError"); + Error = require("filesystem/Error"); /** @@ -118,7 +118,7 @@ define(function (require, exports, module) { } else { // File has been deleted externally // TODO: FileSystem error... - if (err.name === NativeFileError.NOT_FOUND_ERR) { + if (err === Error.NOT_FOUND) { if (doc.isDirty) { deleteConflicts.push(doc); } else { @@ -164,7 +164,7 @@ define(function (require, exports, module) { }, function (error) { // File has been deleted externally - if (error.name === NativeFileError.NOT_FOUND_ERR) { + if (error === Error.NOT_FOUND) { DocumentManager.notifyFileDeleted(file); result.resolve(); } else { diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index fbe4e8e2caa..cb4c74cde30 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -66,7 +66,7 @@ define(function (require, exports, module) { ViewUtils = require("utils/ViewUtils"), CollectionUtils = require("utils/CollectionUtils"), FileUtils = require("file/FileUtils"), - NativeFileError = require("file/NativeFileError"), + Error = require("filesystem/Error"), Urls = require("i18n!nls/urls"), KeyEvent = require("utils/KeyEvent"), Async = require("utils/Async"), @@ -1301,24 +1301,26 @@ define(function (require, exports, module) { var errorCallback = function (error) { var entryType = isFolder ? Strings.DIRECTORY : Strings.FILE, oppositeEntryType = isFolder ? Strings.FILE : Strings.DIRECTORY; - if (error.name === NativeFileError.PATH_EXISTS_ERR) { + if (error === Error.ALREADY_EXISTS) { Dialogs.showModalDialog( DefaultDialogs.DIALOG_ID_ERROR, StringUtils.format(Strings.INVALID_FILENAME_TITLE, entryType), StringUtils.format(Strings.FILE_ALREADY_EXISTS, entryType, StringUtils.breakableUrl(data.rslt.name)) ); - } else if (error.name === NativeFileError.TYPE_MISMATCH_ERR) { + /* TODO: FileSystem error? + } else if (error === NativeFileError.TYPE_MISMATCH_ERR) { Dialogs.showModalDialog( DefaultDialogs.DIALOG_ID_ERROR, StringUtils.format(Strings.INVALID_FILENAME_TITLE, entryType), StringUtils.format(Strings.FILE_ALREADY_EXISTS, oppositeEntryType, StringUtils.breakableUrl(data.rslt.name)) ); + */ } else { - var errString = error.name === NativeFileError.NO_MODIFICATION_ALLOWED_ERR ? + var errString = error === Error.NOT_WRITABLE ? Strings.NO_MODIFICATION_ALLOWED_ERR : - StringUtils.format(Strings.GENERIC_ERROR, error.name); + StringUtils.format(Strings.GENERIC_ERROR, error); Dialogs.showModalDialog( DefaultDialogs.DIALOG_ID_ERROR, diff --git a/test/spec/ExtensionManager-test.js b/test/spec/ExtensionManager-test.js index 29a2b167116..7c769a6c12c 100644 --- a/test/spec/ExtensionManager-test.js +++ b/test/spec/ExtensionManager-test.js @@ -40,7 +40,6 @@ define(function (require, exports, module) { InstallExtensionDialog = require("extensibility/InstallExtensionDialog"), Package = require("extensibility/Package"), ExtensionLoader = require("utils/ExtensionLoader"), - NativeFileError = require("file/NativeFileError"), SpecRunnerUtils = require("spec/SpecRunnerUtils"), CollectionUtils = require("utils/CollectionUtils"), NativeApp = require("utils/NativeApp"), diff --git a/test/spec/ProjectManager-test.js b/test/spec/ProjectManager-test.js index 87d660babd3..32764305afa 100644 --- a/test/spec/ProjectManager-test.js +++ b/test/spec/ProjectManager-test.js @@ -33,6 +33,7 @@ define(function (require, exports, module) { Dialogs = require("widgets/Dialogs"), DefaultDialogs = require("widgets/DefaultDialogs"), Commands = require("command/Commands"), + Error = require("filesystem/Error"), SpecRunnerUtils = require("spec/SpecRunnerUtils"); @@ -311,7 +312,7 @@ define(function (require, exports, module) { waitsFor(function () { return complete; }, 1000); runs(function () { - expect(error).toBe(brackets.fs.ERR_NOT_FOUND); + expect(error).toBe(Error.NOT_FOUND); // Verify that some other file is selected in the project tree. var curSelectedFile = ProjectManager.getSelectedItem(); @@ -460,7 +461,7 @@ define(function (require, exports, module) { waitsFor(function () { return complete; }, 1000); runs(function () { - expect(error).toBe(brackets.fs.ERR_NOT_FOUND); + expect(error).toBe(Error.NOT_FOUND); // Verify that some other file is selected in the project tree. var curSelectedFile = ProjectManager.getSelectedItem(); diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index 2a4f2cc09d7..16a0945cddc 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -33,6 +33,7 @@ define(function (require, exports, module) { DocumentManager = require("document/DocumentManager"), Editor = require("editor/Editor").Editor, EditorManager = require("editor/EditorManager"), + Error = require("filesystem/Error"), PanelManager = require("view/PanelManager"), ExtensionLoader = require("utils/ExtensionLoader"), UrlParams = require("utils/UrlParams").UrlParams, @@ -67,7 +68,7 @@ define(function (require, exports, module) { result.resolve(); } else { // TODO: fix error code - if (err === brackets.fs.ERR_NOT_FOUND && silent) { + if (err === Error.NOT_FOUND && silent) { result.resolve(); } else { console.error("Unable to remove " + fullPath, err); @@ -76,7 +77,7 @@ define(function (require, exports, module) { } }); } else { - if (err === brackets.fs.ERR_NOT_FOUND && silent) { + if (err === Error.NOT_FOUND && silent) { result.resolve(); } else { result.reject(err); @@ -276,7 +277,7 @@ define(function (require, exports, module) { chmod(folder, 777).then(deferred.resolve, deferred.reject); }) .fail(function (err) { - if (err === brackets.fs.ERR_NOT_FOUND) { + if (err === Error.NOT_FOUND) { // Resolve the promise since the folder to reset doesn't exist deferred.resolve(); } else { From 9465fc30ff995c68f89b3331c3fc0dd35e1f28d1 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 7 Oct 2013 21:59:46 -0400 Subject: [PATCH 0075/1140] Adds pref saving --- src/preferences/PreferencesManager.js | 36 +++++++++++++++++-- test/spec/PreferencesManager-test.js | 50 +++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 3 deletions(-) diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 19fe30e6f3d..35ab6629d94 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -37,7 +37,8 @@ define(function (require, exports, module) { FileUtils = require("file/FileUtils"), NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem, ExtensionLoader = require("utils/ExtensionLoader"), - CollectionUtils = require("utils/CollectionUtils"); + CollectionUtils = require("utils/CollectionUtils"), + Async = require("utils/Async"); /** * The local storage ID @@ -263,7 +264,7 @@ define(function (require, exports, module) { } }) .fail(function (error) { - result.reject(error); + result.reject("Unable to load prefs at " + path + " " + error); }); }, function (error) { result.reject(error); @@ -272,6 +273,24 @@ define(function (require, exports, module) { }, save: function (newData) { + var result = $.Deferred(); + var path = this.path; + NativeFileSystem.resolveNativeFileSystemPath(path, function (entry) { + try { + FileUtils.writeText(entry, JSON.stringify(newData)) + .then(function (text) { + result.resolve(); + }) + .fail(function (error) { + result.reject("Unable to save prefs at " + path + " " + error); + }); + } catch (e) { + result.reject("Unable to convert prefs to JSON" + e.toString()); + } + }, function (error) { + result.reject(error); + }); + return result.promise(); } }; @@ -292,7 +311,11 @@ define(function (require, exports, module) { }, save: function () { - return this.storage.save(this.data); + if (this._dirty) { + return this.storage.save(this.data); + } else { + return $.Deferred().resolve().promise(); + } }, setValue: function (id, value) { @@ -436,6 +459,13 @@ define(function (require, exports, module) { return result; } } + }, + + save: function () { + return Async.doInParallel(this._scopeOrder, function (id) { + var scope = this._scopes[id]; + return scope.save(); + }.bind(this)); } }; diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js index 182f44abb51..b80f1d695b2 100644 --- a/test/spec/PreferencesManager-test.js +++ b/test/spec/PreferencesManager-test.js @@ -30,6 +30,8 @@ define(function (require, exports, module) { // Load dependent modules var PreferencesManager = require("preferences/PreferencesManager"), + NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem, + FileUtils = require("file/FileUtils"), SpecRunnerUtils = require("spec/SpecRunnerUtils"); var testPath = SpecRunnerUtils.getTestPath("/spec/PreferencesManager-test-files"); @@ -188,6 +190,39 @@ define(function (require, exports, module) { layer.setLanguage("python"); expect(pm.getValue("spaceUnits")).toBe(4); }); + }); + + describe("File Storage", function () { + var settingsFile = testPath + "/brackets.settings.json", + filestorage, + fileEntry, + originalText; + + beforeFirst(function () { + var deferred = $.Deferred(); + NativeFileSystem.resolveNativeFileSystemPath(settingsFile, function (entry) { + fileEntry = entry; + FileUtils.readAsText(fileEntry) + .then(function (text) { + originalText = text; + deferred.resolve(); + }) + .fail(function (error) { + deferred.reject(error); + }); + }, function (error) { + deferred.reject(error); + }); + waitsForDone(deferred.promise()); + }); + + beforeEach(function () { + filestorage = new PreferencesManager.FileStorage(settingsFile); + }); + + afterEach(function () { + waitsForDone(FileUtils.writeText(fileEntry, originalText)); + }); it("can load preferences from disk", function () { var filestorage = new PreferencesManager.FileStorage(testPath + "/brackets.settings.json"); @@ -203,6 +238,21 @@ define(function (require, exports, module) { expect(pm.getValue("spaceUnits")).toBe(27); }); }); + + it("can save preferences", function () { + var filestorage = new PreferencesManager.FileStorage(testPath + "/brackets.settings.json"); + var pm = new PreferencesManager.PreferencesManager(); + var projectScope = new PreferencesManager.Scope(filestorage); + waitsForDone(pm.addScope("project", projectScope)); + runs(function () { + var memstorage = new PreferencesManager.MemoryStorage(); + pm.addScope("session", new PreferencesManager.Scope(memstorage)); + pm.setValue("session", "unicorn-filled", true); +// pm.setValue("project", "unicorn-filled", false); + pm.save(); + expect(memstorage.data["unicorn-filled"]).toBe(true); + }); + }); }); }); }); From 002f871eda7512c11bc6c27235a6afeb2cd35480 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 7 Oct 2013 22:09:42 -0400 Subject: [PATCH 0076/1140] Dividing code between the preferences infrastructure and Brackets' use of it. --- src/preferences/PreferencesBase.js | 289 ++++++++++++++++++ src/preferences/PreferencesManager.js | 250 --------------- test/UnitTestSuite.js | 1 + .../brackets.settings.json | 0 test/spec/PreferencesBase-test.js | 258 ++++++++++++++++ test/spec/PreferencesManager-test.js | 258 ---------------- 6 files changed, 548 insertions(+), 508 deletions(-) create mode 100644 src/preferences/PreferencesBase.js rename test/spec/{PreferencesManager-test-files => PreferencesBase-test-files}/brackets.settings.json (100%) create mode 100644 test/spec/PreferencesBase-test.js diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js new file mode 100644 index 00000000000..5dc1ac5bcf4 --- /dev/null +++ b/src/preferences/PreferencesBase.js @@ -0,0 +1,289 @@ +/* + * 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, $, localStorage */ +/*unittests: Preferences Base */ + +/** + * Base infrastructure for managing preferences. + * + */ +define(function (require, exports, module) { + "use strict"; + + var FileUtils = require("file/FileUtils"), + NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem, + ExtensionLoader = require("utils/ExtensionLoader"), + CollectionUtils = require("utils/CollectionUtils"), + Async = require("utils/Async"); + + function MemoryStorage(data) { + this.data = data || {}; + } + + MemoryStorage.prototype = { + load: function () { + var result = $.Deferred(); + result.resolve(this.data); + return result.promise(); + }, + + save: function (newData) { + var result = $.Deferred(); + this.data = newData; + result.resolve(); + return result.promise(); + } + }; + + function FileStorage(path) { + this.path = path; + } + + FileStorage.prototype = { + load: function () { + var result = $.Deferred(); + var path = this.path; + NativeFileSystem.resolveNativeFileSystemPath(path, function (entry) { + FileUtils.readAsText(entry) + .then(function (text) { + try { + result.resolve(JSON.parse(text)); + } catch (e) { + result.reject("Invalid JSON settings at " + path + "(" + e.toString() + ")"); + } + }) + .fail(function (error) { + result.reject("Unable to load prefs at " + path + " " + error); + }); + }, function (error) { + result.reject(error); + }); + return result.promise(); + }, + + save: function (newData) { + var result = $.Deferred(); + var path = this.path; + NativeFileSystem.resolveNativeFileSystemPath(path, function (entry) { + try { + FileUtils.writeText(entry, JSON.stringify(newData)) + .then(function (text) { + result.resolve(); + }) + .fail(function (error) { + result.reject("Unable to save prefs at " + path + " " + error); + }); + } catch (e) { + result.reject("Unable to convert prefs to JSON" + e.toString()); + } + }, function (error) { + result.reject(error); + }); + return result.promise(); + } + }; + + function Scope(storage) { + this.storage = storage; + this.data = undefined; + this._dirty = false; + } + + Scope.prototype = { + load: function () { + var result = $.Deferred(); + this.storage.load().then(function (data) { + this.data = data; + result.resolve(); + }.bind(this)); + return result.promise(); + }, + + save: function () { + if (this._dirty) { + return this.storage.save(this.data); + } else { + return $.Deferred().resolve().promise(); + } + }, + + setValue: function (id, value) { + this._dirty = true; + this.data[id] = value; + }, + + getValue: function (id, layers) { + var layerCounter; + for (layerCounter = 0; layerCounter < layers.length; layerCounter++) { + var result = layers[layerCounter](this.data, id); + if (result !== undefined) { + return result; + } + } + return this.data[id]; + } + }; + + function LanguageLayer() { + } + + LanguageLayer.prototype = { + setLanguage: function (languageID) { + this.language = languageID; + }, + + getValue: function (data, id) { + if (data.language && data.language[this.language]) { + return data.language[this.language][id]; + } + } + }; + + function PreferencesManager() { + this._knownPrefs = {}; + this._scopes = { + "default": new Scope(new MemoryStorage()) + }; + + // Memory-based scope loads synchronously + this._scopes["default"].load(); + this._scopeOrder = ["default"]; + this._pendingScopes = {}; + + + this._layers = {}; + this._layerGetters = []; + } + + PreferencesManager.prototype = { + definePreference: function (id, type, initial, options) { + options = options || {}; + if (this._knownPrefs.hasOwnProperty(id)) { + throw new Error("Preference " + id + " was redefined"); + } + this._knownPrefs[id] = { + type: type, + initial: initial, + name: options.name, + description: options.description + }; + this.setValue("default", id, initial); + }, + + addToScopeOrder: function (id, addBefore) { + if (!addBefore) { + this._scopeOrder.unshift(id); + } else { + var addIndex = this._scopeOrder.indexOf(addBefore); + if (addIndex > -1) { + this._scopeOrder.splice(addIndex, 0, id); + } else { + var queue = this._pendingScopes[addBefore]; + if (!queue) { + queue = []; + this._pendingScopes[addBefore] = queue; + } + queue.unshift(id); + } + } + if (this._pendingScopes[id]) { + var pending = this._pendingScopes[id]; + delete this._pendingScopes[id]; + pending.forEach(function (scopeID) { + this.addToScopeOrder(scopeID, id); + }.bind(this)); + } + }, + + addScope: function (id, scope, addBefore) { + if (this._scopes[id]) { + throw new Error("Attempt to redefine preferences scope: " + id); + } + + var deferred = $.Deferred(); + + scope.load().then(function () { + this._scopes[id] = scope; + this.addToScopeOrder(id, addBefore); + deferred.resolve(id, scope); + }.bind(this)); + + return deferred.promise(); + }, + + removeScope: function (id) { + delete this._scopes[id]; + var scopeIndex = this._scopeOrder.indexOf(id); + if (scopeIndex > -1) { + this._scopeOrder.splice(scopeIndex, 1); + } + }, + + addLayer: function (id, layer) { + if (this._layers[id]) { + throw new Error("Attempt to redefine preferences layer: " + id); + } + this._layers[id] = layer; + this._layerGetters.push(layer.getValue.bind(layer)); + }, + + setValue: function (scopeName, id, value) { + var scope = this._scopes[scopeName]; + if (!scope) { + throw new Error("Attempt to set preference in non-existent scope: " + scopeName); + } + + scope.setValue(id, value); + }, + + getValue: function (id, value) { + var scopeCounter, + scopeOrder = this._scopeOrder, + layerGetters = this._layerGetters; + + for (scopeCounter = 0; scopeCounter < scopeOrder.length; scopeCounter++) { + var scope = this._scopes[scopeOrder[scopeCounter]]; + var result = scope.getValue(id, layerGetters); + if (result !== undefined) { + return result; + } + } + }, + + save: function () { + return Async.doInParallel(this._scopeOrder, function (id) { + var scope = this._scopes[id]; + return scope.save(); + }.bind(this)); + } + }; + + exports.PreferencesManager = PreferencesManager; + exports.Scope = Scope; + exports.MemoryStorage = MemoryStorage; + exports.LanguageLayer = LanguageLayer; + exports.FileStorage = FileStorage; +}); \ No newline at end of file diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 35ab6629d94..7b37ccde900 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -224,254 +224,4 @@ define(function (require, exports, module) { // Unit test use only exports._reset = _reset; exports._getExtensionPaths = _getExtensionPaths; - - // New implementation follows. Everything above is deprecated. - - function MemoryStorage(data) { - this.data = data || {}; - } - - MemoryStorage.prototype = { - load: function () { - var result = $.Deferred(); - result.resolve(this.data); - return result.promise(); - }, - - save: function (newData) { - var result = $.Deferred(); - this.data = newData; - result.resolve(); - return result.promise(); - } - }; - - function FileStorage(path) { - this.path = path; - } - - FileStorage.prototype = { - load: function () { - var result = $.Deferred(); - var path = this.path; - NativeFileSystem.resolveNativeFileSystemPath(path, function (entry) { - FileUtils.readAsText(entry) - .then(function (text) { - try { - result.resolve(JSON.parse(text)); - } catch (e) { - result.reject("Invalid JSON settings at " + path + "(" + e.toString() + ")"); - } - }) - .fail(function (error) { - result.reject("Unable to load prefs at " + path + " " + error); - }); - }, function (error) { - result.reject(error); - }); - return result.promise(); - }, - - save: function (newData) { - var result = $.Deferred(); - var path = this.path; - NativeFileSystem.resolveNativeFileSystemPath(path, function (entry) { - try { - FileUtils.writeText(entry, JSON.stringify(newData)) - .then(function (text) { - result.resolve(); - }) - .fail(function (error) { - result.reject("Unable to save prefs at " + path + " " + error); - }); - } catch (e) { - result.reject("Unable to convert prefs to JSON" + e.toString()); - } - }, function (error) { - result.reject(error); - }); - return result.promise(); - } - }; - - function Scope(storage) { - this.storage = storage; - this.data = undefined; - this._dirty = false; - } - - Scope.prototype = { - load: function () { - var result = $.Deferred(); - this.storage.load().then(function (data) { - this.data = data; - result.resolve(); - }.bind(this)); - return result.promise(); - }, - - save: function () { - if (this._dirty) { - return this.storage.save(this.data); - } else { - return $.Deferred().resolve().promise(); - } - }, - - setValue: function (id, value) { - this._dirty = true; - this.data[id] = value; - }, - - getValue: function (id, layers) { - var layerCounter; - for (layerCounter = 0; layerCounter < layers.length; layerCounter++) { - var result = layers[layerCounter](this.data, id); - if (result !== undefined) { - return result; - } - } - return this.data[id]; - } - }; - - function LanguageLayer() { - } - - LanguageLayer.prototype = { - setLanguage: function (languageID) { - this.language = languageID; - }, - - getValue: function (data, id) { - if (data.language && data.language[this.language]) { - return data.language[this.language][id]; - } - } - }; - - function PreferencesManager() { - this._knownPrefs = {}; - this._scopes = { - "default": new Scope(new MemoryStorage()) - }; - - // Memory-based scope loads synchronously - this._scopes["default"].load(); - this._scopeOrder = ["default"]; - this._pendingScopes = {}; - - - this._layers = {}; - this._layerGetters = []; - } - - PreferencesManager.prototype = { - definePreference: function (id, type, initial, options) { - options = options || {}; - if (this._knownPrefs.hasOwnProperty(id)) { - throw new Error("Preference " + id + " was redefined"); - } - this._knownPrefs[id] = { - type: type, - initial: initial, - name: options.name, - description: options.description - }; - this.setValue("default", id, initial); - }, - - addToScopeOrder: function (id, addBefore) { - if (!addBefore) { - this._scopeOrder.unshift(id); - } else { - var addIndex = this._scopeOrder.indexOf(addBefore); - if (addIndex > -1) { - this._scopeOrder.splice(addIndex, 0, id); - } else { - var queue = this._pendingScopes[addBefore]; - if (!queue) { - queue = []; - this._pendingScopes[addBefore] = queue; - } - queue.unshift(id); - } - } - if (this._pendingScopes[id]) { - var pending = this._pendingScopes[id]; - delete this._pendingScopes[id]; - pending.forEach(function (scopeID) { - this.addToScopeOrder(scopeID, id); - }.bind(this)); - } - }, - - addScope: function (id, scope, addBefore) { - if (this._scopes[id]) { - throw new Error("Attempt to redefine preferences scope: " + id); - } - - var deferred = $.Deferred(); - - scope.load().then(function () { - this._scopes[id] = scope; - this.addToScopeOrder(id, addBefore); - deferred.resolve(id, scope); - }.bind(this)); - - return deferred.promise(); - }, - - removeScope: function (id) { - delete this._scopes[id]; - var scopeIndex = this._scopeOrder.indexOf(id); - if (scopeIndex > -1) { - this._scopeOrder.splice(scopeIndex, 1); - } - }, - - addLayer: function (id, layer) { - if (this._layers[id]) { - throw new Error("Attempt to redefine preferences layer: " + id); - } - this._layers[id] = layer; - this._layerGetters.push(layer.getValue.bind(layer)); - }, - - setValue: function (scopeName, id, value) { - var scope = this._scopes[scopeName]; - if (!scope) { - throw new Error("Attempt to set preference in non-existent scope: " + scopeName); - } - - scope.setValue(id, value); - }, - - getValue: function (id, value) { - var scopeCounter, - scopeOrder = this._scopeOrder, - layerGetters = this._layerGetters; - - for (scopeCounter = 0; scopeCounter < scopeOrder.length; scopeCounter++) { - var scope = this._scopes[scopeOrder[scopeCounter]]; - var result = scope.getValue(id, layerGetters); - if (result !== undefined) { - return result; - } - } - }, - - save: function () { - return Async.doInParallel(this._scopeOrder, function (id) { - var scope = this._scopes[id]; - return scope.save(); - }.bind(this)); - } - }; - - exports.PreferencesManager = PreferencesManager; - exports.Scope = Scope; - exports.MemoryStorage = MemoryStorage; - exports.LanguageLayer = LanguageLayer; - exports.FileStorage = FileStorage; }); \ No newline at end of file diff --git a/test/UnitTestSuite.js b/test/UnitTestSuite.js index b1b43bbf9a9..8846e4f56b1 100644 --- a/test/UnitTestSuite.js +++ b/test/UnitTestSuite.js @@ -59,6 +59,7 @@ define(function (require, exports, module) { require("spec/NativeFileSystem-test"); require("spec/NativeMenu-test"); require("spec/NodeConnection-test"); + require("spec/PreferencesBase-test"); require("spec/PreferencesManager-test"); require("spec/ProjectManager-test"); require("spec/QuickOpen-test"); diff --git a/test/spec/PreferencesManager-test-files/brackets.settings.json b/test/spec/PreferencesBase-test-files/brackets.settings.json similarity index 100% rename from test/spec/PreferencesManager-test-files/brackets.settings.json rename to test/spec/PreferencesBase-test-files/brackets.settings.json diff --git a/test/spec/PreferencesBase-test.js b/test/spec/PreferencesBase-test.js new file mode 100644 index 00000000000..a97f5c13845 --- /dev/null +++ b/test/spec/PreferencesBase-test.js @@ -0,0 +1,258 @@ +/* + * 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, browser: true, nomen: true, indent: 4, maxerr: 50 */ +/*global $, define, describe, it, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, beforeFirst, afterLast, spyOn */ +/*unittests: Preferences Base*/ + +define(function (require, exports, module) { + 'use strict'; + + // Load dependent modules + var PreferencesBase = require("preferences/PreferencesBase"), + NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem, + FileUtils = require("file/FileUtils"), + SpecRunnerUtils = require("spec/SpecRunnerUtils"); + + var testPath = SpecRunnerUtils.getTestPath("/spec/PreferencesBase-test-files"); + + describe("Preferences Base", function () { + describe("Memory Storage", function () { + it("should support get and save operations", function () { + var sampleData = { + foo: 1, + bar: 2 + }; + + var storage = new PreferencesBase.MemoryStorage(sampleData); + + // This storage is synchronous + storage.load().then(function (data) { + expect(data).toEqual(sampleData); + }); + + storage.save({ + foo: 3 + }).then(function () { + expect(storage.data).not.toEqual(sampleData); + expect(storage.data.foo).toEqual(3); + expect(storage.data.bar).not.toBeDefined(); + }); + }); + }); + + describe("Preferences Manager", function () { + it("should yield an error if a preference is redefined", function () { + var pm = new PreferencesBase.PreferencesManager(); + pm.definePreference("foo.bar", "string"); + try { + pm.definePreference("foo.bar", "string"); + expect("We should have gotten an exception").toEqual("but we didn't"); + } catch (e) { + } + }); + + it("should find the default values", function () { + var pm = new PreferencesBase.PreferencesManager(); + pm.definePreference("foo.bar", "number", 0); + expect(pm.getValue("nonexistent")).not.toBeDefined(); + expect(pm.getValue("foo.bar")).toBe(0); + }); + + it("should produce an error for setValue on undefined scope", function () { + var pm = new PreferencesBase.PreferencesManager(); + try { + pm.setValue("nonscope", "foo", false); + expect("Should have gotten an error for nonexistent scope").toBe("but didn't"); + } catch (e) { + expect(e.toString().indexOf("scope")).toBeGreaterThan(-1); + } + }); + + it("supports nested scopes", function () { + var pm = new PreferencesBase.PreferencesManager(); + pm.definePreference("useTabChar", "boolean", false); + pm.definePreference("tabSize", "number", 4); + pm.definePreference("spaceUnits", "number", 4); + var userScope = new PreferencesBase.Scope(new PreferencesBase.MemoryStorage()); + var projectScope = new PreferencesBase.Scope(new PreferencesBase.MemoryStorage()); + pm.addScope("user", userScope, "default"); + pm.addScope("project", projectScope, "user"); + + expect(pm.getValue("spaceUnits")).toEqual(4); + + pm.setValue("user", "useTabChar", true); + pm.setValue("user", "tabSize", 8); + pm.setValue("user", "spaceUnits", 8); + pm.setValue("project", "spaceUnits", 2); + + expect(pm.getValue("spaceUnits")).toBe(2); + expect(pm.getValue("useTabChar")).toBe(true); + expect(pm.getValue("tabSize")).toBe(8); + + // Test the default for the addBefore argument. + pm = new PreferencesBase.PreferencesManager(); + pm.definePreference("spaceUnits", "number", 4); + + pm.addScope("user", userScope); + pm.addScope("project", projectScope); + expect(pm.getValue("spaceUnits")).toBe(2); + pm.removeScope("project"); + expect(pm.getValue("spaceUnits")).toBe(8); + }); + + it("handles asynchronously loaded scopes", function () { + // This test will mark storage1's prefs as higher precedence + // than storage2's prefs, but it will pretend to load storage1's + // prefs after storage2's to trigger a possible race. + + // Adding scopes is something that is not likely to happen much + // in extensions... the race is much more possible within + // Brackets itself depending on when the preferences load. + // Within Brackets itself, the order of scopes is very well defined. + var storage1 = new PreferencesBase.MemoryStorage({ + testKey: 1 + }); + + var deferred1 = $.Deferred(); + storage1.load = function () { + return deferred1; + }; + + var storage2 = new PreferencesBase.MemoryStorage({ + testKey: 2 + }); + + var deferred2 = $.Deferred(); + storage2.load = function () { + return deferred2; + }; + + var pm = new PreferencesBase.PreferencesManager(); + pm.definePreference("testKey", "number", 0); + pm.addScope("storage1", new PreferencesBase.Scope(storage1), "storage2"); + pm.addScope("storage2", new PreferencesBase.Scope(storage2), "default"); + + expect(pm.getValue("testKey")).toBe(0); + + deferred1.resolve(storage1.data); + expect(pm.getValue("testKey")).toBe(0); + + deferred2.resolve(storage2.data); + expect(pm.getValue("testKey")).toBe(1); + }); + + it("supports layers over the nested scopes", function () { + var pm = new PreferencesBase.PreferencesManager(); + var userScope = new PreferencesBase.Scope(new PreferencesBase.MemoryStorage({ + "spaceUnits": 4, + "language": { + "html": { + "spaceUnits": 2 + }, + "css": { + "spaceUnits": 8 + } + } + })); + pm.addScope("user", userScope); + var layer = new PreferencesBase.LanguageLayer(); + pm.addLayer("language", layer); + + expect(pm.getValue("spaceUnits")).toBe(4); + + layer.setLanguage("html"); + expect(pm.getValue("spaceUnits")).toBe(2); + + layer.setLanguage("css"); + expect(pm.getValue("spaceUnits")).toBe(8); + + layer.setLanguage("python"); + expect(pm.getValue("spaceUnits")).toBe(4); + }); + }); + + describe("File Storage", function () { + var settingsFile = testPath + "/brackets.settings.json", + filestorage, + fileEntry, + originalText; + + beforeFirst(function () { + var deferred = $.Deferred(); + NativeFileSystem.resolveNativeFileSystemPath(settingsFile, function (entry) { + fileEntry = entry; + FileUtils.readAsText(fileEntry) + .then(function (text) { + originalText = text; + deferred.resolve(); + }) + .fail(function (error) { + deferred.reject(error); + }); + }, function (error) { + deferred.reject(error); + }); + waitsForDone(deferred.promise()); + }); + + beforeEach(function () { + filestorage = new PreferencesBase.FileStorage(settingsFile); + }); + + afterEach(function () { + waitsForDone(FileUtils.writeText(fileEntry, originalText)); + }); + + it("can load preferences from disk", function () { + var filestorage = new PreferencesBase.FileStorage(testPath + "/brackets.settings.json"); + var pm = new PreferencesBase.PreferencesManager(); + var projectScope = new PreferencesBase.Scope(filestorage); + waitsForDone(pm.addScope("project", projectScope)); + runs(function () { + expect(pm.getValue("spaceUnits")).toBe(92); + + var layer = new PreferencesBase.LanguageLayer(); + layer.setLanguage("go"); + pm.addLayer("language", layer); + expect(pm.getValue("spaceUnits")).toBe(27); + }); + }); + + it("can save preferences", function () { + var filestorage = new PreferencesBase.FileStorage(testPath + "/brackets.settings.json"); + var pm = new PreferencesBase.PreferencesManager(); + var projectScope = new PreferencesBase.Scope(filestorage); + waitsForDone(pm.addScope("project", projectScope)); + runs(function () { + var memstorage = new PreferencesBase.MemoryStorage(); + pm.addScope("session", new PreferencesBase.Scope(memstorage)); + pm.setValue("session", "unicorn-filled", true); +// pm.setValue("project", "unicorn-filled", false); + pm.save(); + expect(memstorage.data["unicorn-filled"]).toBe(true); + }); + }); + }); + }); +}); diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js index b80f1d695b2..e69de29bb2d 100644 --- a/test/spec/PreferencesManager-test.js +++ b/test/spec/PreferencesManager-test.js @@ -1,258 +0,0 @@ -/* - * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - */ - -/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global $, define, describe, it, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, beforeFirst, afterLast, spyOn */ -/*unittests: Preferences Manager*/ - -define(function (require, exports, module) { - 'use strict'; - - // Load dependent modules - var PreferencesManager = require("preferences/PreferencesManager"), - NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem, - FileUtils = require("file/FileUtils"), - SpecRunnerUtils = require("spec/SpecRunnerUtils"); - - var testPath = SpecRunnerUtils.getTestPath("/spec/PreferencesManager-test-files"); - - describe("Preferences Manager", function () { - describe("Memory Storage", function () { - it("should support get and save operations", function () { - var sampleData = { - foo: 1, - bar: 2 - }; - - var storage = new PreferencesManager.MemoryStorage(sampleData); - - // This storage is synchronous - storage.load().then(function (data) { - expect(data).toEqual(sampleData); - }); - - storage.save({ - foo: 3 - }).then(function () { - expect(storage.data).not.toEqual(sampleData); - expect(storage.data.foo).toEqual(3); - expect(storage.data.bar).not.toBeDefined(); - }); - }); - }); - - describe("Preferences Manager", function () { - it("should yield an error if a preference is redefined", function () { - var pm = new PreferencesManager.PreferencesManager(); - pm.definePreference("foo.bar", "string"); - try { - pm.definePreference("foo.bar", "string"); - expect("We should have gotten an exception").toEqual("but we didn't"); - } catch (e) { - } - }); - - it("should find the default values", function () { - var pm = new PreferencesManager.PreferencesManager(); - pm.definePreference("foo.bar", "number", 0); - expect(pm.getValue("nonexistent")).not.toBeDefined(); - expect(pm.getValue("foo.bar")).toBe(0); - }); - - it("should produce an error for setValue on undefined scope", function () { - var pm = new PreferencesManager.PreferencesManager(); - try { - pm.setValue("nonscope", "foo", false); - expect("Should have gotten an error for nonexistent scope").toBe("but didn't"); - } catch (e) { - expect(e.toString().indexOf("scope")).toBeGreaterThan(-1); - } - }); - - it("supports nested scopes", function () { - var pm = new PreferencesManager.PreferencesManager(); - pm.definePreference("useTabChar", "boolean", false); - pm.definePreference("tabSize", "number", 4); - pm.definePreference("spaceUnits", "number", 4); - var userScope = new PreferencesManager.Scope(new PreferencesManager.MemoryStorage()); - var projectScope = new PreferencesManager.Scope(new PreferencesManager.MemoryStorage()); - pm.addScope("user", userScope, "default"); - pm.addScope("project", projectScope, "user"); - - expect(pm.getValue("spaceUnits")).toEqual(4); - - pm.setValue("user", "useTabChar", true); - pm.setValue("user", "tabSize", 8); - pm.setValue("user", "spaceUnits", 8); - pm.setValue("project", "spaceUnits", 2); - - expect(pm.getValue("spaceUnits")).toBe(2); - expect(pm.getValue("useTabChar")).toBe(true); - expect(pm.getValue("tabSize")).toBe(8); - - // Test the default for the addBefore argument. - pm = new PreferencesManager.PreferencesManager(); - pm.definePreference("spaceUnits", "number", 4); - - pm.addScope("user", userScope); - pm.addScope("project", projectScope); - expect(pm.getValue("spaceUnits")).toBe(2); - pm.removeScope("project"); - expect(pm.getValue("spaceUnits")).toBe(8); - }); - - it("handles asynchronously loaded scopes", function () { - // This test will mark storage1's prefs as higher precedence - // than storage2's prefs, but it will pretend to load storage1's - // prefs after storage2's to trigger a possible race. - - // Adding scopes is something that is not likely to happen much - // in extensions... the race is much more possible within - // Brackets itself depending on when the preferences load. - // Within Brackets itself, the order of scopes is very well defined. - var storage1 = new PreferencesManager.MemoryStorage({ - testKey: 1 - }); - - var deferred1 = $.Deferred(); - storage1.load = function () { - return deferred1; - }; - - var storage2 = new PreferencesManager.MemoryStorage({ - testKey: 2 - }); - - var deferred2 = $.Deferred(); - storage2.load = function () { - return deferred2; - }; - - var pm = new PreferencesManager.PreferencesManager(); - pm.definePreference("testKey", "number", 0); - pm.addScope("storage1", new PreferencesManager.Scope(storage1), "storage2"); - pm.addScope("storage2", new PreferencesManager.Scope(storage2), "default"); - - expect(pm.getValue("testKey")).toBe(0); - - deferred1.resolve(storage1.data); - expect(pm.getValue("testKey")).toBe(0); - - deferred2.resolve(storage2.data); - expect(pm.getValue("testKey")).toBe(1); - }); - - it("supports layers over the nested scopes", function () { - var pm = new PreferencesManager.PreferencesManager(); - var userScope = new PreferencesManager.Scope(new PreferencesManager.MemoryStorage({ - "spaceUnits": 4, - "language": { - "html": { - "spaceUnits": 2 - }, - "css": { - "spaceUnits": 8 - } - } - })); - pm.addScope("user", userScope); - var layer = new PreferencesManager.LanguageLayer(); - pm.addLayer("language", layer); - - expect(pm.getValue("spaceUnits")).toBe(4); - - layer.setLanguage("html"); - expect(pm.getValue("spaceUnits")).toBe(2); - - layer.setLanguage("css"); - expect(pm.getValue("spaceUnits")).toBe(8); - - layer.setLanguage("python"); - expect(pm.getValue("spaceUnits")).toBe(4); - }); - }); - - describe("File Storage", function () { - var settingsFile = testPath + "/brackets.settings.json", - filestorage, - fileEntry, - originalText; - - beforeFirst(function () { - var deferred = $.Deferred(); - NativeFileSystem.resolveNativeFileSystemPath(settingsFile, function (entry) { - fileEntry = entry; - FileUtils.readAsText(fileEntry) - .then(function (text) { - originalText = text; - deferred.resolve(); - }) - .fail(function (error) { - deferred.reject(error); - }); - }, function (error) { - deferred.reject(error); - }); - waitsForDone(deferred.promise()); - }); - - beforeEach(function () { - filestorage = new PreferencesManager.FileStorage(settingsFile); - }); - - afterEach(function () { - waitsForDone(FileUtils.writeText(fileEntry, originalText)); - }); - - it("can load preferences from disk", function () { - var filestorage = new PreferencesManager.FileStorage(testPath + "/brackets.settings.json"); - var pm = new PreferencesManager.PreferencesManager(); - var projectScope = new PreferencesManager.Scope(filestorage); - waitsForDone(pm.addScope("project", projectScope)); - runs(function () { - expect(pm.getValue("spaceUnits")).toBe(92); - - var layer = new PreferencesManager.LanguageLayer(); - layer.setLanguage("go"); - pm.addLayer("language", layer); - expect(pm.getValue("spaceUnits")).toBe(27); - }); - }); - - it("can save preferences", function () { - var filestorage = new PreferencesManager.FileStorage(testPath + "/brackets.settings.json"); - var pm = new PreferencesManager.PreferencesManager(); - var projectScope = new PreferencesManager.Scope(filestorage); - waitsForDone(pm.addScope("project", projectScope)); - runs(function () { - var memstorage = new PreferencesManager.MemoryStorage(); - pm.addScope("session", new PreferencesManager.Scope(memstorage)); - pm.setValue("session", "unicorn-filled", true); -// pm.setValue("project", "unicorn-filled", false); - pm.save(); - expect(memstorage.data["unicorn-filled"]).toBe(true); - }); - }); - }); - }); -}); From 14b147548b508829a4a56bf5abd64a8081a522ac Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Mon, 7 Oct 2013 23:22:05 -0400 Subject: [PATCH 0077/1140] Added the ability to create new pref files automatically. --- src/preferences/PreferencesBase.js | 74 ++++++++++++++------------- src/preferences/PreferencesManager.js | 23 +++++++-- test/spec/PreferencesBase-test.js | 55 +++++++++++++++++--- 3 files changed, 108 insertions(+), 44 deletions(-) diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js index 5dc1ac5bcf4..dd9368f3836 100644 --- a/src/preferences/PreferencesBase.js +++ b/src/preferences/PreferencesBase.js @@ -23,7 +23,7 @@ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define, $, localStorage */ +/*global define, $, localStorage, brackets */ /*unittests: Preferences Base */ /** @@ -58,50 +58,50 @@ define(function (require, exports, module) { } }; - function FileStorage(path) { + function FileStorage(path, createIfNew) { this.path = path; + this.createIfNew = createIfNew; } FileStorage.prototype = { load: function () { var result = $.Deferred(); var path = this.path; - NativeFileSystem.resolveNativeFileSystemPath(path, function (entry) { - FileUtils.readAsText(entry) - .then(function (text) { - try { - result.resolve(JSON.parse(text)); - } catch (e) { - result.reject("Invalid JSON settings at " + path + "(" + e.toString() + ")"); - } - }) - .fail(function (error) { - result.reject("Unable to load prefs at " + path + " " + error); - }); - }, function (error) { - result.reject(error); + var createIfNew = this.createIfNew; + + brackets.fs.readFile(path, NativeFileSystem._FSEncodings.UTF8, function (err, text) { + if (err) { + if (createIfNew) { + result.resolve({}); + } else { + result.reject("Unable to load prefs at " + path + " " + err); + } + return; + } + try { + result.resolve(JSON.parse(text)); + } catch (e) { + result.reject("Invalid JSON settings at " + path + "(" + e.toString() + ")"); + } }); + return result.promise(); }, save: function (newData) { var result = $.Deferred(); var path = this.path; - NativeFileSystem.resolveNativeFileSystemPath(path, function (entry) { - try { - FileUtils.writeText(entry, JSON.stringify(newData)) - .then(function (text) { - result.resolve(); - }) - .fail(function (error) { - result.reject("Unable to save prefs at " + path + " " + error); - }); - } catch (e) { - result.reject("Unable to convert prefs to JSON" + e.toString()); - } - }, function (error) { - result.reject(error); - }); + try { + brackets.fs.writeFile(path, JSON.stringify(newData, null, 4), NativeFileSystem._FSEncodings.UTF8, function (err) { + if (err) { + result.reject("Unable to save prefs at " + path + " " + err); + } else { + result.resolve(); + } + }); + } catch (e) { + result.reject("Unable to convert prefs to JSON" + e.toString()); + } return result.promise(); } }; @@ -115,10 +115,14 @@ define(function (require, exports, module) { Scope.prototype = { load: function () { var result = $.Deferred(); - this.storage.load().then(function (data) { - this.data = data; - result.resolve(); - }.bind(this)); + this.storage.load() + .then(function (data) { + this.data = data; + result.resolve(); + }.bind(this)) + .fail(function (error) { + result.reject(error); + }); return result.promise(); }, diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 7b37ccde900..a6640eb6717 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -23,7 +23,7 @@ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define, $, localStorage */ +/*global define, $, localStorage, brackets */ /*unittests: Preferences Manager */ /** @@ -35,10 +35,9 @@ define(function (require, exports, module) { var OldPreferenceStorage = require("preferences/PreferenceStorage").PreferenceStorage, FileUtils = require("file/FileUtils"), - NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem, ExtensionLoader = require("utils/ExtensionLoader"), CollectionUtils = require("utils/CollectionUtils"), - Async = require("utils/Async"); + PreferencesBase = require("preferences/PreferencesBase"); /** * The local storage ID @@ -224,4 +223,22 @@ define(function (require, exports, module) { // Unit test use only exports._reset = _reset; exports._getExtensionPaths = _getExtensionPaths; + + // New code follows. The code above (with the exception of the imports) is + // deprecated. + + var preferencesManager = new PreferencesBase.PreferencesManager(); + + var userPrefFile = brackets.app.getApplicationSupportDirectory() + "/brackets.settings.json"; + + preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true), "default"); + preferencesManager.addScope("session", new PreferencesBase.MemoryStorage(), "user"); + + // Private API for unit testing and use elsewhere + exports._manager = preferencesManager; + + // Public API + exports.getValue = preferencesManager.getValue.bind(preferencesManager); + exports.setValue = preferencesManager.setValue.bind(preferencesManager); + exports.definePreference = preferencesManager.definePreference.bind(preferencesManager); }); \ No newline at end of file diff --git a/test/spec/PreferencesBase-test.js b/test/spec/PreferencesBase-test.js index a97f5c13845..961c6be43f7 100644 --- a/test/spec/PreferencesBase-test.js +++ b/test/spec/PreferencesBase-test.js @@ -22,7 +22,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, spyOn */ +/*global $, define, describe, it, expect, beforeEach, afterEach, waitsFor, waitsForDone, runs, beforeFirst, afterLast, spyOn, brackets */ /*unittests: Preferences Base*/ define(function (require, exports, module) { @@ -194,15 +194,14 @@ define(function (require, exports, module) { describe("File Storage", function () { var settingsFile = testPath + "/brackets.settings.json", + newSettingsFile = testPath + "/new.settings.json", filestorage, - fileEntry, originalText; beforeFirst(function () { var deferred = $.Deferred(); NativeFileSystem.resolveNativeFileSystemPath(settingsFile, function (entry) { - fileEntry = entry; - FileUtils.readAsText(fileEntry) + FileUtils.readAsText(entry) .then(function (text) { originalText = text; deferred.resolve(); @@ -221,7 +220,22 @@ define(function (require, exports, module) { }); afterEach(function () { - waitsForDone(FileUtils.writeText(fileEntry, originalText)); + var deferred = $.Deferred(); + NativeFileSystem.resolveNativeFileSystemPath(settingsFile, function (entry) { + FileUtils.writeText(entry, originalText) + .then(function () { + deferred.resolve(); + }) + .fail(function (error) { + deferred.reject(error); + }); + }, function (error) { + deferred.reject(error); + }); + waitsForDone(deferred.promise()); + runs(function () { + brackets.fs.unlink(newSettingsFile); + }); }); it("can load preferences from disk", function () { @@ -248,11 +262,40 @@ define(function (require, exports, module) { var memstorage = new PreferencesBase.MemoryStorage(); pm.addScope("session", new PreferencesBase.Scope(memstorage)); pm.setValue("session", "unicorn-filled", true); -// pm.setValue("project", "unicorn-filled", false); + pm.setValue("project", "unicorn-filled", false); pm.save(); expect(memstorage.data["unicorn-filled"]).toBe(true); }); }); + + it("can create a new pref file", function () { + var filestorage = new PreferencesBase.FileStorage(newSettingsFile, true); + var pm = new PreferencesBase.PreferencesManager(); + var newScope = new PreferencesBase.Scope(filestorage); + waitsForDone(pm.addScope("new", newScope), "adding scope"); + runs(function () { + expect(pm._scopes["new"]).toBeDefined(); + expect(pm._scopeOrder.indexOf("new")).toBeGreaterThan(-1); + pm.setValue("new", "unicorn-filled", true); + expect(pm.getValue("unicorn-filled")).toBe(true); + + waitsForDone(pm.save(), "saving prefs"); + + var deferred = $.Deferred(); + runs(function () { + brackets.fs.stat(newSettingsFile, function (err, stats) { + if (err) { + deferred.reject(); + } else { + deferred.resolve(); + } + }); + }); + + waitsForDone(deferred.promise(), "checking file"); + }); + + }); }); }); }); From 743ef4d3ee64bd8515d333904acff47f7e3eaab8 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Tue, 8 Oct 2013 13:24:23 +0200 Subject: [PATCH 0078/1140] Changed live preview error message to match sprint 32 --- src/nls/de/strings.js | 2 +- src/nls/root/strings.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 842943a15f8..3c053ebdeef 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -81,7 +81,7 @@ define({ "LIVE_DEVELOPMENT_RELAUNCH_TITLE" : "Verbinden zum Browser", "LIVE_DEVELOPMENT_ERROR_MESSAGE" : "Um die Live-Vorschau zu verwenden, muss Chrome mit aktiviertem Remote-Debugging neu gestartet werden.

    Soll Chrome neu gestartet werden, um das Remote Debugger Protokoll zu aktivieren?", "LIVE_DEV_LOADING_ERROR_MESSAGE" : "Laden der Live-Vorschau nicht möglich", - "LIVE_DEV_NEED_HTML_MESSAGE" : "Öffnen Sie eine HTML-Datei, um die Live-Vorschau zu starten.", + "LIVE_DEV_NEED_HTML_MESSAGE" : "Öffnen Sie eine HTML-Datei oder stellen Sie sicher, dass sich eine index.html-Datei im Projekt befindet, um die Live-Vorschau zu starten.", "LIVE_DEV_NEED_BASEURL_MESSAGE" : "Zum Starten der Live-Vorschau mit einer serverseitigen Datei müssen Sie eine Basis-URL für dieses Projekt angeben.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Ein Fehler ist beim Starten des HTTP-Servers oder der Live-Vorschau-Dateien aufgetreten. Bitte versuchen Sie es später erneut.", "LIVE_DEVELOPMENT_INFO_TITLE" : "Willkommen bei der Live-Vorschau!", diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 495dedcd199..6933d11e6e7 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -81,7 +81,7 @@ define({ "LIVE_DEVELOPMENT_RELAUNCH_TITLE" : "Connecting to Browser", "LIVE_DEVELOPMENT_ERROR_MESSAGE" : "In order for Live Preview to connect, Chrome needs to be relaunched with remote debugging enabled.

    Would you like to relaunch Chrome and enable remote debugging?", "LIVE_DEV_LOADING_ERROR_MESSAGE" : "Unable to load Live Development page", - "LIVE_DEV_NEED_HTML_MESSAGE" : "Open an HTML file in order to launch live preview.", + "LIVE_DEV_NEED_HTML_MESSAGE" : "Open an HTML file or make sure there is an index.html file in your project in order to launch live preview.", "LIVE_DEV_NEED_BASEURL_MESSAGE" : "To launch live preview with a server-side file, you need to specify a Base URL for this project.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Error starting up the HTTP server for live development files. Please try again.", "LIVE_DEVELOPMENT_INFO_TITLE" : "Welcome to Live Preview!", From aaec3a5aff5ec96947f5f38ed8874454553de0de Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 8 Oct 2013 10:37:15 -0400 Subject: [PATCH 0079/1140] Now loads prefs from user location and project location --- src/preferences/PreferencesBase.js | 5 +++++ src/preferences/PreferencesManager.js | 10 ++++++++-- src/project/ProjectManager.js | 9 +++++++++ test/UnitTestSuite.js | 2 +- test/spec/PreferencesBase-test.js | 8 ++++++++ 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js index dd9368f3836..e9d04220358 100644 --- a/src/preferences/PreferencesBase.js +++ b/src/preferences/PreferencesBase.js @@ -227,6 +227,11 @@ define(function (require, exports, module) { throw new Error("Attempt to redefine preferences scope: " + id); } + // Check to see if "scope" might be a Storage instead + if (!scope.getValue) { + scope = new Scope(scope); + } + var deferred = $.Deferred(); scope.load().then(function () { diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index a6640eb6717..b2c7568a6e0 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -227,18 +227,24 @@ define(function (require, exports, module) { // New code follows. The code above (with the exception of the imports) is // deprecated. + var SETTINGS_FILENAME = "brackets.settings.json"; + var preferencesManager = new PreferencesBase.PreferencesManager(); - var userPrefFile = brackets.app.getApplicationSupportDirectory() + "/brackets.settings.json"; + var userPrefFile = brackets.app.getApplicationSupportDirectory() + "/" + SETTINGS_FILENAME; preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true), "default"); preferencesManager.addScope("session", new PreferencesBase.MemoryStorage(), "user"); - + // Private API for unit testing and use elsewhere exports._manager = preferencesManager; // Public API exports.getValue = preferencesManager.getValue.bind(preferencesManager); exports.setValue = preferencesManager.setValue.bind(preferencesManager); + exports.addScope = preferencesManager.addScope.bind(preferencesManager); + exports.removeScope = preferencesManager.removeScope.bind(preferencesManager); + exports.FileStorage = PreferencesBase.FileStorage; + exports.SETTINGS_FILENAME = SETTINGS_FILENAME; exports.definePreference = preferencesManager.definePreference.bind(preferencesManager); }); \ No newline at end of file diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index c5ea86057e5..16d50d09ea5 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1573,6 +1573,15 @@ define(function (require, exports, module) { //TODO: Remove preferences migration code PreferencesManager.handleClientIdChange(_prefs, "com.adobe.brackets.ProjectManager"); + $(exports).on("projectOpen", function () { + PreferencesManager.removeScope("project"); + var root = getProjectRoot(); + if (root) { + PreferencesManager.addScope("project", new PreferencesManager.FileStorage(root.fullPath + "/" + PreferencesManager.SETTINGS_FILENAME), "user"); + } + }); + + // Event Handlers $(FileViewController).on("documentSelectionFocusChange", _documentSelectionFocusChange); $(FileViewController).on("fileViewFocusChange", _fileViewFocusChange); diff --git a/test/UnitTestSuite.js b/test/UnitTestSuite.js index 8846e4f56b1..eec1765719e 100644 --- a/test/UnitTestSuite.js +++ b/test/UnitTestSuite.js @@ -60,7 +60,7 @@ define(function (require, exports, module) { require("spec/NativeMenu-test"); require("spec/NodeConnection-test"); require("spec/PreferencesBase-test"); - require("spec/PreferencesManager-test"); +// require("spec/PreferencesManager-test"); require("spec/ProjectManager-test"); require("spec/QuickOpen-test"); require("spec/RemoteFunctions-test"); diff --git a/test/spec/PreferencesBase-test.js b/test/spec/PreferencesBase-test.js index 961c6be43f7..5a845318629 100644 --- a/test/spec/PreferencesBase-test.js +++ b/test/spec/PreferencesBase-test.js @@ -72,6 +72,14 @@ define(function (require, exports, module) { } }); + + it("will automatically wrap a Storage with a Scope", function () { + var pm = new PreferencesBase.PreferencesManager(); + pm.addScope("test", new PreferencesBase.MemoryStorage()); + pm.setValue("test", "testval", 27); + expect(pm.getValue("testval")).toBe(27); + }); + it("should find the default values", function () { var pm = new PreferencesBase.PreferencesManager(); pm.definePreference("foo.bar", "number", 0); From d8ff6b3b40efa7c4db5f9b66a4718f2ae262f9ad Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 8 Oct 2013 11:21:03 -0400 Subject: [PATCH 0080/1140] Added an integration test for project preferences. --- test/UnitTestSuite.js | 2 +- test/spec/PreferencesManager-test.js | 183 +++++++++++++++++++++++++++ 2 files changed, 184 insertions(+), 1 deletion(-) diff --git a/test/UnitTestSuite.js b/test/UnitTestSuite.js index eec1765719e..8846e4f56b1 100644 --- a/test/UnitTestSuite.js +++ b/test/UnitTestSuite.js @@ -60,7 +60,7 @@ define(function (require, exports, module) { require("spec/NativeMenu-test"); require("spec/NodeConnection-test"); require("spec/PreferencesBase-test"); -// require("spec/PreferencesManager-test"); + require("spec/PreferencesManager-test"); require("spec/ProjectManager-test"); require("spec/QuickOpen-test"); require("spec/RemoteFunctions-test"); diff --git a/test/spec/PreferencesManager-test.js b/test/spec/PreferencesManager-test.js index e69de29bb2d..808080f9f53 100644 --- a/test/spec/PreferencesManager-test.js +++ b/test/spec/PreferencesManager-test.js @@ -0,0 +1,183 @@ +/* + * 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, browser: true, nomen: true, indent: 4, maxerr: 50 */ +/*global define, describe, it, expect, beforeEach, afterEach, waitsFor, runs, beforeFirst, afterLast, spyOn, waitsForDone */ +define(function (require, exports, module) { + 'use strict'; + + // Load dependent modules + var PreferenceStorage = require("preferences/PreferenceStorage").PreferenceStorage, + SpecRunnerUtils = require("spec/SpecRunnerUtils"), + testPath = SpecRunnerUtils.getTestPath("/spec/PreferencesBase-test-files"), + PreferencesManager, + testWindow; + + var CLIENT_ID = "PreferencesManager-test"; + + describe("PreferenceStorage", function () { + + it("should read initial preferences from JSON", function () { + var store = new PreferenceStorage(CLIENT_ID, {"foo": "bar", hello: "world"}); + expect(store.getValue("foo")).toBe("bar"); + expect(store.getValue("hello")).toBe("world"); + }); + + it("should store values as JSON", function () { + var json = {}; + var store = new PreferenceStorage(CLIENT_ID, json); + store.setValue("foo", 42); + + expect(json.foo).toEqual(42); + expect(store.getValue("foo")).toBe(42); + }); + + it("should output preferences as JSON", function () { + var store = new PreferenceStorage(CLIENT_ID, {}); + store.setValue("foo", 42); + var json = store.getAllValues(); + + expect(json.foo).toEqual(42); + }); + + it("should remove values", function () { + var store = new PreferenceStorage(CLIENT_ID, {"foo": "bar"}); + expect(store.getValue("foo")).toBe("bar"); + + store.remove("foo"); + expect(store.getValue("foo")).toBe(undefined); + }); + + it("should use setAllValues to append multiple new name/value pairs", function () { + var initial = {"foo": "bar"}; + var store = new PreferenceStorage(CLIENT_ID, initial); + + // append + store.setAllValues({"hello": ["world", "!"], "goodbye": 42}, true); + expect(store.getValue("foo")).toBe("bar"); + expect(store.getValue("hello")).toEqual(["world", "!"]); + expect(store.getValue("goodbye")).toBe(42); + + // overwrite + store.setAllValues({"winning": false}, false); + expect(store.getValue("foo")).toBe(undefined); + expect(store.getValue("hello")).toBe(undefined); + expect(store.getValue("goodbye")).toBe(undefined); + expect(store.getValue("winning")).toBe(false); + }); + + it("should throw errors for invalid values", function () { + var store = new PreferenceStorage(CLIENT_ID, {"foo": 42}); + var error = null; + + expect(store.getValue("foo")).toBe(42); + // function data is not valid JSON + store.setValue("foo", function () {}); + expect(store.getValue("foo")).toBe(42); + + // number key is not valid JSON + store.setValue(42, "bar"); + expect(store.getValue(42)).toBe(undefined); + }); + + }); + + describe("PreferencesManager", function () { + this.category = "integration"; + + beforeFirst(function () { + SpecRunnerUtils.createTestWindowAndRun(this, function (w) { + testWindow = w; + + // Load module instances from brackets.test + PreferencesManager = testWindow.brackets.test.PreferencesManager; + SpecRunnerUtils.loadProjectInTestWindow(testPath); + }); + }); + + afterLast(function () { + PreferencesManager = null; + SpecRunnerUtils.closeTestWindow(); + }); + + beforeEach(function () { + // SpecRunner.js already initializes the unit test instance of + // PreferencesManager to use the unit test key. All we need to do + // here is reset to clear callbacks and in-memory preferences. + PreferencesManager._reset(); + }); + + it("should use default preferences", function () { + var store = PreferencesManager.getPreferenceStorage(CLIENT_ID, {foo: "default"}); + expect(store.getValue("foo")).toEqual("default"); + }); + + describe("Create clientID for preference store", function () { + it("should return clientID for module that exists in extension directories", function () { + spyOn(PreferencesManager, "_getExtensionPaths").andCallFake(function () { + return ['/local/Extension/Folder/Extensions/', + '/User/test/Library/Application Support/Brackets/extensions/user/', + 'c:/Program Files (x86)/Brackets/wwww/extensions/default/']; + }); + + var module = {id: 'utils/Resizer', uri: '/local/Extension/Folder/Extensions/utils/Resizer.js'}; + + var clientID = PreferencesManager.getClientID(module); + expect(clientID).toBe("com.adobe.brackets.utils/Resizer.js"); + + clientID = PreferencesManager.getClientID({id: 'main', uri: '/User/test/Library/Application Support/Brackets/extensions/user/HelloWorld/main.js'}); + expect(clientID).toBe("com.adobe.brackets.HelloWorld/main.js"); + + clientID = PreferencesManager.getClientID({id: 'main', uri: 'c:/Program Files (x86)/Brackets/wwww/extensions/default/JSLint/main.js'}); + expect(clientID).toBe("com.adobe.brackets.JSLint/main.js"); + }); + + it("should always return a clientID for a module that doesn't exist in extension directories", function () { + spyOn(PreferencesManager, "_getExtensionPaths").andCallFake(function () { + return []; // no extension directories + }); + + var clientID = PreferencesManager.getClientID({id: 'main', uri: '/path/is/not/an/Extension/directory/someExtension/main.js'}); + expect(clientID).toBe("com.adobe.brackets.main"); + }); + }); + + it("should find preferences in the project", function () { + var projectWithoutSettings = SpecRunnerUtils.getTestPath("/spec/WorkingSetView-test-files"); + + function projectScopeIsReady() { + return PreferencesManager._manager._scopes.project !== undefined; + } + waitsFor(projectScopeIsReady); + runs(function () { + expect(PreferencesManager.getValue("spaceUnits")).toBe(92); + }); + + // Changing projects will force a change in the project scope. + SpecRunnerUtils.loadProjectInTestWindow(projectWithoutSettings); + runs(function () { + expect(PreferencesManager.getValue("spaceUnits")).toBeUndefined(); + }); + }); + }); +}); From 65474d75be4a6bf31177c11de770a49c8248fd20 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 8 Oct 2013 11:48:32 -0400 Subject: [PATCH 0081/1140] jslint now supports default settings. --- brackets.settings.json | 10 +++++++++ src/extensions/default/JSLint/main.js | 7 +++++-- src/preferences/PreferencesBase.js | 29 ++++++++++++++++++++------- src/project/ProjectManager.js | 2 +- 4 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 brackets.settings.json diff --git a/brackets.settings.json b/brackets.settings.json new file mode 100644 index 00000000000..4b5ececc2b4 --- /dev/null +++ b/brackets.settings.json @@ -0,0 +1,10 @@ +{ + "jslintOptions": { + "vars": true, + "plusplus": true, + "devel": true, + "nomen": true, + "indent": 4, + "maxerr": 50 + } +} \ No newline at end of file diff --git a/src/extensions/default/JSLint/main.js b/src/extensions/default/JSLint/main.js index bd8c7506e5f..6ca74289075 100644 --- a/src/extensions/default/JSLint/main.js +++ b/src/extensions/default/JSLint/main.js @@ -22,7 +22,6 @@ */ -/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ /*global define, $, JSLINT, brackets */ /** @@ -36,9 +35,12 @@ define(function (require, exports, module) { // Load dependent modules var CodeInspection = brackets.getModule("language/CodeInspection"), + PreferencesManager = brackets.getModule("preferences/PreferencesManager"), Strings = brackets.getModule("strings"); + PreferencesManager.definePreference("jslintOptions", "object"); + /** * Run JSLint on the current document. Reports results to the main UI. Displays * a gold star when no errors are found. @@ -56,7 +58,8 @@ define(function (require, exports, module) { } text = arr.join("\n"); - var jslintResult = JSLINT(text, null); + var options = PreferencesManager.getValue("jslintOptions"); + var jslintResult = JSLINT(text, options); if (!jslintResult) { // Remove any trailing null placeholder (early-abort indicator) diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js index e9d04220358..ce9827f1ad4 100644 --- a/src/preferences/PreferencesBase.js +++ b/src/preferences/PreferencesBase.js @@ -63,6 +63,13 @@ define(function (require, exports, module) { this.createIfNew = createIfNew; } + function ParsingError(message) { + this.name = "ParsingError"; + this.message = message || ""; + } + + ParsingError.prototype = Error.prototype; + FileStorage.prototype = { load: function () { var result = $.Deferred(); @@ -74,14 +81,14 @@ define(function (require, exports, module) { if (createIfNew) { result.resolve({}); } else { - result.reject("Unable to load prefs at " + path + " " + err); + result.reject(new Error("Unable to load prefs at " + path + " " + err)); } return; } try { result.resolve(JSON.parse(text)); } catch (e) { - result.reject("Invalid JSON settings at " + path + "(" + e.toString() + ")"); + result.reject(new ParsingError("Invalid JSON settings at " + path + "(" + e.toString() + ")")); } }); @@ -234,11 +241,19 @@ define(function (require, exports, module) { var deferred = $.Deferred(); - scope.load().then(function () { - this._scopes[id] = scope; - this.addToScopeOrder(id, addBefore); - deferred.resolve(id, scope); - }.bind(this)); + scope.load() + .then(function () { + this._scopes[id] = scope; + this.addToScopeOrder(id, addBefore); + deferred.resolve(id, scope); + }.bind(this)) + .fail(function (err) { + // With preferences, it is valid for there to be no file. + // It is not valid to have an unparseable file. + if (err instanceof ParsingError) { + console.error(err); + } + }); return deferred.promise(); }, diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 16d50d09ea5..d54c7f4383f 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1577,7 +1577,7 @@ define(function (require, exports, module) { PreferencesManager.removeScope("project"); var root = getProjectRoot(); if (root) { - PreferencesManager.addScope("project", new PreferencesManager.FileStorage(root.fullPath + "/" + PreferencesManager.SETTINGS_FILENAME), "user"); + PreferencesManager.addScope("project", new PreferencesManager.FileStorage(root.fullPath + PreferencesManager.SETTINGS_FILENAME), "user"); } }); From e3e9a6821b7e57929420f8d3ad6a345b98504983 Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Tue, 8 Oct 2013 17:51:33 +0200 Subject: [PATCH 0082/1140] Revert some whitespace changes --- src/editor/CodeHintManager.js | 46 +++++++++++++++++------------------ src/editor/Editor.js | 18 +++++++------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/editor/CodeHintManager.js b/src/editor/CodeHintManager.js index 4717f56f638..93e7dd43ce1 100644 --- a/src/editor/CodeHintManager.js +++ b/src/editor/CodeHintManager.js @@ -1,24 +1,24 @@ /* * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * */ /* @@ -91,7 +91,7 @@ * to show hints. Because implicit hints can be triggered by every * character insertion, hasHints may be called frequently; consequently, * the provider should endeavor to return a value as quickly as possible. - * + * * Because calls to hasHints imply that a hinting session is about to * begin, a provider may wish to clean up cached data from previous * sessions in this method. Similarly, if the provider returns true, it @@ -102,25 +102,25 @@ * param {Editor} editor * A non-null editor object for the active window. * - * param {string} implicitChar + * param {string} implicitChar * Either null, if the hinting request was explicit, or a single character * that represents the last insertion and that indicates an implicit * hinting request. * - * return {boolean} + * return {boolean} * Determines whether the current provider is able to provide hints for * the given editor context and, in case implicitChar is non- null, * whether it is appropriate to do so. * * * # CodeHintProvider.getHints(implicitChar) - * + * * The method by which a provider provides hints for the editor context * associated with the current session. The getHints method is called only * if the provider asserted its willingness to provide hints in an earlier - * call to hasHints. The provider may return null or false, which indicates + * call to hasHints. The provider may return null or false, which indicates * that the manager should end the current hinting session and close the hint - * list window; or true, which indicates that the manager should end the + * list window; or true, which indicates that the manager should end the * current hinting session but immediately attempt to begin a new hinting * session by querying registered providers. Otherwise, the provider should * return a response object that contains the following properties: @@ -156,7 +156,7 @@ * deferred object from the current call has resolved or been rejected. If * the provider rejects the deferred, the manager will end the hinting * session. - * + * * The getHints method may be called by the manager repeatedly during a * hinting session. Providers may wish to cache information for efficiency * that may be useful throughout these sessions. The same editor context @@ -177,7 +177,7 @@ * match: string, * selectInitial: boolean, * handleWideResults: boolean}} - * + * * Null if the provider wishes to end the hinting session. Otherwise, a * response object, possibly deferred, that provides 1. a sorted array * hints that consists either of strings or jQuery objects; 2. a string @@ -191,11 +191,11 @@ * attempt to emphasize any parts of the hints when rendering the hint * list; instead the provider may return strings or jQuery objects for * which emphasis is self-contained. For example, the strings may contain - * substrings that wrapped in bold tags. In this way, the provider can + * substrings that wrapped in bold tags. In this way, the provider can * choose to let the manager handle emphasis for the simple and common case - * of prefix matching, or can provide its own emphasis if it wishes to use + * of prefix matching, or can provide its own emphasis if it wishes to use * a more sophisticated matching algorithm. - * + * * * # CodeHintProvider.insertHint(hint) * @@ -209,7 +209,7 @@ * explicit hinting request, which may result in a new hinting session * being opened with some provider, but not necessarily the current one. * - * param {string} hint + * param {string} hint * The hint to be inserted into the editor context for the current session. * * return {boolean} @@ -218,7 +218,7 @@ * * * # CodeHintProvider.insertHintOnTab - * + * * type {?boolean} insertHintOnTab * Indicates whether the CodeHintManager should request that the provider of * the current session insert the currently selected hint on tab key events, @@ -280,7 +280,7 @@ define(function (require, exports, module) { * providing hints for editors in a given language. * * @param {!CodeHintProvider} provider - * The hint provider to be registered, described below. + * The hint provider to be registered, described below. * * @param {!Array.} languageIds * The set of language ids for which the provider is capable of @@ -353,7 +353,7 @@ define(function (require, exports, module) { }); } - /** + /** * Return the array of hint providers for the given language id. * This gets called (potentially) on every keypress. So, it should be fast. * @@ -386,12 +386,12 @@ define(function (require, exports, module) { /** * Is there a hinting session active for a given editor? - * + * * NOTE: the sessionEditor, sessionProvider and hintList objects are * only guaranteed to be initialized during an active session. * * @param {Editor} editor - * @return boolean + * @return boolean */ function _inSession(editor) { if (sessionEditor) { @@ -560,7 +560,7 @@ define(function (require, exports, module) { } /** - * Start a new implicit hinting session, or update the existing hint list. + * Start a new implicit hinting session, or update the existing hint list. * Called by the editor after handleKeyEvent, which is responsible for setting * the lastChar. */ diff --git a/src/editor/Editor.js b/src/editor/Editor.js index 7300c936a5d..6e16db4427d 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -18,7 +18,7 @@ * 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. - * + * */ @@ -120,9 +120,9 @@ define(function (require, exports, module) { function _handleTabKey(instance) { // Tab key handling is done as follows: // 1. If the selection is before any text and the indentation is to the left of - // the proper indentation then indent it to the proper place. Otherwise, + // the proper indentation then indent it to the proper place. Otherwise, // add another tab. In either case, move the insertion point to the - // beginning of the text. + // beginning of the text. // 2. If the selection is multi-line, indent all the lines. // 3. If the selection is after the first non-space character, and is an // insertion point, insert a tab character or the appropriate number @@ -170,7 +170,7 @@ define(function (require, exports, module) { /** * @private * Handle left arrow, right arrow, backspace and delete keys when soft tabs are used. - * @param {!CodeMirror} instance CodeMirror instance + * @param {!CodeMirror} instance CodeMirror instance * @param {number} direction Direction of movement: 1 for forward, -1 for backward * @param {function} functionName name of the CodeMirror function to call * @return {boolean} true if key was handled @@ -200,7 +200,7 @@ define(function (require, exports, module) { return false; } - // If we are on the tab boundary, jump by the full amount, + // If we are on the tab boundary, jump by the full amount, // but not beyond the start of the line. if (jump === 0) { jump = indentUnit; @@ -291,7 +291,7 @@ define(function (require, exports, module) { var _instances = []; - /** + /** * @constructor * * Creates a new CodeMirror editor instance bound to the given Document. The Document need not have @@ -651,7 +651,7 @@ define(function (require, exports, module) { /** - * Install event handlers on the CodeMirror instance, translating them into + * Install event handlers on the CodeMirror instance, translating them into * jQuery events on the Editor instance. */ Editor.prototype._installEditorListeners = function () { @@ -660,7 +660,7 @@ define(function (require, exports, module) { // onKeyEvent is an option in CodeMirror rather than an event--it's a // low-level hook for all keyboard events rather than a specific event. For // our purposes, though, it's convenient to treat it as an event internally, - // so we bridge it to jQuery events the same way we do ordinary CodeMirror + // so we bridge it to jQuery events the same way we do ordinary CodeMirror // events. this._codeMirror.setOption("onKeyEvent", function (instance, event) { $(self).triggerHandler("keyEvent", [self, event]); @@ -813,7 +813,7 @@ define(function (require, exports, module) { var $scrollerElement = $(this.getScrollerElement()); var editorHeight = $scrollerElement.height(); - // we need to make adjustments for the statusbar's padding on the bottom and the menu bar on top. + // we need to make adjustments for the statusbar's padding on the bottom and the menu bar on top. var statusBarHeight = $scrollerElement.outerHeight() - editorHeight; var menuBarHeight = $scrollerElement.offset().top; From a3b5e70c67b5bef9fa9bb4ffa1e062d3d59c5c43 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Tue, 8 Oct 2013 10:22:17 -0700 Subject: [PATCH 0083/1140] Make 'find in files' search unsaved contents. --- src/search/FindInFiles.js | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js index bd7e9fa4dc8..281ebce7221 100644 --- a/src/search/FindInFiles.js +++ b/src/search/FindInFiles.js @@ -744,23 +744,35 @@ define(function (require, exports, module) { } StatusBar.showBusyIndicator(true); var fileList = ProjectManager.getFileSystem().getFileList(); + var openDocs = DocumentManager.getAllOpenDocuments(); Async.doInParallel(fileList, function (file) { var result = new $.Deferred(); if (!_inScope(file, scope)) { result.resolve(); } else { - // Search one file - file.readAsText(function (err, contents) { - if (!err) { + var _resolve = function (contents) { + if (contents) { _addSearchMatches(file.fullPath, contents, currentQueryExpr); - result.resolve(); - } else { - // Error reading this file. This is most likely because the file isn't a text file. - // Resolve here so we move on to the next file. - result.resolve(); } - }); + result.resolve(); + }; + + var doc = openDocs.filter(function (doc) { + return (doc.file === file); + })[0]; + + if (doc) { + // Doc is open for editing, use the in-memory contents + _resolve(doc.getText()); + } else { + // Search one file + file.readAsText(function (err, contents) { + // Always resolve. If there is an error, this file + // is skipped and we move on to the next file. + _resolve(err ? null : contents); + }); + } } return result.promise(); }) From 88283d9deae1916e6678d5503adc716ac9ef3307 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Tue, 8 Oct 2013 12:21:24 -0700 Subject: [PATCH 0084/1140] Error name cleanup. FileSyncManager cleanup. --- src/document/DocumentCommandHandlers.js | 8 ++++---- src/project/FileSyncManager.js | 19 +++++++------------ src/project/ProjectManager.js | 4 ++-- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index 800a54ecc28..2786b6eeb10 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -200,7 +200,7 @@ define(function (require, exports, module) { if (silent) { _cleanup(); } else { - FileUtils.showFileOpenError(fileError.name, fullPath).done(_cleanup); + FileUtils.showFileOpenError(fileError, fullPath).done(_cleanup); } }); } @@ -488,7 +488,7 @@ define(function (require, exports, module) { fileEntry = docToSave.file; function handleError(error) { - _showSaveFileError(error.name, fileEntry.fullPath) + _showSaveFileError(error, fileEntry.fullPath) .done(function () { result.reject(error); }); @@ -531,7 +531,7 @@ define(function (require, exports, module) { result.resolve(); }) .fail(function (error) { - FileUtils.showFileOpenError(error.name, doc.file.fullPath) + FileUtils.showFileOpenError(error, doc.file.fullPath) .done(function () { result.reject(error); }); @@ -627,7 +627,7 @@ define(function (require, exports, module) { result.reject(error); }); }).fail(function (error) { - _showSaveFileError(error.name, path) + _showSaveFileError(error, path) .done(function () { result.reject(error); }); diff --git a/src/project/FileSyncManager.js b/src/project/FileSyncManager.js index 697f7aab42f..adccc2e9fa1 100644 --- a/src/project/FileSyncManager.js +++ b/src/project/FileSyncManager.js @@ -147,8 +147,6 @@ define(function (require, exports, module) { * by findExternalChanges()). If any were deleted on disk, removes them from the working set. */ function syncUnopenWorkingSet() { - /* TODO: FileSystem -- - // We only care about working set entries that have never been open (have no Document). var unopenWorkingSetFiles = DocumentManager.getWorkingSet().filter(function (wsFile) { return !DocumentManager.getOpenDocumentForPath(wsFile.fullPath); @@ -157,30 +155,27 @@ define(function (require, exports, module) { function checkWorkingSetFile(file) { var result = new $.Deferred(); - file.getMetadata( - function (metadata) { + file.stat(function (err, stat) { + if (!err) { // File still exists result.resolve(); - }, - function (error) { + } else { // File has been deleted externally if (error === Error.NOT_FOUND) { DocumentManager.notifyFileDeleted(file); result.resolve(); } else { // Some other error fetching metadata: treat as a real error - console.log("Error checking for deletion of " + file.fullPath, error.name); + console.log("Error checking for deletion of " + file.fullPath, err); result.reject(); } } - ); + }); return result.promise(); } // Check all these files in parallel return Async.doInParallel(unopenWorkingSetFiles, checkWorkingSetFile, false); - */ - return new $.Deferred().resolve().promise(); } @@ -199,7 +194,7 @@ define(function (require, exports, module) { doc.refreshText(text, readTimestamp); }); promise.fail(function (error) { - console.log("Error reloading contents of " + doc.file.fullPath, error.name); + console.log("Error reloading contents of " + doc.file.fullPath, error); }); return promise; } @@ -227,7 +222,7 @@ define(function (require, exports, module) { StringUtils.format( Strings.ERROR_RELOADING_FILE, StringUtils.breakableUrl(doc.file.fullPath), - FileUtils.getFileErrorString(error.name) + FileUtils.getFileErrorString(error) ) ); } diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index cb4c74cde30..a54b76a3859 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -786,7 +786,7 @@ define(function (require, exports, module) { StringUtils.format( Strings.READ_DIRECTORY_ENTRIES_ERROR, StringUtils.breakableUrl(dirEntry.fullPath), - error.name + error ) ); // Reject the render promise so we can move on. @@ -978,7 +978,7 @@ define(function (require, exports, module) { StringUtils.format( Strings.REQUEST_NATIVE_FILE_SYSTEM_ERROR, StringUtils.breakableUrl(rootPath), - "" // TODO: FileSystem error -- error.name + Error.NOT_FOUND ) ).done(function () { // The project folder stored in preference doesn't exist, so load the default From 9ffe75f0b62da3aeac697e5841fde83406bfa4c9 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Tue, 8 Oct 2013 13:05:41 -0700 Subject: [PATCH 0085/1140] Fix file watching --- src/brackets.js | 5 ----- src/project/FileSyncManager.js | 2 +- src/project/ProjectManager.js | 4 +++- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/brackets.js b/src/brackets.js index 6ae6e372d8a..4b36cc8946e 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -337,11 +337,6 @@ define(function (require, exports, module) { FileSyncManager.syncOpenDocuments(); // TODO: FileSystem - remove now that we have file watchers? }); - $(brackets.appFileSystem).on("change", function (item) { - // TODO: FileSystem - only sync when window has focus? - FileSyncManager.syncOpenDocuments(); // TODO: Batch multiple changes into a single sync operation - }); - // Prevent unhandled middle button clicks from triggering native behavior // Example: activating AutoScroll (see #510) $("html").on("mousedown", ".inline-widget", function (e) { diff --git a/src/project/FileSyncManager.js b/src/project/FileSyncManager.js index adccc2e9fa1..06abd1bb6bf 100644 --- a/src/project/FileSyncManager.js +++ b/src/project/FileSyncManager.js @@ -161,7 +161,7 @@ define(function (require, exports, module) { result.resolve(); } else { // File has been deleted externally - if (error === Error.NOT_FOUND) { + if (err === Error.NOT_FOUND) { DocumentManager.notifyFileDeleted(file); result.resolve(); } else { diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index a54b76a3859..199fb4c585e 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -70,7 +70,8 @@ define(function (require, exports, module) { Urls = require("i18n!nls/urls"), KeyEvent = require("utils/KeyEvent"), Async = require("utils/Async"), - FileSystemManager = require("filesystem/FileSystemManager"); + FileSystemManager = require("filesystem/FileSystemManager"), + FileSyncManager = require("project/FileSyncManager"); /** @@ -1627,6 +1628,7 @@ define(function (require, exports, module) { if (item.isDirectory()) { refreshFileTree(); } + FileSyncManager.syncOpenDocuments(); }; // Initialize variables and listeners that depend on the HTML DOM From 996ea0d724c4ff2ac811f17403e31adc07972e83 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Tue, 8 Oct 2013 16:31:26 -0700 Subject: [PATCH 0086/1140] Remove FileSystem.pathExists(). Fix a bunch of unit test failures. --- src/LiveDevelopment/LiveDevelopment.js | 15 +- src/document/DocumentManager.js | 62 ++++---- .../JavaScriptCodeHints/ScopeManager.js | 135 +++++++++++------- .../default/JavaScriptCodeHints/unittests.js | 28 ++-- src/file/FileUtils.js | 2 + src/filesystem/FileSystem.js | 12 -- .../impls/appshell/AppshellFileSystem.js | 67 ++++++--- test/SpecRunner.js | 5 +- test/spec/ExtensionInstallation-test.js | 12 +- test/spec/LiveDevelopment-test.js | 4 - test/spec/SpecRunnerUtils.js | 2 +- 11 files changed, 198 insertions(+), 146 deletions(-) diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index d4293a59f5a..f750dc1d7bb 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -76,7 +76,6 @@ define(function LiveDevelopment(require, exports, module) { var Async = require("utils/Async"), CollectionUtils = require("utils/CollectionUtils"), - FileIndexManager = require("project/FileIndexManager"), Dialogs = require("widgets/Dialogs"), DefaultDialogs = require("widgets/DefaultDialogs"), DocumentManager = require("document/DocumentManager"), @@ -671,9 +670,10 @@ define(function LiveDevelopment(require, exports, module) { var result = new $.Deferred(); var baseUrl = ProjectManager.getBaseUrl(), - hasOwnServerForLiveDevelopment = (baseUrl && baseUrl.length); + hasOwnServerForLiveDevelopment = (baseUrl && baseUrl.length), + allFiles = ProjectManager.getFileSystem().getFileList(); - FileIndexManager.getFileInfoList("all").done(function (allFiles) { + if (allFiles) { if (refPath) { var projectRoot = ProjectManager.getProjectRoot().fullPath, containingFolder = FileUtils.getDirectoryPath(refPath), @@ -721,12 +721,13 @@ define(function LiveDevelopment(require, exports, module) { if (i !== -1) { DocumentManager.getDocumentForPath(filteredFiltered[i].fullPath).then(result.resolve, result.resolve); - return; + } else { + result.resolve(null); } + } else { + result.resolve(null); } - - result.resolve(null); - }); + } return result.promise(); } diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 3050ae69aac..b5c2030179d 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -615,41 +615,35 @@ define(function (require, exports, module) { return promise; } - fileSystem.pathExists(fullPath, function (exists) { - if (exists) { - // log this document's Promise as pending - getDocumentForPath._pendingDocumentPromises[fullPath] = promise; - - // create a new document - var file = fileSystem.getFileForPath(fullPath), - perfTimerName = PerfUtils.markStart("getDocumentForPath:\t" + fullPath); - - result.done(function () { - PerfUtils.addMeasurement(perfTimerName); - }).fail(function () { - PerfUtils.finalizeMeasurement(perfTimerName); - }); - - FileUtils.readAsText(file) - .always(function () { - // document is no longer pending - delete getDocumentForPath._pendingDocumentPromises[fullPath]; - }) - .done(function (rawText, readTimestamp) { - doc = new DocumentModule.Document(file, readTimestamp, rawText); - - // This is a good point to clean up any old dangling Documents - _gcDocuments(); - - result.resolve(doc); - }) - .fail(function (fileError) { - result.reject(fileError); - }); - } else { - result.reject(); // TODO: FileSystem error not found - } + // log this document's Promise as pending + getDocumentForPath._pendingDocumentPromises[fullPath] = promise; + + // create a new document + var file = fileSystem.getFileForPath(fullPath), + perfTimerName = PerfUtils.markStart("getDocumentForPath:\t" + fullPath); + + result.done(function () { + PerfUtils.addMeasurement(perfTimerName); + }).fail(function () { + PerfUtils.finalizeMeasurement(perfTimerName); }); + + FileUtils.readAsText(file) + .always(function () { + // document is no longer pending + delete getDocumentForPath._pendingDocumentPromises[fullPath]; + }) + .done(function (rawText, readTimestamp) { + doc = new DocumentModule.Document(file, readTimestamp, rawText); + + // This is a good point to clean up any old dangling Documents + _gcDocuments(); + + result.resolve(doc); + }) + .fail(function (fileError) { + result.reject(fileError); + }); return promise; } diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js index 9cc9589c99a..d15d73253e9 100644 --- a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js +++ b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js @@ -78,13 +78,16 @@ define(function (require, exports, module) { library; files.forEach(function (i) { - var file = brackets.appFileSystem.getFileForPath(path + i); - FileUtils.readAsText(file).done(function (text) { - library = JSON.parse(text); - builtinLibraryNames.push(library["!name"]); - ternEnvironment.push(library); - }).fail(function (error) { - console.log("failed to read tern config file " + i); + brackets.appFileSystem.resolve(path + i, function (err, file) { + if (!err) { + FileUtils.readAsText(file).done(function (text) { + library = JSON.parse(text); + builtinLibraryNames.push(library["!name"]); + ternEnvironment.push(library); + }).fail(function (error) { + console.log("failed to read tern config file " + i); + }); + } }); }); } @@ -118,26 +121,32 @@ define(function (require, exports, module) { } var path = projectRootPath + Preferences.FILE_NAME, - fileSystem = ProjectManager.getFileSystem() || brackets.appFileSystem, - file = fileSystem.getFileForPath(path); - - FileUtils.readAsText(file).done(function (text) { - var configObj = null; - try { - configObj = JSON.parse(text); - } catch (e) { - // continue with null configObj which will result in - // default settings. - console.log("Error parsing preference file: " + path); - if (e instanceof SyntaxError) { - console.log(e.message); - } + fileSystem = ProjectManager.getFileSystem() || brackets.appFileSystem; + + fileSystem.resolve(path, function (err, file) { + if (!err) { + FileUtils.readAsText(file).done(function (text) { + var configObj = null; + try { + configObj = JSON.parse(text); + } catch (e) { + // continue with null configObj which will result in + // default settings. + console.log("Error parsing preference file: " + path); + if (e instanceof SyntaxError) { + console.log(e.message); + } + } + preferences = new Preferences(configObj); + deferredPreferences.resolve(); + }).fail(function (error) { + preferences = new Preferences(); + deferredPreferences.resolve(); + }); + } else { + preferences = new Preferences(); + deferredPreferences.resolve(); } - preferences = new Preferences(configObj); - deferredPreferences.resolve(); - }).fail(function (error) { - preferences = new Preferences(); - deferredPreferences.resolve(); }); } @@ -176,37 +185,45 @@ define(function (require, exports, module) { */ function forEachFileInDirectory(dir, doneCallback, fileCallback, directoryCallback, errorCallback) { var fileSystem = ProjectManager.getFileSystem() || brackets.appFileSystem, - directory = fileSystem.getDirectoryForPath(dir), files = []; - fileSystem.getDirectoryContents(directory, function (err, contents) { - if (!err) { - contents.slice(0, preferences.getMaxFileCount()).forEach(function (entry) { - var path = entry.fullPath, - split = HintUtils.splitPath(path), - file = split.file; - - if (fileCallback && entry.isFile()) { - - if (file.indexOf(".") > 0) { // ignore .dotfiles - var languageID = LanguageManager.getLanguageForPath(path).getId(); - if (languageID === HintUtils.LANGUAGE_ID) { - fileCallback(path); + fileSystem.resolve(dir, function (err, directory) { + if (!err && directory.isDirectory()) { + fileSystem.getDirectoryContents(directory, function (err, contents) { + if (!err) { + contents.slice(0, preferences.getMaxFileCount()).forEach(function (entry) { + var path = entry.fullPath, + split = HintUtils.splitPath(path), + file = split.file; + + if (fileCallback && entry.isFile()) { + + if (file.indexOf(".") > 0) { // ignore .dotfiles + var languageID = LanguageManager.getLanguageForPath(path).getId(); + if (languageID === HintUtils.LANGUAGE_ID) { + fileCallback(path); + } + } + } else if (directoryCallback && entry.isDirectory()) { + var dirName = HintUtils.splitPath(split.dir).file; + if (dirName.indexOf(".") !== 0) { // ignore .dotfiles + directoryCallback(entry.fullPath); + } } + }); + doneCallback(); + } else { + if (errorCallback) { + errorCallback(err); } - } else if (directoryCallback && entry.isDirectory()) { - var dirName = HintUtils.splitPath(split.dir).file; - if (dirName.indexOf(".") !== 0) { // ignore .dotfiles - directoryCallback(entry.fullPath); - } + console.log("Unable to refresh directory: ", err); } }); - doneCallback(); } else { if (errorCallback) { errorCallback(err); } - console.log("Unable to refresh directory: ", err); + console.log("Directory \"%s\" does not exist", dir); } }); } @@ -820,11 +837,27 @@ define(function (require, exports, module) { * @return {jQuery.Promise} - the Promise returned from DocumentMangaer.getDocumentForPath */ function getDocText(filePath) { - return DocumentManager.getDocumentForPath(filePath).done(function (document) { - resolvedFiles[name] = filePath; - numResolvedFiles++; - replyWith(name, getTextFromDocument(document)); + var fileSystem = ProjectManager.getFileSystem() || brackets.appFileSystem, + result = new $.Deferred(); + + fileSystem.resolve(filePath, function (err, file) { + if (!err && file.isFile()) { + DocumentManager.getDocumentForPath(filePath) + .done(function (document) { + resolvedFiles[name] = filePath; + numResolvedFiles++; + replyWith(name, getTextFromDocument(document)); + result.resolve(); + }) + .fail(function () { + result.reject(); + }); + } else { + result.reject(); + } }); + + return result.promise(); } /** diff --git a/src/extensions/default/JavaScriptCodeHints/unittests.js b/src/extensions/default/JavaScriptCodeHints/unittests.js index 76547bc752a..4b491734386 100644 --- a/src/extensions/default/JavaScriptCodeHints/unittests.js +++ b/src/extensions/default/JavaScriptCodeHints/unittests.js @@ -1542,21 +1542,25 @@ define(function (require, exports, module) { preferences; function getPreferences(path) { - var file = brackets.appFileSystem.getFileForPath(path); - preferences = null; - FileUtils.readAsText(file).done(function (text) { - var configObj = null; - try { - configObj = JSON.parse(text); - } catch (e) { - // continue with null configObj - console.log(e); + brackets.appFileSystem.resolve(path, function (err, file) { + if (!err) { + FileUtils.readAsText(file).done(function (text) { + var configObj = null; + try { + configObj = JSON.parse(text); + } catch (e) { + // continue with null configObj + console.log(e); + } + preferences = new Preferences(configObj); + }).fail(function (error) { + preferences = new Preferences(); + }); + } else { + preferences = new Preferences(); } - preferences = new Preferences(configObj); - }).fail(function (error) { - preferences = new Preferences(); }); } diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js index 2fb16d48732..a62967875fc 100644 --- a/src/file/FileUtils.js +++ b/src/file/FileUtils.js @@ -86,6 +86,8 @@ define(function (require, exports, module) { result.reject(err); } }); + + return result.promise(); } /** @const */ diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js index c830798e7dd..714bc60b386 100644 --- a/src/filesystem/FileSystem.js +++ b/src/filesystem/FileSystem.js @@ -155,18 +155,6 @@ define(function (require, exports, module) { return directory; }; - /** - * Check if the specified path exists. - * - * @param {string} path The path to test - * @param {function (boolean)} callback - */ - FileSystem.prototype.pathExists = function (path, callback) { - this._impl.exists(path, function (exists) { - callback(exists); - }.bind(this)); - }; - /** * Resolve a path. * diff --git a/src/filesystem/impls/appshell/AppshellFileSystem.js b/src/filesystem/impls/appshell/AppshellFileSystem.js index 82edf2b7d1d..e88aa5a3eeb 100644 --- a/src/filesystem/impls/appshell/AppshellFileSystem.js +++ b/src/filesystem/impls/appshell/AppshellFileSystem.js @@ -29,6 +29,7 @@ define(function (require, exports, module) { "use strict"; var FileUtils = require("file/FileUtils"), + Error = require("filesystem/Error"), NodeConnection = require("utils/NodeConnection"); /** @@ -51,6 +52,30 @@ define(function (require, exports, module) { var _changeTimeout, // Timeout used to batch up file watcher changes _pendingChanges = {}; // Pending file watcher changes + function _mapError(err) { + if (!err) { + return null; + } + + switch (err) { + case appshell.fs.ERR_INVALID_PARAMS: + return Error.INVALID_PARAMS; + case appshell.fs.ERR_NOT_FOUND: + return Error.NOT_FOUND; + case appshell.fs.ERR_CANT_READ: + return Error.NOT_READABLE; + case appshell.fs.ERR_CANT_WRITE: + return Error.NOT_WRITABLE; + case appshell.fs.ERR_UNSUPPORTED_ENCODING: + return Error.NOT_READABLE; + case appshell.fs.ERR_OUT_OF_SPACE: + return Error.OUT_OF_SPACE; + case appshell.fs.ERR_FILE_EXISTS: + return Error.ALREADY_EXISTS; + } + return Error.UNKNOWN; + } + function init(callback) { if (!_nodeConnectionDeferred) { _nodeConnectionDeferred = new $.Deferred(); @@ -91,20 +116,28 @@ define(function (require, exports, module) { callback(); } + function _wrap(cb) { + return function (err) { + var args = Array.prototype.slice.call(arguments); + args[0] = _mapError(args[0]); + cb.apply(null, args); + }; + } + function showOpenDialog(allowMultipleSelection, chooseDirectories, title, initialPath, fileTypes, callback) { - appshell.fs.showOpenDialog(allowMultipleSelection, chooseDirectories, title, initialPath, fileTypes, callback); + appshell.fs.showOpenDialog(allowMultipleSelection, chooseDirectories, title, initialPath, fileTypes, _wrap(callback)); } function showSaveDialog(title, initialPath, proposedNewFilename, callback) { - appshell.fs.showSaveDialog(title, initialPath, proposedNewFilename, callback); + appshell.fs.showSaveDialog(title, initialPath, proposedNewFilename, _wrap(callback)); } function stat(path, callback) { - appshell.fs.stat(path, callback); + appshell.fs.stat(path, _wrap(callback)); } function isNetworkDrive(path, callback) { - appshell.fs.isNetworkDrive(path, callback); + appshell.fs.isNetworkDrive(path, _wrap(callback)); } function exists(path, callback) { @@ -124,18 +157,18 @@ define(function (require, exports, module) { var i, count = contents.length; if (err) { - callback(err); + callback(_mapError(err)); return; } contents.forEach(function (val, idx) { - stat(path + "/" + val, function (err, stat) { + appshell.fs.stat(path + "/" + val, function (err, stat) { if (!err) { stats[idx] = stat; } count--; if (count <= 0) { - callback(err, contents, stats); + callback(_mapError(err), contents, stats); } }); }); @@ -149,17 +182,17 @@ define(function (require, exports, module) { } appshell.fs.makedir(path, mode, function (err) { if (err) { - callback(err); + callback(_mapError(err)); } else { stat(path, function (err, stat) { - callback(err, stat); + callback(_mapError(err), stat); }); } }); } function rename(oldPath, newPath, callback) { - appshell.fs.rename(oldPath, newPath, callback); + appshell.fs.rename(oldPath, newPath, _wrap(callback)); } function readFile(path, options, callback) { @@ -173,10 +206,10 @@ define(function (require, exports, module) { appshell.fs.readFile(path, encoding, function (err, data) { if (err) { - callback(err, null); + callback(_mapError(err), null); } else { stat(path, function (err, stat) { - callback(err, data, stat); + callback(_mapError(err), data, stat); }); } }); @@ -193,25 +226,25 @@ define(function (require, exports, module) { appshell.fs.writeFile(path, data, encoding, function (err) { if (err) { - callback(err); + callback(_mapError(err)); } else { stat(path, function (err, stat) { - callback(err, stat); + callback(_mapError(err), stat); }); } }); } function chmod(path, mode, callback) { - appshell.fs.chmod(path, mode, callback); + appshell.fs.chmod(path, mode, _wrap(callback)); } function unlink(path, callback) { - appshell.fs.unlink(path, callback); + appshell.fs.unlink(path, _wrap(callback)); } function moveToTrash(path, callback) { - appshell.fs.moveToTrash(path, callback); + appshell.fs.moveToTrash(path, _wrap(callback)); } function _notifyChanges(callback) { diff --git a/test/SpecRunner.js b/test/SpecRunner.js index 0d5dbcf2c89..bb7c0dd3520 100644 --- a/test/SpecRunner.js +++ b/test/SpecRunner.js @@ -147,13 +147,14 @@ define(function (require, exports, module) { function writeResults(path, text) { // check if the file already exists - brackets.appFileSystem.pathExists(path, function (exists) { + var file = brackets.appFileSystem.getFileForPath(path); + + file.exists(function (exists) { if (exists) { // file exists, do not overwrite _writeResults.reject(); } else { // file not found, write the new file with xml content - var file = brackets.appFileSystem.getFileForPath(path); FileUtils.writeText(file, text) .done(function () { _writeResults.resolve(); diff --git a/test/spec/ExtensionInstallation-test.js b/test/spec/ExtensionInstallation-test.js index a018110650f..eb881a2d9e5 100644 --- a/test/spec/ExtensionInstallation-test.js +++ b/test/spec/ExtensionInstallation-test.js @@ -158,8 +158,8 @@ define(function (require, exports, module) { var expectedPath = mockGetUserExtensionPath() + "/basic-valid-extension"; expect(lastExtensionLoad.config.baseUrl).toEqual(expectedPath); expect(lastExtensionLoad.entryPoint).toEqual("main"); - brackets.appFileSystem.pathExists(extensionsRoot + "/user/basic-valid-extension/main.js", function (exists) { - if (exists) { + brackets.appFileSystem.resolve(extensionsRoot + "/user/basic-valid-extension/main.js", function (err, item) { + if (!err) { mainCheckComplete = true; } else { mainCheckComplete = true; @@ -181,8 +181,8 @@ define(function (require, exports, module) { expect(packageData.disabledReason).not.toBeNull(); expect(packageData.name).toEqual("incompatible-version"); expect(lastExtensionLoad).toEqual({}); - brackets.appFileSystem.pathExists(extensionsRoot + "/disabled/incompatible-version", function (exists) { - if (exists) { + brackets.appFileSystem.resolve(extensionsRoot + "/disabled/incompatible-version", function (err, item) { + if (!err) { directoryCheckComplete = true; } else { directoryCheckComplete = true; @@ -203,8 +203,8 @@ define(function (require, exports, module) { handlePackage(installPath, Package.remove); }); runs(function () { - brackets.appFileSystem.pathExists(installPath, function (exists) { - if (exists) { + brackets.appFileSystem.resolve(installPath, function (err, item) { + if (!err) { checkComplete = true; expect("installation path was removed").toEqual(true); } else { diff --git a/test/spec/LiveDevelopment-test.js b/test/spec/LiveDevelopment-test.js index b6c6fe09acb..57117b448ad 100644 --- a/test/spec/LiveDevelopment-test.js +++ b/test/spec/LiveDevelopment-test.js @@ -973,7 +973,6 @@ define(function (require, exports, module) { describe("Default HTML Document", function () { var brackets, - FileIndexManager, LiveDevelopment, ProjectManager, testWindow; @@ -985,7 +984,6 @@ define(function (require, exports, module) { // Load module instances from brackets.test brackets = testWindow.brackets; LiveDevelopment = brackets.test.LiveDevelopment; - FileIndexManager = brackets.test.FileIndexManager; ProjectManager = brackets.test.ProjectManager; }); }); @@ -993,7 +991,6 @@ define(function (require, exports, module) { afterLast(function () { brackets = null; - FileIndexManager = null; LiveDevelopment = null; ProjectManager = null; testWindow = null; @@ -1003,7 +1000,6 @@ define(function (require, exports, module) { function loadFileAndUpdateFileIndex(fileToLoadIntoEditor) { runs(function () { - FileIndexManager.markDirty(); waitsForDone(SpecRunnerUtils.openProjectFiles([fileToLoadIntoEditor]), "SpecRunnerUtils.openProjectFiles " + fileToLoadIntoEditor); }); } diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index 16a0945cddc..85fa9933733 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -277,7 +277,7 @@ define(function (require, exports, module) { chmod(folder, 777).then(deferred.resolve, deferred.reject); }) .fail(function (err) { - if (err === Error.NOT_FOUND) { + if (err === brackets.fs.ERR_NOT_FOUND) { // TODO: FileSystem // Resolve the promise since the folder to reset doesn't exist deferred.resolve(); } else { From d0cb1275d1ec3049551cbbc5fc257c9a6ab28856 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Tue, 8 Oct 2013 17:01:20 -0700 Subject: [PATCH 0087/1140] Use DocumentManager.getDocumentForPath() for find in files. Commented out for now since it is 3x slower. --- src/search/FindInFiles.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js index 281ebce7221..3a69200da87 100644 --- a/src/search/FindInFiles.js +++ b/src/search/FindInFiles.js @@ -773,6 +773,18 @@ define(function (require, exports, module) { _resolve(err ? null : contents); }); } + /* TODO: FileSystem Figure out why this code is significantly slower + DocumentManager.getDocumentForPath(file.fullPath) + .done(function (doc) { + _addSearchMatches(file.fullPath, doc.getText(), currentQueryExpr); + result.resolve(); + }) + .fail(function (error) { + // Always resolve. If there is an error, this file + // is skipped and we move on to the next file. + result.resolve(); + }); + */ } return result.promise(); }) From b77b6a7f49af62071c446a5df3dc9247bcc82719 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 8 Oct 2013 22:46:24 -0400 Subject: [PATCH 0088/1140] Adds preference change events. This initial implementation is bound to be not very performant. It's possibly good enough with the data we'd have right now. --- src/brackets.js | 3 +- src/editor/Editor.js | 28 ++-- src/preferences/PreferencesBase.js | 177 ++++++++++++++++++++++-- src/preferences/PreferencesManager.js | 19 ++- src/thirdparty/lodash.custom.min.js | 52 +++++++ test/SpecRunner.js | 3 +- test/spec/PreferencesBase-test.js | 188 ++++++++++++++++++++++++++ 7 files changed, 439 insertions(+), 31 deletions(-) create mode 100644 src/thirdparty/lodash.custom.min.js diff --git a/src/brackets.js b/src/brackets.js index cde040b4184..2874de6efa7 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -28,7 +28,8 @@ require.config({ paths: { "text" : "thirdparty/text/text", - "i18n" : "thirdparty/i18n/i18n" + "i18n" : "thirdparty/i18n/i18n", + "lodash" : "thirdparty/lodash.custom.min" }, // Use custom brackets property until CEF sets the correct navigator.language // NOTE: When we change to navigator.language here, we also should change to diff --git a/src/editor/Editor.js b/src/editor/Editor.js index 2f48ee98403..23d88f59cad 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -77,34 +77,36 @@ define(function (require, exports, module) { Async = require("utils/Async"), AnimationUtils = require("utils/AnimationUtils"); - var defaultPrefs = { useTabChar: false, tabSize: 4, spaceUnits: 4, closeBrackets: false, - showLineNumbers: true, styleActiveLine: false, wordWrap: true }; + PreferencesManager.definePreference("useTabChar", "boolean", false); + PreferencesManager.definePreference("tabSize", "number", 4); + PreferencesManager.definePreference("spaceUnits", "number", 4); + PreferencesManager.definePreference("closeBrackets", "boolean", false); + PreferencesManager.definePreference("showLineNumbers", "boolean", true); + PreferencesManager.definePreference("styleActiveLine", "boolean", false); + PreferencesManager.definePreference("wordWrap", "boolean", true); /** Editor preferences */ - var _prefs = PreferencesManager.getPreferenceStorage(module, defaultPrefs); - //TODO: Remove preferences migration code - PreferencesManager.handleClientIdChange(_prefs, "com.adobe.brackets.Editor"); /** @type {boolean} Global setting: When inserting new text, use tab characters? (instead of spaces) */ - var _useTabChar = _prefs.getValue("useTabChar"); + var _useTabChar = PreferencesManager.getValue("useTabChar"); /** @type {number} Global setting: Tab size */ - var _tabSize = _prefs.getValue("tabSize"); + var _tabSize = PreferencesManager.getValue("tabSize"); /** @type {number} Global setting: Space units (i.e. number of spaces when indenting) */ - var _spaceUnits = _prefs.getValue("spaceUnits"); + var _spaceUnits = PreferencesManager.getValue("spaceUnits"); /** @type {boolean} Global setting: Auto closes (, {, [, " and ' */ - var _closeBrackets = _prefs.getValue("closeBrackets"); + var _closeBrackets = PreferencesManager.getValue("closeBrackets"); /** @type {boolean} Global setting: Show line numbers in the gutter */ - var _showLineNumbers = _prefs.getValue("showLineNumbers"); + var _showLineNumbers = PreferencesManager.getValue("showLineNumbers"); /** @type {boolean} Global setting: Highlight the background of the line that has the cursor */ - var _styleActiveLine = _prefs.getValue("styleActiveLine"); + var _styleActiveLine = PreferencesManager.getValue("styleActiveLine"); /** @type {boolean} Global setting: Auto wrap lines */ - var _wordWrap = _prefs.getValue("wordWrap"); + var _wordWrap = PreferencesManager.getValue("wordWrap"); /** @type {boolean} Guard flag to prevent focus() reentrancy (via blur handlers), even across Editors */ var _duringFocus = false; @@ -1521,7 +1523,7 @@ define(function (require, exports, module) { */ function _setEditorOptionAndPref(value, cmOption, prefName) { _setEditorOption(value, cmOption); - _prefs.setValue(prefName, value); + PreferencesManager.setValueAndSave("user", prefName, value); } /** diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js index ce9827f1ad4..e85fddcba40 100644 --- a/src/preferences/PreferencesBase.js +++ b/src/preferences/PreferencesBase.js @@ -37,8 +37,11 @@ define(function (require, exports, module) { NativeFileSystem = require("file/NativeFileSystem").NativeFileSystem, ExtensionLoader = require("utils/ExtensionLoader"), CollectionUtils = require("utils/CollectionUtils"), + _ = require("lodash"), Async = require("utils/Async"); - + + var PREFERENCE_CHANGE = "preferenceChange"; + function MemoryStorage(data) { this.data = data || {}; } @@ -155,6 +158,16 @@ define(function (require, exports, module) { } } return this.data[id]; + }, + + getKeys: function (layers) { + var data = this.data, + keys = _.keys(data); + + layers.forEach(function (layer) { + keys = layer(data, keys); + }); + return keys; } }; @@ -163,13 +176,26 @@ define(function (require, exports, module) { LanguageLayer.prototype = { setLanguage: function (languageID) { + $(this).trigger("beforeLayerChange"); this.language = languageID; + $(this).trigger("afterLayerChange"); }, getValue: function (data, id) { - if (data.language && data.language[this.language]) { - return data.language[this.language][id]; + var language = this.language; + if (data.language && data.language[language]) { + return data.language[language][id]; + } + }, + + getKeys: function (data, currentKeyList) { + var language = this.language; + currentKeyList = _.without(currentKeyList, "language"); + if (data.language && data.language[language]) { + var languageKeys = _.keys(data.language[language]); + return _.union(currentKeyList, languageKeys); } + return currentKeyList; } }; @@ -187,6 +213,10 @@ define(function (require, exports, module) { this._layers = {}; this._layerGetters = []; + this._layerKeys = []; + + this._saveInProgress = false; + this._nextSaveDeferred = null; } PreferencesManager.prototype = { @@ -243,8 +273,10 @@ define(function (require, exports, module) { scope.load() .then(function () { - this._scopes[id] = scope; - this.addToScopeOrder(id, addBefore); + this._inspectChangesAndFire(function () { + this._scopes[id] = scope; + this.addToScopeOrder(id, addBefore); + }.bind(this)); deferred.resolve(id, scope); }.bind(this)) .fail(function (err) { @@ -259,19 +291,102 @@ define(function (require, exports, module) { }, removeScope: function (id) { - delete this._scopes[id]; - var scopeIndex = this._scopeOrder.indexOf(id); - if (scopeIndex > -1) { - this._scopeOrder.splice(scopeIndex, 1); + this._inspectChangesAndFire(function () { + delete this._scopes[id]; + var scopeIndex = this._scopeOrder.indexOf(id); + if (scopeIndex > -1) { + this._scopeOrder.splice(scopeIndex, 1); + } + }.bind(this)); + }, + + _getAllKeysAndPrefs: function (extraKeys) { + var layerKeys = this._layerKeys; + + var keys = _.map(this._scopes, function (scope) { + return scope.getKeys(layerKeys); + }); + + keys = _.union.apply(null, keys); + if (extraKeys) { + keys = _.union(keys, extraKeys); } + + var prefs = _.object(keys, _.map(keys, function (key) { + return this.getValue(key); + }.bind(this))); + + return { + keys: keys, + prefs: prefs + }; + }, + + _inspectChangesAndFire: function (operation) { + var before = this._getAllKeysAndPrefs(); + + operation(); + + var after = this._getAllKeysAndPrefs(before.keys); + + this._fireChanges(before, after); + }, + + _fireChanges: function (before, after) { + var differentProps = _.map(after.keys, function (key) { + var beforeValue = before.prefs[key], + afterValue = after.prefs[key]; + + if (afterValue !== beforeValue) { + return { + id: key, + oldValue: beforeValue, + newValue: afterValue + }; + } + return undefined; + }); + + var self = $(this); + differentProps.forEach(function (data) { + if (data !== undefined) { + self.trigger("preferenceChange", data); + } + }); + }, addLayer: function (id, layer) { if (this._layers[id]) { throw new Error("Attempt to redefine preferences layer: " + id); } - this._layers[id] = layer; - this._layerGetters.push(layer.getValue.bind(layer)); + + this._inspectChangesAndFire(function () { + this._layers[id] = layer; + this._layerGetters.push(layer.getValue.bind(layer)); + this._layerKeys.push(layer.getKeys.bind(layer)); + }.bind(this)); + + $(layer).on("beforeLayerChange", this._beforeLayerChange.bind(this)); + $(layer).on("afterLayerChange", this._afterLayerChange.bind(this)); + }, + + _beforeLayerChange: function () { + this._preLayerChangeData = this._getAllKeysAndPrefs(); + }, + + _afterLayerChange: function () { + if (!this._preLayerChangeData) { + console.error("After layer change fired without before layer change. This should not happen."); + return; + } + + var before = this._preLayerChangeData; + delete this._preLayerChangeData; + + var after = this._getAllKeysAndPrefs(before.keys); + + this._fireChanges(before, after); }, setValue: function (scopeName, id, value) { @@ -280,10 +395,21 @@ define(function (require, exports, module) { throw new Error("Attempt to set preference in non-existent scope: " + scopeName); } + var oldValue = this.getValue(id); scope.setValue(id, value); + + var newValue = this.getValue(id); + + if (oldValue !== newValue) { + $(this).trigger(PREFERENCE_CHANGE, { + id: id, + newValue: newValue, + oldValue: oldValue + }); + } }, - getValue: function (id, value) { + getValue: function (id) { var scopeCounter, scopeOrder = this._scopeOrder, layerGetters = this._layerGetters; @@ -298,10 +424,33 @@ define(function (require, exports, module) { }, save: function () { - return Async.doInParallel(this._scopeOrder, function (id) { + if (this._saveInProgress) { + if (!this._nextSaveDeferred) { + this._nextSaveDeferred = $.Deferred(); + } + return this._nextSaveDeferred.promise(); + } + + this._saveInProgress = true; + var deferred = this._nextSaveDeferred || $.Deferred(); + this._nextSaveDeferred = null; + + Async.doInParallel(this._scopeOrder, function (id) { var scope = this._scopes[id]; return scope.save(); - }.bind(this)); + }.bind(this)) + .then(function () { + this._saveInProgress = false; + if (this._nextSaveDeferred) { + this.save(); + } + deferred.resolve(); + }.bind(this)) + .fail(function (err) { + deferred.reject(err); + }); + + return deferred.promise(); } }; diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index b2c7568a6e0..954394600d3 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -227,7 +227,8 @@ define(function (require, exports, module) { // New code follows. The code above (with the exception of the imports) is // deprecated. - var SETTINGS_FILENAME = "brackets.settings.json"; + var SETTINGS_FILENAME = "brackets.settings.json", + STATE_FILENAME = "state.json"; var preferencesManager = new PreferencesBase.PreferencesManager(); @@ -235,15 +236,29 @@ define(function (require, exports, module) { preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true), "default"); preferencesManager.addScope("session", new PreferencesBase.MemoryStorage(), "user"); + preferencesManager.addLayer("language", new PreferencesBase.LanguageLayer()); + + var stateManager = new PreferencesBase.PreferencesManager(); + var userStateFile = brackets.app.getApplicationSupportDirectory() + "/" + SETTINGS_FILENAME; + + stateManager.addScope("user", new PreferencesBase.FileStorage(userStateFile, true), "default"); + + function setValueAndSave(scopeName, id, value) { + preferencesManager.setValue(scopeName, id, value); + preferencesManager.save(); + } // Private API for unit testing and use elsewhere exports._manager = preferencesManager; - + // Public API exports.getValue = preferencesManager.getValue.bind(preferencesManager); exports.setValue = preferencesManager.setValue.bind(preferencesManager); + exports.save = preferencesManager.save.bind(preferencesManager); + exports.setValueAndSave = setValueAndSave; exports.addScope = preferencesManager.addScope.bind(preferencesManager); exports.removeScope = preferencesManager.removeScope.bind(preferencesManager); + exports.stateManager = stateManager; exports.FileStorage = PreferencesBase.FileStorage; exports.SETTINGS_FILENAME = SETTINGS_FILENAME; exports.definePreference = preferencesManager.definePreference.bind(preferencesManager); diff --git a/src/thirdparty/lodash.custom.min.js b/src/thirdparty/lodash.custom.min.js new file mode 100644 index 00000000000..87dc1f4da2b --- /dev/null +++ b/src/thirdparty/lodash.custom.min.js @@ -0,0 +1,52 @@ +/** + * @license + * Lo-Dash 2.2.0 (Custom Build) lodash.com/license | Underscore.js 1.5.2 underscorejs.org/LICENSE + * Build: `lodash modern -m exports="amd"` + */ +;(function(){function n(n,t,e){e=(e||0)-1;for(var r=n?n.length:0;++er||typeof e=="undefined")return 1;if(ee?0:e);++r=d&&f===n,h=u||v?i():s;if(v){var g=o(h);g?(f=t,h=g):(v=!1,h=u?h:(c(h),s))}for(;++af(h,y))&&((u||v)&&h.push(y),s.push(g))}return v?(c(h.k),p(h)):u&&c(h),s}function it(n){return function(t,e,r){var u={};e=Z.createCallback(e,r,3),r=-1;var o=t?t.length:0;if(typeof o=="number")for(;++re?Se(0,o+e):e)||0,ze(n)?a=-1o&&(o=i)}}else t=!t&&_t(n)?r:Z.createCallback(t,e,3),Ot(n,function(n,e,r){e=t(n,e,r),e>u&&(u=e,o=n)});return o}function St(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number")for(var u=Qt(r);++earguments.length;t=et(t,r,4);var o=-1,a=n.length;if(typeof a=="number")for(u&&(e=n[++o]);++oarguments.length;return t=et(t,r,4),It(n,function(n,r,o){e=u?(u=!1,n):t(e,n,r,o)}),e}function Dt(n){var t=-1,e=n?n.length:0,r=Qt(typeof e=="number"?e:0);return Ot(n,function(n){var e=Ht(++t);r[t]=r[e],r[e]=n}),r}function Bt(n,t,e){var r;t=Z.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e=d&&u===n; +if(l){var c=o(i);c?(u=t,i=c):l=!1}for(;++ru(i,c)&&f.push(c);return l&&p(i),f}function Ft(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=-1;for(t=Z.createCallback(t,e,3);++or?Se(0,u+r):r||0}else if(r)return r=qt(t,e),t[r]===e?r:-1;return n(t,e,r)}function Wt(n,t,e){if(typeof t!="number"&&null!=t){var r=0,u=-1,o=n?n.length:0; +for(t=Z.createCallback(t,e,3);++u>>1,e(n[r])e?0:e);++t/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:N,variable:"",imports:{_:Z}};var qe=ke?function(n,t){U.value=t,ke(n,"__bindData__",U)}:l,ze=Oe||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&we.call(n)==$||!1},Pe=Ee?function(n){return bt(n)?Ee(n):[]}:Q,Ke={"&":"&","<":"<",">":">",'"':""","'":"'"},Le=yt(Ke),Me=re("("+Pe(Le).join("|")+")","g"),Ue=re("["+Pe(Ke).join("")+"]","g"),Ve=it(function(n,t,e){ge.call(n,e)?n[e]++:n[e]=1 +}),Ge=it(function(n,t,e){(ge.call(n,e)?n[e]:n[e]=[]).push(t)}),He=it(function(n,t,e){n[e]=t});Fe&&X&&typeof be=="function"&&(Ut=function(n){if(!mt(n))throw new oe;return be.apply(e,arguments)});var Je=8==Ae(w+"08")?Ae:function(n,t){return Ae(_t(n)?n.replace(E,""):n,t||0)};return Z.after=function(n,t){if(!mt(t))throw new oe;return function(){return 1>--n?t.apply(this,arguments):void 0}},Z.assign=J,Z.at=function(n){for(var t=arguments,e=-1,r=rt(t,!0,!1,1),t=t[2]&&t[2][t[1]]===n?1:r.length,u=Qt(t);++e=d&&o(a?r[a]:g)}n:for(;++l(m?t(m,y):s(g,y))){for(a=u,(m||g).push(y);--a;)if(m=f[a],0>(m?t(m,y):s(r[a],y)))continue n;h.push(y)}}for(;u--;)(m=f[u])&&p(m);return c(f),c(g),h},Z.invert=yt,Z.invoke=function(n,t){var e=Be.call(arguments,2),r=-1,u=typeof t=="function",o=n?n.length:0,a=Qt(typeof o=="number"?o:0); +return Ot(n,function(n){a[++r]=(u?t:n[t]).apply(n,e)}),a},Z.keys=Pe,Z.map=Nt,Z.max=Et,Z.memoize=function(n,t){function e(){var r=e.cache,u=t?t.apply(this,arguments):b+arguments[0];return ge.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}if(!mt(n))throw new oe;return e.cache={},e},Z.merge=function(n){var t=arguments,e=2;if(!bt(n))return n;if("number"!=typeof t[2]&&(e=t.length),3r(a,e))&&(o[e]=n)}),o},Z.once=function(n){var t,e;if(!mt(n))throw new oe;return function(){return t?e:(t=!0,e=n.apply(this,arguments),n=null,e) +}},Z.pairs=function(n){for(var t=-1,e=Pe(n),r=e.length,u=Qt(r);++te?Se(0,r+e):Re(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},Z.mixin=Gt,Z.noConflict=function(){return e._=fe,this},Z.parseInt=Je,Z.random=Ht,Z.reduce=Rt,Z.reduceRight=At,Z.result=function(n,t){if(n){var e=n[t];return mt(e)?n[t]():e}},Z.runInContext=v,Z.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Pe(n).length},Z.some=Bt,Z.sortedIndex=qt,Z.template=function(n,t,e){var r=Z.templateSettings; +n||(n=""),e=G({},e,r);var u,o=G({},e.imports,r.imports),r=Pe(o),o=wt(o),i=0,f=e.interpolate||S,l="__p+='",f=re((e.escape||S).source+"|"+f.source+"|"+(f===N?C:S).source+"|"+(e.evaluate||S).source+"|$","g");n.replace(f,function(t,e,r,o,f,c){return r||(r=o),l+=n.slice(i,c).replace(A,a),e&&(l+="'+__e("+e+")+'"),f&&(u=!0,l+="';"+f+";__p+='"),r&&(l+="'+((__t=("+r+"))==null?'':__t)+'"),i=c+t.length,t}),l+="';\n",f=e=e.variable,f||(e="obj",l="with("+e+"){"+l+"}"),l=(u?l.replace(j,""):l).replace(k,"$1").replace(x,"$1;"),l="function("+e+"){"+(f?"":e+"||("+e+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}"; +try{var c=Zt(r,"return "+l).apply(h,o)}catch(p){throw p.source=l,p}return t?c(t):(c.source=l,c)},Z.unescape=function(n){return null==n?"":ue(n).replace(Me,st)},Z.uniqueId=function(n){var t=++m;return ue(null==n?"":n)+t},Z.all=kt,Z.any=Bt,Z.detect=Ct,Z.findWhere=Ct,Z.foldl=Rt,Z.foldr=At,Z.include=jt,Z.inject=Rt,y(Z,function(n,t){Z.prototype[t]||(Z.prototype[t]=function(){var t=[this.__wrapped__],e=this.__chain__;return me.apply(t,arguments),t=n.apply(Z,t),e?new nt(t,e):t})}),Z.first=Ft,Z.last=function(n,t,e){var r=0,u=n?n.length:0; +if(typeof t!="number"&&null!=t){var o=u;for(t=Z.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else if(r=t,null==r||e)return n?n[u-1]:h;return s(n,Se(0,u-r))},Z.sample=function(n,t,e){var r=n?n.length:0;return typeof r!="number"&&(n=wt(n)),null==t||e?n?n[Ht(r-1)]:h:(n=Dt(n),n.length=Re(Se(0,t),n.length),n)},Z.take=Ft,Z.head=Ft,y(Z,function(n,t){var e="sample"!==t;Z.prototype[t]||(Z.prototype[t]=function(t,r){var u=this.__chain__,o=n(this.__wrapped__,t,r);return u||null!=t&&(!r||e&&typeof t=="function")?new nt(o,u):o +})}),Z.VERSION="2.2.0",Z.prototype.chain=function(){return this.__chain__=!0,this},Z.prototype.toString=function(){return ue(this.__wrapped__)},Z.prototype.value=Jt,Z.prototype.valueOf=Jt,Ot(["join","pop","shift"],function(n){var t=ae[n];Z.prototype[n]=function(){var n=this.__chain__,e=t.apply(this.__wrapped__,arguments);return n?new nt(e,n):e}}),Ot(["push","reverse","sort","unshift"],function(n){var t=ae[n];Z.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),Ot(["concat","slice","splice"],function(n){var t=ae[n]; +Z.prototype[n]=function(){return new nt(t.apply(this.__wrapped__,arguments),this.__chain__)}}),Z}var h,g=[],y=[],m=0,b=+new Date+"",d=75,_=40,w=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",j=/\b__p\+='';/g,k=/\b(__p\+=)''\+/g,x=/(__e\(.*?\)|\b__t\))\+'';/g,C=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,O=/\w*$/,I=/^function[ \n\r\t]+\w/,N=/<%=([\s\S]+?)%>/g,E=RegExp("^["+w+"]*0+(?=.$)"),S=/($^)/,R=/\bthis\b/,A=/['\n\r\t\u2028\u2029\\]/g,D="Array Boolean Date Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setImmediate setTimeout".split(" "),B="[object Arguments]",$="[object Array]",F="[object Boolean]",T="[object Date]",W="[object Function]",q="[object Number]",z="[object Object]",P="[object RegExp]",K="[object String]",L={}; +L[W]=!1,L[B]=L[$]=L[F]=L[T]=L[q]=L[z]=L[P]=L[K]=!0;var M={leading:!1,maxWait:0,trailing:!1},U={configurable:!1,enumerable:!1,value:null,writable:!1},V={"boolean":!1,"function":!0,object:!0,number:!1,string:!1,undefined:!1},G={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},H=V[typeof window]&&window||this,J=V[typeof exports]&&exports&&!exports.nodeType&&exports,Q=V[typeof module]&&module&&!module.nodeType&&module,X=Q&&Q.exports===J&&J,Y=v();typeof define=="function"&&typeof define.amd=="object"&&define.amd&& define(function(){return Y +})}).call(this); \ No newline at end of file diff --git a/test/SpecRunner.js b/test/SpecRunner.js index 212edeafee0..d77e3be2566 100644 --- a/test/SpecRunner.js +++ b/test/SpecRunner.js @@ -32,7 +32,8 @@ require.config({ "perf" : "../test/perf", "spec" : "../test/spec", "text" : "thirdparty/text/text", - "i18n" : "thirdparty/i18n/i18n" + "i18n" : "thirdparty/i18n/i18n", + "lodash" : "thirdparty/lodash.custom.min" } }); diff --git a/test/spec/PreferencesBase-test.js b/test/spec/PreferencesBase-test.js index 5a845318629..e7641380600 100644 --- a/test/spec/PreferencesBase-test.js +++ b/test/spec/PreferencesBase-test.js @@ -61,6 +61,74 @@ define(function (require, exports, module) { }); }); + describe("Language Layer", function () { + var data = { + spaceUnits: 4, + useTabChar: false, + language: { + html: { + spaceUnits: 2 + } + } + }; + + it("should be able to find preferences", function () { + var layer = new PreferencesBase.LanguageLayer(); + + expect(layer.getValue(data, "useTabChar")).toBeUndefined(); + expect(layer.getValue(data, "spaceUnits")).toBeUndefined(); + layer.setLanguage("html"); + expect(layer.getValue(data, "spaceUnits")).toBe(2); + }); + + it("can create a list of known keys", function () { + var layer = new PreferencesBase.LanguageLayer(); + expect(layer.getKeys(data, [])).toEqual([]); + + layer.setLanguage("html"); + expect(layer.getKeys(data, [])).toEqual(["spaceUnits"]); + + expect(layer.getKeys(data, ["language"])).toEqual(["spaceUnits"]); + }); + }); + + describe("Scope", function () { + var data = { + spaceUnits: 4, + useTabChar: false, + language: { + html: { + spaceUnits: 2 + } + } + }; + + var layer = new PreferencesBase.LanguageLayer(); + var layerGetters = [layer.getValue.bind(layer)]; + var layerKeys = [layer.getKeys.bind(layer)]; + + var scope; + + beforeEach(function () { + scope = new PreferencesBase.Scope(new PreferencesBase.MemoryStorage(data)); + // MemoryStorage operates synchronously + scope.load(); + layer.setLanguage(""); + }); + + it("should look up a value", function () { + expect(scope.getValue("spaceUnits", layerGetters)).toBe(4); + layer.setLanguage("html"); + expect(scope.getValue("spaceUnits", layerGetters)).toBe(2); + expect(scope.getValue("useTabChar", layerGetters)).toBe(false); + }); + + it("should provide lists of keys", function () { + expect(scope.getKeys([])).toEqual(["spaceUnits", "useTabChar", "language"]); + expect(scope.getKeys(layerKeys)).toEqual(["spaceUnits", "useTabChar"]); + }); + }); + describe("Preferences Manager", function () { it("should yield an error if a preference is redefined", function () { var pm = new PreferencesBase.PreferencesManager(); @@ -198,6 +266,126 @@ define(function (require, exports, module) { layer.setLanguage("python"); expect(pm.getValue("spaceUnits")).toBe(4); }); + + it("can notify of preference changes through setValue", function () { + var pm = new PreferencesBase.PreferencesManager(); + pm.definePreference("spaceUnits", "number", 4); + pm.addScope("user", new PreferencesBase.MemoryStorage()); + var eventData; + $(pm).on("preferenceChange", function (e, data) { + eventData = data; + }); + + pm.setValue("user", "testing", true); + expect(eventData).toBeDefined(); + expect(eventData.id).toBe("testing"); + expect(eventData.newValue).toBe(true); + + eventData = undefined; + pm.setValue("user", "spaceUnits", 4); + expect(eventData).toBeUndefined(); + + eventData = undefined; + pm.setValue("user", "testing", true); + expect(eventData).toBeUndefined(); + + pm.addScope("session", new PreferencesBase.MemoryStorage()); + eventData = undefined; + pm.setValue("session", "testing", true); + expect(eventData).toBeUndefined(); + + eventData = undefined; + pm.setValue("user", "testing", false); + expect(eventData).toBeUndefined(); + + eventData = undefined; + pm.setValue("session", "testing", false); + expect(eventData).toBeDefined(); + + eventData = undefined; + pm.setValue("user", "spaceUnits", 2); + expect(eventData).toEqual({ + id: "spaceUnits", + newValue: 2, + oldValue: 4 + }); + }); + + it("can notify of preference changes via scope changes", function () { + var pm = new PreferencesBase.PreferencesManager(); + pm.definePreference("spaceUnits", "number", 4); + + var eventData = []; + $(pm).on("preferenceChange", function (e, data) { + eventData.push(data); + }); + + pm.addScope("user", new PreferencesBase.MemoryStorage({ + spaceUnits: 4, + elephants: "charging" + })); + + expect(eventData).toEqual([{ + id: "elephants", + oldValue: undefined, + newValue: "charging" + }]); + + eventData = []; + pm.addScope("preuser", new PreferencesBase.MemoryStorage({ + elephants: "docile" + }), "default"); + expect(eventData).toEqual([]); + + eventData = []; + pm.removeScope("user"); + expect(eventData).toEqual([{ + id: "elephants", + oldValue: "charging", + newValue: "docile" + }]); + }); + + it("notifies when there are layer changes", function () { + var pm = new PreferencesBase.PreferencesManager(); + + var data = { + spaceUnits: 4, + useTabChar: false, + language: { + html: { + spaceUnits: 2 + }, + go: { + spaceUnits: 3291 + } + } + }; + pm.addScope("user", new PreferencesBase.MemoryStorage(data)); + + var layer = new PreferencesBase.LanguageLayer(); + layer.setLanguage("go"); + + var eventData = []; + $(pm).on("preferenceChange", function (e, data) { + eventData.push(data); + }); + + pm.addLayer("language", layer); + expect(eventData).toEqual([{ + id: "spaceUnits", + oldValue: 4, + newValue: 3291 + }]); + + eventData = []; + layer.setLanguage("html"); + expect(eventData).toEqual([{ + id: "spaceUnits", + oldValue: 3291, + newValue: 2 + }]); + }); }); describe("File Storage", function () { From a6ef7f95ce7f01ba11406efb8c0f1fee6e8078c6 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 8 Oct 2013 23:34:26 -0400 Subject: [PATCH 0089/1140] Project settings are automatically re-applied on save. The Editor listens for preference changes and handles them as they happen. --- src/editor/Editor.js | 49 ++++++++++++++++++--------- src/preferences/PreferencesManager.js | 5 +++ src/project/ProjectManager.js | 12 +++++-- 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/editor/Editor.js b/src/editor/Editor.js index 23d88f59cad..aab00dbfe56 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -1520,19 +1520,23 @@ define(function (require, exports, module) { * @param {boolean | number} value * @param {string} cmOption - CodeMirror option string * @param {string} prefName - preference name string + * @param {boolean} _editorOnly private flag to denote that pref should not be changed */ - function _setEditorOptionAndPref(value, cmOption, prefName) { + function _setEditorOptionAndPref(value, cmOption, prefName, _editorOnly) { _setEditorOption(value, cmOption); - PreferencesManager.setValueAndSave("user", prefName, value); + if (!_editorOnly) { + PreferencesManager.setValueAndSave("user", prefName, value); + } } /** * Sets whether to use tab characters (vs. spaces) when inserting new text. Affects all Editors. * @param {boolean} value + * @param {boolean} _editorOnly private flag to denote that pref should not be changed */ - Editor.setUseTabChar = function (value) { + Editor.setUseTabChar = function (value, _editorOnly) { _useTabChar = value; - _setEditorOptionAndPref(value, "indentWithTabs", "useTabChar"); + _setEditorOptionAndPref(value, "indentWithTabs", "useTabChar", _editorOnly); _setEditorOption(_useTabChar ? _tabSize : _spaceUnits, "indentUnit"); }; @@ -1544,10 +1548,11 @@ define(function (require, exports, module) { /** * Sets tab character width. Affects all Editors. * @param {number} value + * @param {boolean} _editorOnly private flag to denote that pref should not be changed */ - Editor.setTabSize = function (value) { + Editor.setTabSize = function (value, _editorOnly) { _tabSize = value; - _setEditorOptionAndPref(value, "tabSize", "tabSize"); + _setEditorOptionAndPref(value, "tabSize", "tabSize", _editorOnly); _setEditorOption(value, "indentUnit"); }; @@ -1559,10 +1564,11 @@ define(function (require, exports, module) { /** * Sets indentation width. Affects all Editors. * @param {number} value + * @param {boolean} _editorOnly private flag to denote that pref should not be changed */ - Editor.setSpaceUnits = function (value) { + Editor.setSpaceUnits = function (value, _editorOnly) { _spaceUnits = value; - _setEditorOptionAndPref(value, "indentUnit", "spaceUnits"); + _setEditorOptionAndPref(value, "indentUnit", "spaceUnits", _editorOnly); }; /** @type {number} Get indentation width */ @@ -1573,10 +1579,11 @@ define(function (require, exports, module) { /** * Sets the auto close brackets. Affects all Editors. * @param {boolean} value + * @param {boolean} _editorOnly private flag to denote that pref should not be changed */ - Editor.setCloseBrackets = function (value) { + Editor.setCloseBrackets = function (value, _editorOnly) { _closeBrackets = value; - _setEditorOptionAndPref(value, "autoCloseBrackets", "closeBrackets"); + _setEditorOptionAndPref(value, "autoCloseBrackets", "closeBrackets", _editorOnly); }; /** @type {boolean} Gets whether all Editors use auto close brackets */ @@ -1587,10 +1594,11 @@ define(function (require, exports, module) { /** * Sets show line numbers option and reapply it to all open editors. * @param {boolean} value + * @param {boolean} _editorOnly private flag to denote that pref should not be changed */ - Editor.setShowLineNumbers = function (value) { + Editor.setShowLineNumbers = function (value, _editorOnly) { _showLineNumbers = value; - _setEditorOptionAndPref(value, "lineNumbers", "showLineNumbers"); + _setEditorOptionAndPref(value, "lineNumbers", "showLineNumbers", _editorOnly); }; /** @type {boolean} Returns true if show line numbers is enabled for all editors */ @@ -1601,10 +1609,11 @@ define(function (require, exports, module) { /** * Sets show active line option and reapply it to all open editors. * @param {boolean} value + * @param {boolean} _editorOnly private flag to denote that pref should not be changed */ - Editor.setShowActiveLine = function (value) { + Editor.setShowActiveLine = function (value, _editorOnly) { _styleActiveLine = value; - _setEditorOptionAndPref(value, "styleActiveLine", "styleActiveLine"); + _setEditorOptionAndPref(value, "styleActiveLine", "styleActiveLine", _editorOnly); }; /** @type {boolean} Returns true if show active line is enabled for all editors */ @@ -1615,10 +1624,11 @@ define(function (require, exports, module) { /** * Sets word wrap option and reapply it to all open editors. * @param {boolean} value + * @param {boolean} _editorOnly private flag to denote that pref should not be changed */ - Editor.setWordWrap = function (value) { + Editor.setWordWrap = function (value, _editorOnly) { _wordWrap = value; - _setEditorOptionAndPref(value, "lineWrapping", "wordWrap"); + _setEditorOptionAndPref(value, "lineWrapping", "wordWrap", _editorOnly); }; /** @type {boolean} Returns true if word wrap is enabled for all editors */ @@ -1626,6 +1636,13 @@ define(function (require, exports, module) { return _wordWrap; }; + $(PreferencesManager).on("preferenceChange", function (e, data) { + var setterName = "set" + data.id[0].toUpperCase() + data.id.substr(1); + if (Editor[setterName]) { + Editor[setterName](data.newValue, true); + } + }); + // Define public API exports.Editor = Editor; exports.BOUNDARY_CHECK_NORMAL = BOUNDARY_CHECK_NORMAL; diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 954394600d3..0078788f280 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -238,11 +238,16 @@ define(function (require, exports, module) { preferencesManager.addScope("session", new PreferencesBase.MemoryStorage(), "user"); preferencesManager.addLayer("language", new PreferencesBase.LanguageLayer()); + $(preferencesManager).on("preferenceChange", function (e, data) { + $(exports).trigger("preferenceChange", data); + }); + var stateManager = new PreferencesBase.PreferencesManager(); var userStateFile = brackets.app.getApplicationSupportDirectory() + "/" + SETTINGS_FILENAME; stateManager.addScope("user", new PreferencesBase.FileStorage(userStateFile, true), "default"); + function setValueAndSave(scopeName, id, value) { preferencesManager.setValue(scopeName, id, value); preferencesManager.save(); diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index d54c7f4383f..f12900329e8 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -1572,13 +1572,21 @@ define(function (require, exports, module) { _prefs = PreferencesManager.getPreferenceStorage(module, defaults); //TODO: Remove preferences migration code PreferencesManager.handleClientIdChange(_prefs, "com.adobe.brackets.ProjectManager"); - - $(exports).on("projectOpen", function () { + + function _reloadProjectPreferencesScope() { PreferencesManager.removeScope("project"); var root = getProjectRoot(); if (root) { PreferencesManager.addScope("project", new PreferencesManager.FileStorage(root.fullPath + PreferencesManager.SETTINGS_FILENAME), "user"); } + } + + $(exports).on("projectOpen", _reloadProjectPreferencesScope); + + $(DocumentManager).on("documentSaved", function (e, document) { + if (document.file && FileUtils.getDirectoryPath(document.file.fullPath) === _projectRoot.fullPath && document.file.name === PreferencesManager.SETTINGS_FILENAME) { + _reloadProjectPreferencesScope(); + } }); From b1a8595f27f1d6bd441bbcb05d3fb5c0f30fa386 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 8 Oct 2013 23:46:16 -0400 Subject: [PATCH 0090/1140] The language layer is now set properly. --- src/document/DocumentManager.js | 7 +++++++ src/preferences/PreferencesManager.js | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 867dd54de04..55b72734ffc 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -493,6 +493,13 @@ define(function (require, exports, module) { _currentDocument = doc; $(exports).triggerHandler("currentDocumentChange"); // (this event triggers EditorManager to actually switch editors in the UI) + + // Set the language layer in the preferences. + if (doc.language) { + PreferencesManager._setLanguage(doc.language.getId()); + } else { + PreferencesManager._setLanguage(); + } PerfUtils.addMeasurement(perfTimerName); } diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js index 0078788f280..aea01d13f02 100644 --- a/src/preferences/PreferencesManager.js +++ b/src/preferences/PreferencesManager.js @@ -236,7 +236,9 @@ define(function (require, exports, module) { preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true), "default"); preferencesManager.addScope("session", new PreferencesBase.MemoryStorage(), "user"); - preferencesManager.addLayer("language", new PreferencesBase.LanguageLayer()); + + var languageLayer = new PreferencesBase.LanguageLayer(); + preferencesManager.addLayer("language", languageLayer); $(preferencesManager).on("preferenceChange", function (e, data) { $(exports).trigger("preferenceChange", data); @@ -253,8 +255,9 @@ define(function (require, exports, module) { preferencesManager.save(); } - // Private API for unit testing and use elsewhere + // Private API for unit testing and use elsewhere in Brackets core exports._manager = preferencesManager; + exports._setLanguage = languageLayer.setLanguage.bind(languageLayer); // Public API exports.getValue = preferencesManager.getValue.bind(preferencesManager); From ef79d542667a39c7317bc038f150fd9ca6bd5663 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Tue, 8 Oct 2013 23:53:04 -0400 Subject: [PATCH 0091/1140] Update status bar when editor settings change. --- src/editor/EditorStatusBar.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/editor/EditorStatusBar.js b/src/editor/EditorStatusBar.js index 3a82f96f78b..3e0f5070a35 100644 --- a/src/editor/EditorStatusBar.js +++ b/src/editor/EditorStatusBar.js @@ -154,6 +154,10 @@ define(function (require, exports, module) { StatusBar.show(); // calls resizeEditor() if needed $(current).on("cursorActivity.statusbar", _updateCursorInfo); + $(current).on("optionChange.statusbar", function () { + _updateIndentType(); + _updateIndentSize(); + }); $(current).on("change.statusbar", function () { // async update to keep typing speed smooth window.setTimeout(function () { _updateFileInfo(current); }, 0); From ded93989ee6863bb6e9ad654f23b1d6759d5caa1 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Wed, 9 Oct 2013 00:00:50 -0400 Subject: [PATCH 0092/1140] Adds support for default extension setting for new files. --- brackets.settings.json | 3 ++- src/document/DocumentCommandHandlers.js | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/brackets.settings.json b/brackets.settings.json index 4b5ececc2b4..bba31e68e03 100644 --- a/brackets.settings.json +++ b/brackets.settings.json @@ -6,5 +6,6 @@ "nomen": true, "indent": 4, "maxerr": 50 - } + }, + "defaultExtension": "js" } \ No newline at end of file diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index c80fa475506..bea99cb706c 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -73,6 +73,8 @@ define(function (require, exports, module) { /** Unique token used to indicate user-driven cancellation of Save As (as opposed to file IO error) */ var USER_CANCELED = { userCanceled: true }; + + PreferencesManager.definePreference("defaultExtension", "string", ""); function updateTitle() { var currentDoc = DocumentManager.getCurrentDocument(), @@ -448,7 +450,12 @@ define(function (require, exports, module) { * Promise is resolved (synchronously) with the newly-created Document. */ function handleFileNew() { - var doc = DocumentManager.createUntitledDocument(_nextUntitledIndexToUse++, ""); + var defaultExtension = PreferencesManager.getValue("defaultExtension"); + if (defaultExtension) { + defaultExtension = "." + defaultExtension; + } + + var doc = DocumentManager.createUntitledDocument(_nextUntitledIndexToUse++, defaultExtension); DocumentManager.setCurrentDocument(doc); EditorManager.focusEditor(); From 0811f718975c81669469eb412b99fa58af3b048b Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 9 Oct 2013 16:56:10 +0200 Subject: [PATCH 0093/1140] Removed unnecessary part since a CodeMirror issue was fixed --- src/search/FindReplace.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js index 2a81f4562cc..f01711bd1f4 100644 --- a/src/search/FindReplace.js +++ b/src/search/FindReplace.js @@ -272,14 +272,6 @@ define(function (require, exports, module) { var cursor = getSearchCursor(cm, state.query); while (cursor.findNext()) { resultSet.push(cursor.pos); // pos is unique obj per search result - - // TODO: remove this section when https://github.com/marijnh/CodeMirror/issues/1155 is fixed - if (cursor.pos.match && cursor.pos.match[0] === "") { - if (cursor.to().line + 1 === cm.lineCount()) { - break; - } - cursor = getSearchCursor(cm, state.query, {line: cursor.to().line + 1, ch: 0}); - } } // Highlight all matches if there aren't too many From fb2c45187906a766daa0c7d0f64a1c027e4eea7e Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Wed, 9 Oct 2013 08:05:26 -0700 Subject: [PATCH 0094/1140] Update DragAndDrop for new file system. --- src/utils/DragAndDrop.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/utils/DragAndDrop.js b/src/utils/DragAndDrop.js index 175303cfc0d..8611a0f5507 100644 --- a/src/utils/DragAndDrop.js +++ b/src/utils/DragAndDrop.js @@ -74,34 +74,34 @@ define(function (require, exports, module) { function openDroppedFiles(files) { var errorFiles = []; - return Async.doInParallel(files, function (file, idx) { + return Async.doInParallel(files, function (path, idx) { var result = new $.Deferred(); // Only open files. TODO: FileSystem - brackets.fs.stat(file, function (err, stat) { - if (!err && stat.isFile()) { + ProjectManager.getFileSystem().resolve(path, function (err, item) { + if (!err && item.isFile()) { // If the file is already open, and this isn't the last // file in the list, return. If this *is* the last file, // always open it so it gets selected. if (idx < files.length - 1) { - if (DocumentManager.findInWorkingSet(file) !== -1) { + if (DocumentManager.findInWorkingSet(path) !== -1) { result.resolve(); return; } } CommandManager.execute(Commands.FILE_ADD_TO_WORKING_SET, - {fullPath: file, silent: true}) + {fullPath: path, silent: true}) .done(function () { result.resolve(); }) .fail(function () { - errorFiles.push(file); + errorFiles.push(path); result.reject(); }); - } else if (!err && stat.isDirectory() && files.length === 1) { + } else if (!err && item.isDirectory() && files.length === 1) { // One folder was dropped, open it. - ProjectManager.openProject(file) + ProjectManager.openProject(path) .done(function () { result.resolve(); }) @@ -110,7 +110,7 @@ define(function (require, exports, module) { result.reject(); }); } else { - errorFiles.push(file); + errorFiles.push(path); result.reject(); } }); From 5ea1a681d48be616b379787669f112aa2c32fe9b Mon Sep 17 00:00:00 2001 From: Sandeep Jain Date: Wed, 9 Oct 2013 21:15:50 +0530 Subject: [PATCH 0095/1140] Allow event propogation even when there is no dropdown item. --- src/extensions/default/RecentProjects/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/RecentProjects/main.js b/src/extensions/default/RecentProjects/main.js index 793dfbc9f2f..4a936453bf0 100644 --- a/src/extensions/default/RecentProjects/main.js +++ b/src/extensions/default/RecentProjects/main.js @@ -233,9 +233,9 @@ define(function (require, exports, module) { break; case KeyEvent.DOM_VK_BACK_SPACE: case KeyEvent.DOM_VK_DELETE: - keyHandled = true; if ($dropdownItem) { removeSelectedItem(event); + keyHandled = true; } break; } From 86b067dcacdd7a94bb06010fd087893856ce9645 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 9 Oct 2013 21:16:44 +0200 Subject: [PATCH 0096/1140] Updated german translation (Close All...) --- src/nls/de/strings.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 842943a15f8..f8744dab4bf 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -213,6 +213,10 @@ define({ "CMD_OPEN_FOLDER" : "Ordner öffnen\u2026", "CMD_FILE_CLOSE" : "Schließen", "CMD_FILE_CLOSE_ALL" : "Alles schließen", + "CMD_FILE_CLOSE_LIST" : "Liste schließen", + "CMD_FILE_CLOSE_OTHERS" : "Alle anderen schließen", + "CMD_FILE_CLOSE_ABOVE" : "Alle darüber schließen", + "CMD_FILE_CLOSE_BELOW" : "Alle darunter schließen", "CMD_FILE_SAVE" : "Speichern", "CMD_FILE_SAVE_ALL" : "Alles speichern", "CMD_FILE_SAVE_AS" : "Speichern unter\u2026", From e331204a6830134edc1be6484547e0e25b452f3c Mon Sep 17 00:00:00 2001 From: Thomas Erbe Date: Wed, 9 Oct 2013 22:27:39 +0100 Subject: [PATCH 0097/1140] Added the close button for all inline widgets --- src/editor/InlineTextEditor.js | 8 -------- src/editor/InlineWidget.js | 10 +++++++++- src/styles/brackets.less | 13 +++++++++---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/editor/InlineTextEditor.js b/src/editor/InlineTextEditor.js index c678c671ef8..2f6ea3c3e84 100644 --- a/src/editor/InlineTextEditor.js +++ b/src/editor/InlineTextEditor.js @@ -210,14 +210,6 @@ define(function (require, exports, module) { // header containing filename, dirty indicator, line number var $header = $("
    ").addClass("inline-editor-header"); - - // Close button - var $closeBtn = $header.append("×"); - - $closeBtn.on("mouseup", function(e) { - self.close(); - e.stopImmediatePropagation(); - }); var $filenameInfo = $("").addClass("filename"); diff --git a/src/editor/InlineWidget.js b/src/editor/InlineWidget.js index c6770b24a8e..2b916852e16 100644 --- a/src/editor/InlineWidget.js +++ b/src/editor/InlineWidget.js @@ -44,7 +44,15 @@ define(function (require, exports, module) { this.$htmlContent = $(this.htmlContent).addClass("inline-widget"); this.$htmlContent.append("
    ") .append("
    "); - + + // create the close button + var $closeBtn = this.$htmlContent.append("×"); + + $closeBtn .on("mouseup", function(e) { + self.close(); + e.stopImmediatePropagation(); + }); + this.$htmlContent.on("keydown", function (e) { if (e.keyCode === KeyEvent.DOM_VK_ESCAPE) { self.close(); diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 96f88158d40..f79abe35e40 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -643,10 +643,6 @@ a, img { color: @inline-color-2; } } - - #inline-close { - margin-right: 10px; - } } .shadow { @@ -676,6 +672,15 @@ a, img { background-color: @inline-background-color-1; } } + + + + #inline-close { + position: relative; + right: 20px; + top: 10px; + } + } /* CSSInlineEditor rule list */ From 1bd959fd7cec2e2446c5853d543a09afcd80cf7a Mon Sep 17 00:00:00 2001 From: Thomas Erbe Date: Wed, 9 Oct 2013 22:48:21 +0100 Subject: [PATCH 0098/1140] Fixed jslint errors --- src/editor/InlineWidget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/InlineWidget.js b/src/editor/InlineWidget.js index 2b916852e16..fac7a83174f 100644 --- a/src/editor/InlineWidget.js +++ b/src/editor/InlineWidget.js @@ -48,7 +48,7 @@ define(function (require, exports, module) { // create the close button var $closeBtn = this.$htmlContent.append("×"); - $closeBtn .on("mouseup", function(e) { + $closeBtn.on("mouseup", function (e) { self.close(); e.stopImmediatePropagation(); }); From 8269ff1604a59a494db592e0aae87990eb2a6ebb Mon Sep 17 00:00:00 2001 From: Ian Wehrman Date: Wed, 9 Oct 2013 16:16:07 -0700 Subject: [PATCH 0099/1140] Move FileSystem.getDirectoryContents to Directory.getContents --- src/extensions/default/DebugCommands/main.js | 2 +- .../JavaScriptCodeHints/ScopeManager.js | 2 +- src/extensions/default/UrlCodeHints/main.js | 2 +- src/filesystem/Directory.js | 65 ++++++++++++++++- src/filesystem/File.js | 4 +- src/filesystem/FileSystem.js | 69 ++----------------- src/filesystem/FileSystemEntry.js | 12 +++- src/filesystem/InMemoryFile.js | 4 +- src/project/ProjectManager.js | 2 +- src/utils/ExtensionLoader.js | 2 +- test/spec/SpecRunnerUtils.js | 2 +- 11 files changed, 87 insertions(+), 79 deletions(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index 9a2ed939a8c..6d5201d5130 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -140,7 +140,7 @@ define(function (require, exports, module) { function _handleSwitchLanguage() { var stringsPath = FileUtils.getNativeBracketsDirectoryPath() + "/nls"; - brackets.appFileSystem.getDirectoryContents(brackets.appFileSystem.getDirectoryForPath(stringsPath), function (err, contents) { + brackets.appFileSystem.getDirectoryForPath(stringsPath).getContents(function (err, contents) { if (!err) { var $dialog, $submit, diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js index d15d73253e9..12aa9c0927a 100644 --- a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js +++ b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js @@ -189,7 +189,7 @@ define(function (require, exports, module) { fileSystem.resolve(dir, function (err, directory) { if (!err && directory.isDirectory()) { - fileSystem.getDirectoryContents(directory, function (err, contents) { + directory.getContents(function (err, contents) { if (!err) { contents.slice(0, preferences.getMaxFileCount()).forEach(function (entry) { var path = entry.fullPath, diff --git a/src/extensions/default/UrlCodeHints/main.js b/src/extensions/default/UrlCodeHints/main.js index 9861e83a34b..da6e8e3d818 100644 --- a/src/extensions/default/UrlCodeHints/main.js +++ b/src/extensions/default/UrlCodeHints/main.js @@ -132,7 +132,7 @@ define(function (require, exports, module) { self.cachedHints.deferred = $.Deferred(); self.cachedHints.unfiltered = []; - fileSystem.getDirectoryContents(directory, function (err, contents) { + directory.getContents(function (err, contents) { if (!err) { contents.forEach(function (entry) { if (fileSystem.shouldShow(entry.fullPath)) { diff --git a/src/filesystem/Directory.js b/src/filesystem/Directory.js index b4380954c0e..e37966d831a 100644 --- a/src/filesystem/Directory.js +++ b/src/filesystem/Directory.js @@ -30,9 +30,8 @@ define(function (require, exports, module) { var FileSystemEntry = require("filesystem/FileSystemEntry"); - function Directory(fullPath, impl) { - FileSystemEntry.call(this, fullPath, impl); - this._impl = impl; + function Directory(fullPath, fileSystem) { + FileSystemEntry.call(this, fullPath, fileSystem); } Directory.prototype = Object.create(FileSystemEntry.prototype); @@ -49,6 +48,66 @@ define(function (require, exports, module) { return true; }; + /** + * Read the contents of a Directory. + * + * @param {Directory} directory Directory whose contents you want to get + * @param {function (number, array)} callback Callback that is passed + * and error code and the contents of the directory. + */ + Directory.prototype.getContents = function (callback) { + var i, entryPath, entry; + + if (this._contentsCallbacks) { + // There is already a pending call for this directorie's contents. + // Push the new callback onto the stack and return. + this._contentsCallbacks.push(callback); + return; + } + + if (this._contents) { + // Return cached contents + callback(null, this._contents); + return; + } + + this._contentsCallbacks = [callback]; + + this._impl.readdir(this.fullPath, function (err, contents, stats) { + this._contents = []; + + // Instantiate content objects + var len = stats ? stats.length : 0; + + for (i = 0; i < len; i++) { + entryPath = this.fullPath + "/" + contents[i]; + + // Note: not all entries necessarily have associated stats. + // For now, silently ignore such entries. + if (stats[i] && this._fileSystem.shouldShow(entryPath)) { + if (stats[i].isFile()) { + entry = this._fileSystem.getFileForPath(entryPath); + } else { + entry = this._fileSystem.getDirectoryForPath(entryPath); + } + + this._contents.push(entry); + } + } + + // Reset the callback list before we begin calling back so that + // synchronous reentrant calls are handled correctly. + var currentCallbacks = this._contentsCallbacks; + + this._contentsCallbacks = null; + + // Invoke all saved callbacks + currentCallbacks.forEach(function (cb) { + cb(err, this._contents); + }.bind(this)); + }.bind(this)); + }; + /** * Create a directory * diff --git a/src/filesystem/File.js b/src/filesystem/File.js index bdd981ee7a6..d48dd253c8e 100644 --- a/src/filesystem/File.js +++ b/src/filesystem/File.js @@ -30,8 +30,8 @@ define(function (require, exports, module) { var FileSystemEntry = require("filesystem/FileSystemEntry"); - function File(fullPath, impl) { - FileSystemEntry.call(this, fullPath, impl); + function File(fullPath, fileSystem) { + FileSystemEntry.call(this, fullPath, fileSystem); } File.prototype = Object.create(FileSystemEntry.prototype); diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js index 714bc60b386..468429cbb6f 100644 --- a/src/filesystem/FileSystem.js +++ b/src/filesystem/FileSystem.js @@ -111,7 +111,7 @@ define(function (require, exports, module) { var file = this._index.getEntry(path); if (!file) { - file = new File(path, this._impl); + file = new File(path, this); this._index.addEntry(file); } @@ -125,7 +125,7 @@ define(function (require, exports, module) { * @return {File} The File object. */ FileSystem.prototype.getInMemoryFile = function (path) { - var file = new InMemoryFile(path, this._impl); + var file = new InMemoryFile(path, this); // TODO: Add to index? @@ -148,7 +148,7 @@ define(function (require, exports, module) { var directory = this._index.getEntry(path); if (!directory) { - directory = new Directory(path, this._impl); + directory = new Directory(path, this); this._index.addEntry(directory); } @@ -176,63 +176,6 @@ define(function (require, exports, module) { }.bind(this)); }; - /** - * Read the contents of a Directory. - * - * @param {Directory} directory Directory whose contents you want to get - * @param {function (number, array)} callback Callback that is passed - * and error code and the contents of the directory. - */ - FileSystem.prototype.getDirectoryContents = function (directory, callback) { - var i, entryPath, entry; - - if (directory._contentsCallbacks) { - // There is already a pending call for this directorie's contents. - // Push the new callback onto the stack and return. - directory._contentsCallbacks.push(callback); - return; - } - - if (directory._contents) { - // Return cached contents - callback(null, directory._contents); - return; - } - - directory._contentsCallbacks = [callback]; - - this._impl.readdir(directory.fullPath, function (err, contents, stats) { - directory._contents = []; - - // Instantiate content objects - var len = stats ? stats.length : 0; - - for (i = 0; i < len; i++) { - entryPath = directory.fullPath + "/" + contents[i]; - - // Note: not all entries necessarily have associated stats. - // For now, silently ignore such entries. - if (stats[i] && this.shouldShow(entryPath)) { - if (stats[i].isFile()) { - entry = this.getFileForPath(entryPath); - } else { - entry = this.getDirectoryForPath(entryPath); - } - - directory._contents.push(entry); - } - } - - directory._contentsPromise = null; - - // Invoke all saved callbacks - directory._contentsCallbacks.forEach(function (cb) { - cb(err, directory._contents); - }); - directory._contentsCallbacks = null; - }.bind(this)); - }; - /** * Return all indexed files, with optional filtering * @@ -297,7 +240,7 @@ define(function (require, exports, module) { FileSystem.prototype._scanDirectory = function (directoryPath) { var directory = this.getDirectoryForPath(directoryPath); - this.getDirectoryContents(directory, function (err, entries) { + directory.getContents(function (err, entries) { if (!err) { var i; @@ -338,10 +281,10 @@ define(function (require, exports, module) { var oldContents = entry._contents; // TODO: Handle pending content promise // Clear out old contents - entry._contents = entry._contentsPromise = undefined; + entry._contents = undefined; // Read new contents - this.getDirectoryContents(entry, function (err, contents) { + entry.getContents(function (err, contents) { if (!err) { var i, len, item, path; diff --git a/src/filesystem/FileSystemEntry.js b/src/filesystem/FileSystemEntry.js index 60774259771..1925f98292c 100644 --- a/src/filesystem/FileSystemEntry.js +++ b/src/filesystem/FileSystemEntry.js @@ -34,9 +34,10 @@ define(function (require, exports, module) { * Constructor * @param {string} path The path for this entry */ - function FileSystemEntry(path, impl) { + function FileSystemEntry(path, fileSystem) { this._path = path; - this._impl = impl; + this._fileSystem = fileSystem; + this._impl = fileSystem._impl; } // Add "fullPath" and "name" getters @@ -55,7 +56,12 @@ define(function (require, exports, module) { * Cached stat object for this file. */ FileSystemEntry.prototype._stat = null; - + + /** + * Parent file system. + */ + FileSystemEntry.prototype._fileSystem = null; + /** * Low level file system implementation. */ diff --git a/src/filesystem/InMemoryFile.js b/src/filesystem/InMemoryFile.js index 5a19849df45..b0638fb78fe 100644 --- a/src/filesystem/InMemoryFile.js +++ b/src/filesystem/InMemoryFile.js @@ -30,8 +30,8 @@ define(function (require, exports, module) { var FileSystemEntry = require("filesystem/FileSystemEntry"); - function InMemoryFile(fullPath, impl) { - FileSystemEntry.call(this, fullPath, impl); + function InMemoryFile(fullPath, fileSystem) { + FileSystemEntry.call(this, fullPath, fileSystem); } InMemoryFile.prototype = Object.create(FileSystemEntry.prototype); diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 199fb4c585e..dd3cb89eccd 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -754,7 +754,7 @@ define(function (require, exports, module) { } // Fetch dirEntry's contents - _fileSystem.getDirectoryContents(dirEntry, function (err, contents) { + dirEntry.getContents(function (err, contents) { if (!err) { processEntries(contents); } else { diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js index 79b8c818ca5..47c59a281a9 100644 --- a/src/utils/ExtensionLoader.js +++ b/src/utils/ExtensionLoader.js @@ -236,7 +236,7 @@ define(function (require, exports, module) { function _loadAll(directory, config, entryPoint, processExtension) { var result = new $.Deferred(); - brackets.appFileSystem.getDirectoryContents(brackets.appFileSystem.getDirectoryForPath(directory), function (err, contents) { + brackets.appFileSystem.getDirectoryForPath(directory).getContents(function (err, contents) { if (!err) { var i, extensions = []; diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index 85fa9933733..df9ececebde 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -844,7 +844,7 @@ define(function (require, exports, module) { // create the destination folder destDir.create(function (err) { if (!err) { - brackets.appFileSystem.getDirectoryContents(source, function (err, contents) { + source.getContents(function (err, contents) { if (!err) { // copy all children of this directory var copyChildrenPromise = Async.doInParallel( From ce7765663197fd06a36b098937c53e25e7d8ed7a Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Wed, 9 Oct 2013 17:01:17 -0700 Subject: [PATCH 0100/1140] Wait until all core extensions are loaded before loading user extensions. This makes menu ordering more consistent, and fixes bug #5442 where the order of registration matters. Also change extension loading to work with arrays most of the time, avoiding bugs if there are ","s in pathnames. And fix stale comment in ExtensionManager. --- src/brackets.js | 3 ++- src/extensibility/ExtensionManager.js | 2 +- src/utils/ExtensionLoader.js | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/brackets.js b/src/brackets.js index cde040b4184..d01d090baea 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -201,7 +201,8 @@ define(function (require, exports, module) { LanguageManager.ready.always(function () { // Load all extensions. This promise will complete even if one or more // extensions fail to load. - var extensionLoaderPromise = ExtensionLoader.init(params.get("extensions")); + var extensionPathOverride = params.get("extensions"); // used by unit tests + var extensionLoaderPromise = ExtensionLoader.init(extensionPathOverride ? extensionPathOverride.split(",") : null); // Load the initial project after extensions have loaded extensionLoaderPromise.always(function () { diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js index e83b545ac8f..ed5e5b55808 100644 --- a/src/extensibility/ExtensionManager.js +++ b/src/extensibility/ExtensionManager.js @@ -47,7 +47,7 @@ define(function (require, exports, module) { Strings = require("strings"), StringUtils = require("utils/StringUtils"); - // semver isn't a proper AMD module, so it will just load into the global namespace. + // semver.browser is an AMD-compatible module var semver = require("extensibility/node/node_modules/semver/semver.browser"); /** diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js index e4246ffdee8..355a498617c 100644 --- a/src/utils/ExtensionLoader.js +++ b/src/utils/ExtensionLoader.js @@ -311,9 +311,9 @@ define(function (require, exports, module) { /** * Load extensions. * - * @param {?string} A list containing references to extension source - * location. A source location may be either (a) a folder path - * relative to src/extensions or (b) an absolute path. + * @param {?Array.} A list containing references to extension source + * location. A source location may be either (a) a folder name inside + * src/extensions or (b) an absolute path. * @return {!$.Promise} A promise object that is resolved when all extensions complete loading. */ function init(paths) { @@ -323,7 +323,7 @@ define(function (require, exports, module) { } if (!paths) { - paths = "default,dev," + getUserExtensionPath(); + paths = ["default", "dev", getUserExtensionPath()]; } // Load extensions before restoring the project @@ -345,7 +345,7 @@ define(function (require, exports, module) { new NativeFileSystem.DirectoryEntry().getDirectory(disabledExtensionPath, {create: true}); - var promise = Async.doInParallel(paths.split(","), function (item) { + var promise = Async.doSequentially(paths, function (item) { var extensionPath = item; // If the item has "/" in it, assume it is a full path. Otherwise, load @@ -355,7 +355,7 @@ define(function (require, exports, module) { } return loadAllExtensionsInNativeDirectory(extensionPath); - }); + }, false); promise.always(function () { _init = true; From 712071f39fc730e42710db666188fb355c580fc1 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Wed, 9 Oct 2013 17:04:21 -0700 Subject: [PATCH 0101/1140] set sprint 33 --- package.json | 4 ++-- src/config.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 03cd2182009..1891804ade2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Brackets", - "version": "0.32.0-0", - "apiVersion": "0.32.0", + "version": "0.33.0-0", + "apiVersion": "0.33.0", "homepage": "http://brackets.io", "issues": { "url": "http://github.com/adobe/brackets/issues" diff --git a/src/config.json b/src/config.json index 841cf3bf39c..79dc787ae46 100644 --- a/src/config.json +++ b/src/config.json @@ -18,8 +18,8 @@ "linting.enabled_by_default": true }, "name": "Brackets", - "version": "0.32.0-0", - "apiVersion": "0.32.0", + "version": "0.33.0-0", + "apiVersion": "0.33.0", "homepage": "http://brackets.io", "issues": { "url": "http://github.com/adobe/brackets/issues" From 2b3c591fafa92e353af0b978419ac4403cbfb681 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Thu, 10 Oct 2013 14:35:41 +0200 Subject: [PATCH 0102/1140] Update 'de' locale for sprint 33 --- src/nls/de/strings.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 842943a15f8..1ef06af75ab 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -85,14 +85,14 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE" : "Zum Starten der Live-Vorschau mit einer serverseitigen Datei müssen Sie eine Basis-URL für dieses Projekt angeben.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "Ein Fehler ist beim Starten des HTTP-Servers oder der Live-Vorschau-Dateien aufgetreten. Bitte versuchen Sie es später erneut.", "LIVE_DEVELOPMENT_INFO_TITLE" : "Willkommen bei der Live-Vorschau!", - "LIVE_DEVELOPMENT_INFO_MESSAGE" : "Die Live-Vorschau verbindet {APP_NAME} mit Ihrem Browser. Sie startet eine Vorschau Ihrer HTML-Datei im Browser und aktualisiert die Vorschau dann sofort, wenn Sie Ihren Code bearbeiten.

    In dieser frühen Version von {APP_NAME} funktioniert die Live-Vorschau nur beim Bearbeiten von CSS- und HTML-Dateien und nur mit Google Chrome. Wir werden sie bald für JavaScript implementieren!

    (Sie sehen diese Meldung nur einmal.)", + "LIVE_DEVELOPMENT_INFO_MESSAGE" : "Die Live-Vorschau verbindet {APP_NAME} mit Ihrem Browser. Sie startet eine Vorschau Ihrer HTML-Datei im Browser und aktualisiert die Vorschau, sobald Sie Ihren Code bearbeiten.

    In dieser frühen Version von {APP_NAME} funktioniert die Live-Vorschau nur mit Google Chrome und aktualisiert sich live, wenn Sie CSS- oder HTML-Dateien bearbeiten. Änderungen an JavaScript-Dateien werden beim Speichern automatisch neu geladen.

    (Sie sehen diese Meldung nur einmal.)", "LIVE_DEVELOPMENT_TROUBLESHOOTING" : "Weitere Informationen finden Sie unter dem Thema Fehlerbehebung bei Verbindungs-Fehlern der Live-Entwicklung.", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "Live-Vorschau", "LIVE_DEV_STATUS_TIP_PROGRESS1" : "Live-Vorschau: Verbinden\u2026", "LIVE_DEV_STATUS_TIP_PROGRESS2" : "Live-Vorschau: Initialisieren\u2026", "LIVE_DEV_STATUS_TIP_CONNECTED" : "Live-Vorschau trennen", - "LIVE_DEV_STATUS_TIP_OUT_OF_SYNC" : "Live-Vorschau (Speichern zum Aktualisieren)", + "LIVE_DEV_STATUS_TIP_OUT_OF_SYNC" : "Live-Vorschau (Datei speichern zum Aktualisieren)", "LIVE_DEV_STATUS_TIP_SYNC_ERROR" : "Live-Vorschau (Es wird aufgrund eines Syntax-Fehlers nicht aktualisiert)", "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS" : "Die Live-Vorschau wurde abgebrochen, weil die Entwickler-Tools des Browsers geöffnet wurden", @@ -213,6 +213,10 @@ define({ "CMD_OPEN_FOLDER" : "Ordner öffnen\u2026", "CMD_FILE_CLOSE" : "Schließen", "CMD_FILE_CLOSE_ALL" : "Alles schließen", + "CMD_FILE_CLOSE_LIST" : "Liste schließen", + "CMD_FILE_CLOSE_OTHERS" : "Andere schließen", + "CMD_FILE_CLOSE_ABOVE" : "Andere darüber schließen", + "CMD_FILE_CLOSE_BELOW" : "Andere darunter schließen", "CMD_FILE_SAVE" : "Speichern", "CMD_FILE_SAVE_ALL" : "Alles speichern", "CMD_FILE_SAVE_AS" : "Speichern unter\u2026", From f4014f34ab883db38f47a0c0dfeaf6e0a25b244a Mon Sep 17 00:00:00 2001 From: Thomas Erbe Date: Thu, 10 Oct 2013 18:41:40 +0100 Subject: [PATCH 0103/1140] Fixed a typo in code --- src/editor/InlineWidget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/InlineWidget.js b/src/editor/InlineWidget.js index fac7a83174f..a407ef6f546 100644 --- a/src/editor/InlineWidget.js +++ b/src/editor/InlineWidget.js @@ -46,7 +46,7 @@ define(function (require, exports, module) { .append("
    "); // create the close button - var $closeBtn = this.$htmlContent.append("×"); + var $closeBtn = this.$htmlContent.append("×"); $closeBtn.on("mouseup", function (e) { self.close(); From 12776799f2b8af83a9cdc002231dd3c91cf1e097 Mon Sep 17 00:00:00 2001 From: Thomas Erbe Date: Thu, 10 Oct 2013 19:06:37 +0100 Subject: [PATCH 0104/1140] Editor now gets focus back when clicking the close button --- src/editor/InlineWidget.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/editor/InlineWidget.js b/src/editor/InlineWidget.js index a407ef6f546..163537738c9 100644 --- a/src/editor/InlineWidget.js +++ b/src/editor/InlineWidget.js @@ -46,9 +46,9 @@ define(function (require, exports, module) { .append("
    "); // create the close button - var $closeBtn = this.$htmlContent.append("×"); + this.$closeBtn = this.$htmlContent.append("×"); - $closeBtn.on("mouseup", function (e) { + this.$closeBtn.click(function (e) { self.close(); e.stopImmediatePropagation(); }); From 8a283d4146bf27030c5863080f60dabe19ded412 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Thu, 10 Oct 2013 12:59:30 -0700 Subject: [PATCH 0105/1140] add placeholder button to css inline editor --- src/editor/CSSInlineEditor.js | 19 ++++++++++++++++++- src/nls/root/strings.js | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/editor/CSSInlineEditor.js b/src/editor/CSSInlineEditor.js index 01b2dca766d..cc916cefbda 100644 --- a/src/editor/CSSInlineEditor.js +++ b/src/editor/CSSInlineEditor.js @@ -32,7 +32,8 @@ define(function (require, exports, module) { var CSSUtils = require("language/CSSUtils"), EditorManager = require("editor/EditorManager"), HTMLUtils = require("language/HTMLUtils"), - MultiRangeInlineEditor = require("editor/MultiRangeInlineEditor").MultiRangeInlineEditor; + MultiRangeInlineEditor = require("editor/MultiRangeInlineEditor").MultiRangeInlineEditor, + Strings = require("strings"); /** * Given a position in an HTML editor, returns the relevant selector for the attribute/tag @@ -78,6 +79,13 @@ define(function (require, exports, module) { return selectorName; } + /** + * Display list of stylesheets in project, then create new rule + */ + function _handleNewRule() { + alert("New Rule button clicked"); + } + /** * This function is registered with EditManager as an inline editor provider. It creates a CSSInlineEditor * when cursor is on an HTML tag name, class attribute, or id attribute, find associated @@ -114,6 +122,15 @@ define(function (require, exports, module) { if (rules && rules.length > 0) { var cssInlineEditor = new MultiRangeInlineEditor(rules); cssInlineEditor.load(hostEditor); + + // TODO: + // - create css rule for styles + // - disable when on stylesheets in project + var $header = $(".inline-editor-header", cssInlineEditor.$htmlContent); + var $newRuleButton = $(" + + + +
    +
    +
    diff --git a/src/extensions/default/InlineBezierCurveEditor/BezierCurveUtils.js b/src/extensions/default/InlineBezierCurveEditor/BezierCurveUtils.js new file mode 100644 index 00000000000..54410f6bde7 --- /dev/null +++ b/src/extensions/default/InlineBezierCurveEditor/BezierCurveUtils.js @@ -0,0 +1,99 @@ +/* + * 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, regexp: true, indent: 4, maxerr: 50 */ +/*global define */ + +/** + * Utilities functions related to color matching + */ +define(function (require, exports, module) { + "use strict"; + + /** + * Regular expression that matches CSS cubic-beziers functions (4 parameters). + * @const @type {RegExp} + */ + var BEZIER_CURVE_REGEX = /cubic-bezier\(\s*(\S+)\s*,\s*(\S+)\s*,\s*(\S+)\s*,\s*(\S+)\s*\)/; + + /** + * Match a bezier curve value from a CSS Declaration or Value. + * + * Matches returned from this function must be handled in + * BezierCurveEditor._getCubicBezierCoords(). + * + * @param {string} str Input string. + * @param {!boolean} lax Parsing mode where: + * lax=false Input is a Full or partial line containing CSS Declaration. + * This is the more strict search used for initial detection. + * lax=true Input is a previously parsed value. This is the less strict search + * used to convert previouslt parsed values to RegExp match format. + * @return {!RegExpMatch} + */ + function cubicBezierMatch(str, lax) { + + // First look for cubic-bezier(...). + var match = str.match(BEZIER_CURVE_REGEX); + if (match) { + return match; + } + + // Next look for the ease functions (which are special cases of cubic-bezier()) + if (lax) { + // For lax parsing, just look for the keywords + match = str.match(/ease(-in)?(-out)?/); + if (match) { + return match; + } + } else { + // For strict parsing, start with a syntax verifying search + match = str.match(/[: ,]ease(-in)?(-out)?[ ,;]/); + if (match) { + // return exact match to keyword that we need for later replacement + return str.match(/ease(-in)?(-out)?/); + } + } + + // Final case is linear. + if (lax) { + // For lax parsing, just look for the keyword + match = str.match(/linear/); + if (match) { + return match; + } + } else { + // The linear keyword can occur in other values, so for strict parsing we + // only detect when it's on same line as "transition" + match = str.match(/transition.*?[: ,]linear[ ,;]/); + if (match) { + // return exact match to keyword that we need for later replacement + return str.match(/linear/); + } + } + + return null; + } + + // Define public API + exports.cubicBezierMatch = cubicBezierMatch; +}); diff --git a/src/extensions/default/InlineBezierCurveEditor/InlineBezierCurveEditor.js b/src/extensions/default/InlineBezierCurveEditor/InlineBezierCurveEditor.js new file mode 100644 index 00000000000..ac744b208bf --- /dev/null +++ b/src/extensions/default/InlineBezierCurveEditor/InlineBezierCurveEditor.js @@ -0,0 +1,251 @@ +/* + * 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, nomen: true, regexp: true, maxerr: 50 */ +/*global define, brackets, $, window */ + +define(function (require, exports, module) { + "use strict"; + + var InlineWidget = brackets.getModule("editor/InlineWidget").InlineWidget, + BezierCurveEditor = require("BezierCurveEditor").BezierCurveEditor, + BezierCurveUtils = require("BezierCurveUtils"); + + + /** @type {number} Global var used to provide a unique ID for each bezierCurve editor instance's _origin field. */ + var lastOriginId = 1; + + /** + * Constructor for inline widget containing a BezierCurveEditor control + * + * @param {!RegExpMatch} bezierCurve RegExp match object of initially selected bezierCurve + * @param {!CodeMirror.Bookmark} startBookmark + * @param {!CodeMirror.Bookmark} endBookmark + */ + function InlineBezierCurveEditor(bezierCurve, startBookmark, endBookmark) { + this._bezierCurve = bezierCurve; + this._startBookmark = startBookmark; + this._endBookmark = endBookmark; + this._isOwnChange = false; + this._isHostChange = false; + this._origin = "*InlineBezierCurveEditor_" + (lastOriginId++); + + this._handleBezierCurveChange = this._handleBezierCurveChange.bind(this); + this._handleHostDocumentChange = this._handleHostDocumentChange.bind(this); + + InlineWidget.call(this); + } + + InlineBezierCurveEditor.prototype = Object.create(InlineWidget.prototype); + InlineBezierCurveEditor.prototype.constructor = InlineBezierCurveEditor; + InlineBezierCurveEditor.prototype.parentClass = InlineWidget.prototype; + + /** @type {!BezierCurveEditor} BezierCurveEditor instance */ + InlineBezierCurveEditor.prototype.bezierCurveEditor = null; + + /** @type {!string} Current value of the bezier curve editor control */ + InlineBezierCurveEditor.prototype._bezierCurve = null; + + /** + * Start of the range of code we're attached to; _startBookmark.find() may by null if sync is lost. + * @type {!CodeMirror.Bookmark} + */ + InlineBezierCurveEditor.prototype._startBookmark = null; + + /** + * End of the range of code we're attached to; _endBookmark.find() may by null if sync is lost or even + * in some cases when it's not. Call getCurrentRange() for the definitive text range we're attached to. + * @type {!CodeMirror.Bookmark} + */ + InlineBezierCurveEditor.prototype._endBookmark = null; + + /** @type {boolean} True while we're syncing a bezier curve editor change into the code editor */ + InlineBezierCurveEditor.prototype._isOwnChange = null; + + /** @type {boolean} True while we're syncing a code editor change into the bezier curve editor */ + InlineBezierCurveEditor.prototype._isHostChange = null; + + /** @type {number} ID used to identify edits coming from this inline widget for undo batching */ + InlineBezierCurveEditor.prototype._origin = null; + + + /** + * Returns the current text range of the bezierCurve we're attached to, or null if + * we've lost sync with what's in the code. + * + * @return {?{ + * start: {line:number, ch:number}, + * end: {line:number, ch:number}, + * match: {RegExpMatch} + * }} + */ + InlineBezierCurveEditor.prototype.getCurrentRange = function () { + var start, end; + + start = this._startBookmark.find(); + if (!start) { + return null; + } + + end = this._endBookmark.find(); + if (!end) { + end = { line: start.line }; + } + + // Even if we think we have a good end bookmark, we want to run the + // regexp match to see if there's a valid match that extends past the bookmark. + // This can happen if the user deletes the end of the existing bezierCurve and then + // types some more. + // FUTURE: when we migrate to CodeMirror v3, we might be able to use markText() + // 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 = BezierCurveUtils.cubicBezierMatch(line.substr(start.ch), true); + + // No longer have a match + if (!matches) { + return null; + } + + // 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; + this._endBookmark.clear(); + this._endBookmark = this.hostEditor._codeMirror.setBookmark(end); + } + + if (end.ch === undefined) { + // We were unable to resync the end bookmark. + return null; + } else { + return { + start: start, + end: end, + match: matches + }; + } + }; + + /** + * When the bezier curve editor's selected bezierCurve changes, update text in code editor + * @param {!string} bezierCurveString + */ + InlineBezierCurveEditor.prototype._handleBezierCurveChange = function (bezierCurveString) { + var bezierCurveMatch = BezierCurveUtils.cubicBezierMatch(bezierCurveString, true); + if (bezierCurveMatch !== this._bezierCurve) { + var range = this.getCurrentRange(); + if (!range) { + return; + } + + // Don't push the change back into the host editor if it came from the host editor. + if (!this._isHostChange) { + // Replace old bezierCurve in code with the editor's bezier curve, and select it + this._isOwnChange = true; + this.hostEditor.document.replaceRange(bezierCurveString, range.start, range.end, this._origin); + this._isOwnChange = false; + this.hostEditor.setSelection(range.start, { + line: range.start.line, + ch: range.start.ch + bezierCurveString.length + }); + } + + this._bezierCurve = bezierCurveMatch; + } + }; + + /** + * @override + * @param {!Editor} hostEditor + */ + InlineBezierCurveEditor.prototype.load = function (hostEditor) { + InlineBezierCurveEditor.prototype.parentClass.load.apply(this, arguments); + + // Create bezier curve editor control + var swatchInfo = null; + this.bezierCurveEditor = new BezierCurveEditor(this.$htmlContent, this._bezierCurve, this._handleBezierCurveChange, swatchInfo); + }; + + /** + * @override + * Perform sizing & focus once we've been added to Editor's DOM + */ + InlineBezierCurveEditor.prototype.onAdded = function () { + InlineBezierCurveEditor.prototype.parentClass.onAdded.apply(this, arguments); + + var doc = this.hostEditor.document; + doc.addRef(); + $(doc).on("change", this._handleHostDocumentChange); + + this.hostEditor.setInlineWidgetHeight(this, this.bezierCurveEditor.getRootElement().outerHeight(), true); + + this.bezierCurveEditor.focus(); + }; + + /** + * @override + * Called whenever the inline widget is closed, whether automatically or explicitly + */ + InlineBezierCurveEditor.prototype.onClosed = function () { + InlineBezierCurveEditor.prototype.parentClass.onClosed.apply(this, arguments); + + this.bezierCurveEditor.destroy(); + + if (this._startBookmark) { + this._startBookmark.clear(); + } + if (this._endBookmark) { + this._endBookmark.clear(); + } + + var doc = this.hostEditor.document; + $(doc).off("change", this._handleHostDocumentChange); + doc.releaseRef(); + }; + + /** + * When text in the code editor changes, update bezier curve editor to reflect it + */ + InlineBezierCurveEditor.prototype._handleHostDocumentChange = function () { + // Don't push the change into the bezierCurve editor if it came from the bezierCurve editor. + if (this._isOwnChange) { + return; + } + + var range = this.getCurrentRange(); + if (range) { + if (range.match !== this._bezierCurve) { + this._isHostChange = true; + this._isHostChange = false; + this._bezierCurve = range.match; + this.bezierCurveEditor.handleExternalUpdate(range.match); + } + } else { + // The edit caused our range to become invalid. Close the editor. + this.close(); + } + }; + + exports.InlineBezierCurveEditor = InlineBezierCurveEditor; +}); diff --git a/src/extensions/default/InlineBezierCurveEditor/grid.png b/src/extensions/default/InlineBezierCurveEditor/grid.png new file mode 100644 index 0000000000000000000000000000000000000000..2237c658e55233c03093d14d2d0face07d3bf4e7 GIT binary patch literal 1179 zcmaJ>OK1~87~VEjN}*D);N#-B^55q9M$#FSN#(swB%yn-iv;5L4kqoO@wn7PXMhMvs7SSt0@^#40G8GnOlrBWz7qB6Aw%SWtuDVuY=m$|)%jLka2GAREMDV85bjhDFzdHG-l@Nz28mrNN{eVTpv#Fm!1s&L_lpLQL>{ zKoH{o(V;O>7RC}|Lg>(NPz*J>GScQuXyGPTU*`tea%nG^HmNK_$G8CXgo8{_+p}b} z_ad~_YjE}UUi@vj95KVuo855J%@AoHI&JkWS+qJITBO|_($~Mj4`hbv*p`$>v*l0U zKHu-12Yr{{e;9uAJ=$4(?!V&6UAu9svhVcTS8grU_w@JUiR{Jc{ym_tyX$Y)nRjSO zIQHUgc&W3ibK&~!!4VSw*iVz^7f;NOfK(>1rJJT`enjaYznd#NX($-akbK{ty&ZQS z=FXnVygXbbG(0&wSqCu-l)ahma+{1bvsn5`4d8~v#yYDFYX>~kL7}JSaHU>^`dA%I e(7H+``iSu`;&R~5mmS+{&qXpmA>SK2cj+Jdx@Xh? literal 0 HcmV?d00001 diff --git a/src/extensions/default/InlineBezierCurveEditor/main.css b/src/extensions/default/InlineBezierCurveEditor/main.css new file mode 100644 index 00000000000..e817506fab7 --- /dev/null +++ b/src/extensions/default/InlineBezierCurveEditor/main.css @@ -0,0 +1,157 @@ +/** + * All selectors descend from .bezier-curve-editor to constrain styles to this extension + */ +.bezier-curve-editor * { + margin: 0; +} + +.bezier-curve-editor { + position: relative; + height: 300px; + margin: 0 25px; +} + +.bezier-curve-editor:focus { + outline: none; +} + +.bezier-curve-editor .cubic-bezier-highlight { + background-color: #DDC; +} + +.bezier-curve-editor .cubic-bezier { + background: url(grid.png) 0px -75px repeat; + border-left: 1px solid #bbb; + border-right: 1px solid #bbb; + background-size: 15px 450px; + height: 300px; + width: 149px; + margin: 0 0 0 25px; + position: absolute; + top: 0; + z-index: 2; +} + +.bezier-curve-editor:after { + content: ""; + display: block; + height: 300px; + width: 149px; + margin: 0 0 0 25px; + background: -webkit-linear-gradient(270deg, rgba(255, 255, 255, 0) 0%, #fff 30%, #fff 70%, rgba(255, 255, 255, 0) 100%); + background-position: 2px 0; + position: absolute; + top: 0; + z-index: 1; +} + +.bezier-curve-editor .coordinate-plane { + position: relative; + left: 0; + line-height: 0; + top: 75px; + width: 149px; + height: 149px; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +.bezier-curve-editor .coordinate-plane:before, +.bezier-curve-editor .coordinate-plane:after { + position: absolute; + bottom: 0%; + left: 0; + width: 100%; + padding: .3em .5em; + + -moz-box-sizing: border-box; + box-sizing: border-box; + + color: #454545; + font-size: 75%; + line-height: 1; +} + +.bezier-curve-editor .coordinate-plane:before { + border-bottom: 1px solid transparent; + content: 'Progression'; + -moz-transform: rotate(-90deg); + -ms-transform: rotate(-90deg); + -o-transform: rotate(-90deg); + -webkit-transform: rotate(-90deg); + transform: rotate(-90deg); + -moz-transform-origin: bottom left; + -ms-transform-origin: bottom left; + -o-transform-origin: bottom left; + -webkit-transform-origin: bottom left; + transform-origin: bottom left; + white-space: nowrap; +} + +.bezier-curve-editor .coordinate-plane:after { + content: 'Time'; + margin-bottom: -1.5em; + white-space: nowrap; +} + +.bezier-curve-editor .coordinate-plane:hover:before { + content: 'Progression (' attr(data-progression) '%)'; +} + +.bezier-curve-editor .coordinate-plane:hover:after { + content: 'Time (' attr(data-time) '%)'; +} + +.bezier-curve-editor .control-point { + background: -webkit-linear-gradient(270deg, rgb(249, 249, 249) 50%, rgb(237, 237, 237) 50%); + position: absolute; + z-index: 2; + height: 16px; + width: 16px; + border: 1px solid #9c9e9e; + margin: -8px 0 0 -8px; + outline: none; + padding: 0 !important; + box-sizing: border-box; + border-radius: 8px; +} + +.bezier-curve-editor .control-point:focus { + border: 1px solid #0940fd !important; + box-shadow: 0 0 0 2px #6fb5f1; +} + +.bezier-curve-editor .P0, .bezier-curve-editor .P3 { + background: #1461FC; + border-radius: 0; + border: none; + height: 12px; + width: 12px; + z-index: 1; +} + +.bezier-curve-editor .P1, .bezier-curve-editor .P2 { + cursor: pointer; + z-index: 100; +} + +.bezier-curve-editor .P0 { + left: 2px; + top: 151px; +} + +.bezier-curve-editor .P3 { + right: -7px; + top: 1px; +} + +.bezier-curve-editor canvas.curve { + position: absolute; + z-index: 1; + top: -75px; + left: 0; + + -moz-user-select: none; + -webkit-user-select: none; + user-select: none; +} diff --git a/src/extensions/default/InlineBezierCurveEditor/main.js b/src/extensions/default/InlineBezierCurveEditor/main.js new file mode 100644 index 00000000000..ae952917af6 --- /dev/null +++ b/src/extensions/default/InlineBezierCurveEditor/main.js @@ -0,0 +1,166 @@ +/* + * 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. + */ + +/* + * The bezier canvas and editing code was adapted from Lea Verou's cubic-bezier project: + * - https://github.com/LeaVerou/cubic-bezier (cubic-bezier.com) + * + * The canvas exceeds the top and bottom of main grid so y-value of points can be + * dragged outside of the 0-1 range. + * + * . . . . . . + * . . + * +---------+ + * | | + * | | + * | | + * | | + * +---------+ <-- main grid has height of 150 + * . . + * . . . . . . <-- canvas has height of 300 (extra 75 above/below) + * + */ + +/*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */ +/*global define, brackets, $, window */ + +define(function (require, exports, module) { + "use strict"; + + // Brackets modules + var EditorManager = brackets.getModule("editor/EditorManager"), + ExtensionUtils = brackets.getModule("utils/ExtensionUtils"), + + InlineBezierCurveEditor = require("InlineBezierCurveEditor").InlineBezierCurveEditor, + BezierCurveUtils = require("BezierCurveUtils"); + + + // Functions + + + /** + * Prepare hostEditor for an InlineBezierCurveEditor at pos if possible. + * Return editor context if so; otherwise null. + * + * @param {Editor} hostEditor + * @param {{line:Number, ch:Number}} pos + * @return {?{color:String, start:TextMarker, end:TextMarker}} + */ + function prepareEditorForProvider(hostEditor, pos) { + var cursorLine, sel, startPos, endPos, startBookmark, endBookmark, currentMatch, + cm = hostEditor._codeMirror; + + sel = hostEditor.getSelection(); + if (sel.start.line !== sel.end.line) { + return null; + } + + cursorLine = hostEditor.document.getLine(pos.line); + + // code runs several matches complicated patterns, multiple times, so + // first do a quick, simple check to see make sure we may have a match + if (!cursorLine.match(/cubic-bezier|linear|ease/)) { + return null; + } + + currentMatch = BezierCurveUtils.cubicBezierMatch(cursorLine, false); + if (!currentMatch) { + return null; + } + + // 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), + newMatch = BezierCurveUtils.cubicBezierMatch(restOfLine, false); + + if (newMatch) { + lineOffset += (currentMatch.index + currentMatch[0].length); + currentMatch = $.extend(true, [], newMatch); + } else { + break; + } + } + + currentMatch.lineOffset = lineOffset; + + startPos = {line: pos.line, ch: lineOffset + currentMatch.index}; + endPos = {line: pos.line, ch: lineOffset + currentMatch.index + currentMatch[0].length}; + + startBookmark = cm.setBookmark(startPos); + endBookmark = cm.setBookmark(endPos); + + // Adjust selection to the match so that the inline editor won't + // get dismissed while we're updating the bezier curve. + hostEditor.setSelection(startPos, endPos); + + return { + bezierCurve: currentMatch, + start: startBookmark, + end: endBookmark + }; + } + + /** + * Registered as an inline editor provider: creates an InlineBezierCurveEditor + * when the cursor is on a bezier curve value. + * + * @param {!Editor} hostEditor + * @param {!{line:Number, ch:Number}} pos + * @return {?$.Promise} synchronously resolved with an InlineWidget, or null if there's + * no color at pos. + */ + function inlineBezierCurveEditorProvider(hostEditor, pos) { + var context = prepareEditorForProvider(hostEditor, pos), + inlineBezierCurveEditor, + result; + + if (!context) { + return null; + } else { + inlineBezierCurveEditor = new InlineBezierCurveEditor(context.bezierCurve, context.start, context.end); + inlineBezierCurveEditor.load(hostEditor); + + result = new $.Deferred(); + result.resolve(inlineBezierCurveEditor); + return result.promise(); + } + } + + /** + * Initialization code + */ + function init() { + // Load our stylesheet + ExtensionUtils.loadStyleSheet(module, "main.css"); + + EditorManager.registerInlineEditProvider(inlineBezierCurveEditorProvider); + } + + init(); + + // for use by other InlineColorEditors + exports.prepareEditorForProvider = prepareEditorForProvider; + + // for unit tests only + exports.inlineBezierCurveEditorProvider = inlineBezierCurveEditorProvider; +}); From 1c8f5a117e44d087eef2b95176485efc28617d03 Mon Sep 17 00:00:00 2001 From: Ian Wehrman Date: Thu, 17 Oct 2013 12:06:39 -0700 Subject: [PATCH 0213/1140] Explicitly watch and unwatch directories in breadth-first order --- src/filesystem/FileSystem.js | 73 +++++++++++++++++++++++++++-------- src/project/ProjectManager.js | 4 -- 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js index 963fac1175e..98fb421f1e9 100644 --- a/src/filesystem/FileSystem.js +++ b/src/filesystem/FileSystem.js @@ -159,29 +159,79 @@ define(function (require, exports, module) { FileSystem.prototype._watchedRoots = null; /** - * Watch a filesystem entry beneath a given watchedRoot. + * Helper function to watch or unwatch a filesystem entry beneath a given + * watchedRoot. * + * @private * @param {FileSystemEntry} entry - The FileSystemEntry to watch. Must be a * non-strict descendent of watchedRoot.entry. * @param {Object} watchedRoot - See FileSystem._watchedRoots. * @param {function(?string)} callback - A function that is called once the * watch is complete. + * @param {boolean} shouldWatch - Whether the entry should be watched (true) + * or unwatched (false). */ - FileSystem.prototype._watchEntry = function (entry, watchedRoot, callback) { - var watchFn = entry.visit.bind(entry, function (child) { + FileSystem.prototype._watchOrUnwatchEntry = function (entry, watchedRoot, callback, shouldWatch) { + var paths = []; + var visitor = function (child) { if (child.isDirectory() || child === watchedRoot.entry) { - this._impl.watchPath(child.fullPath); + paths.push(child.fullPath); } return watchedRoot.filter(child); - }.bind(this)); + }.bind(this); - this._enqueueWatchRequest(watchFn, callback); + entry.visit(visitor, function (err) { + if (err) { + callback(err); + return; + } + + // sort paths by max depth for a breadth-first traversal + var dirCount = {}; + paths.forEach(function (path) { + dirCount[path] = path.split("/").length; + }); + + paths.sort(function (path1, path2) { + var dirCount1 = dirCount[path1], + dirCount2 = dirCount[path2]; + + return dirCount1 - dirCount2; + }); + + this._enqueueWatchRequest(function (callback) { + paths.forEach(function (path, index) { + if (shouldWatch) { + this._impl.watchPath(path); + } else { + this._impl.unwatchPath(path); + } + }, this); + + callback(null); + }.bind(this), callback); + }.bind(this)); + }; + + /** + * Watch a filesystem entry beneath a given watchedRoot. + * + * @private + * @param {FileSystemEntry} entry - The FileSystemEntry to watch. Must be a + * non-strict descendent of watchedRoot.entry. + * @param {Object} watchedRoot - See FileSystem._watchedRoots. + * @param {function(?string)} callback - A function that is called once the + * watch is complete. + */ + FileSystem.prototype._watchEntry = function (entry, watchedRoot, callback) { + this._watchOrUnwatchEntry(entry, watchedRoot, callback, true); }; /** * Unwatch a filesystem entry beneath a given watchedRoot. * + * @private * @param {FileSystemEntry} entry - The FileSystemEntry to watch. Must be a * non-strict descendent of watchedRoot.entry. * @param {Object} watchedRoot - See FileSystem._watchedRoots. @@ -189,16 +239,7 @@ define(function (require, exports, module) { * watch is complete. */ FileSystem.prototype._unwatchEntry = function (entry, watchedRoot, callback) { - var watchFn = entry.visit.bind(entry, function (child) { - if (child.isDirectory() || child === watchedRoot.entry) { - this._impl.unwatchPath(child.fullPath); - } - this._index.removeEntry(child); - - return watchedRoot.filter(child); - }.bind(this)); - - this._enqueueWatchRequest(watchFn, callback); + this._watchOrUnwatchEntry(entry, watchedRoot, callback, false); }; /** diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index fd1d09be465..6554192e667 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -842,8 +842,6 @@ define(function (require, exports, module) { }, function (err) { if (err) { console.log("Error watching project root: ", rootPath, err); - } else { - console.log("Finished watching project root:", rootPath); } }); } @@ -861,8 +859,6 @@ define(function (require, exports, module) { _fileSystem.unwatch(_projectRoot, function (err) { if (err) { console.log("Error unwatching project root: ", _projectRoot.fullPath, err); - } else { - console.log("Finished unwatching project root: ", _projectRoot.fullPath); } }); } From d0919328b6db240753e495e0bc1bcdd2f3b2e072 Mon Sep 17 00:00:00 2001 From: Ian Wehrman Date: Thu, 17 Oct 2013 12:19:03 -0700 Subject: [PATCH 0214/1140] Remove superfluous warning message --- src/filesystem/impls/appshell/node/FileWatcherDomain.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/filesystem/impls/appshell/node/FileWatcherDomain.js b/src/filesystem/impls/appshell/node/FileWatcherDomain.js index 27c725e57f6..f1e81bd4625 100644 --- a/src/filesystem/impls/appshell/node/FileWatcherDomain.js +++ b/src/filesystem/impls/appshell/node/FileWatcherDomain.js @@ -37,7 +37,6 @@ var _domainManager, */ function watchPath(path) { if (_watcherMap.hasOwnProperty(path)) { - console.warn("Watcher already registered for path: " + path); return; } From 66762c2fa07bcb27f30d2a20b9771b03d40e18b8 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Thu, 17 Oct 2013 21:56:47 +0200 Subject: [PATCH 0215/1140] Provide i18n for InlineBezierCurveEditor --- .../InlineBezierCurveEditor/EmbeddedStyles.css | 15 +++++++++++++++ .../default/InlineBezierCurveEditor/main.css | 10 ---------- .../default/InlineBezierCurveEditor/main.js | 5 ++++- src/nls/de/strings.js | 4 ++++ src/nls/root/strings.js | 4 ++++ 5 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css diff --git a/src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css b/src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css new file mode 100644 index 00000000000..29d37e8c744 --- /dev/null +++ b/src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css @@ -0,0 +1,15 @@ +.bezier-curve-editor .coordinate-plane:after { + content: '{{INLINE_BEZIER_EDITOR_TIME}}'; +} + +.bezier-curve-editor .coordinate-plane:hover:before { + content: '{{INLINE_BEZIER_EDITOR_PROGRESSION}} (' attr(data-progression) '%)'; +} + +.bezier-curve-editor .coordinate-plane:before { + content: '{{INLINE_BEZIER_EDITOR_PROGRESSION}}'; +} + +.bezier-curve-editor .coordinate-plane:hover:after { + content: '{{INLINE_BEZIER_EDITOR_TIME}} (' attr(data-time) '%)'; +} \ No newline at end of file diff --git a/src/extensions/default/InlineBezierCurveEditor/main.css b/src/extensions/default/InlineBezierCurveEditor/main.css index e817506fab7..42ec1b2b82d 100644 --- a/src/extensions/default/InlineBezierCurveEditor/main.css +++ b/src/extensions/default/InlineBezierCurveEditor/main.css @@ -74,7 +74,6 @@ .bezier-curve-editor .coordinate-plane:before { border-bottom: 1px solid transparent; - content: 'Progression'; -moz-transform: rotate(-90deg); -ms-transform: rotate(-90deg); -o-transform: rotate(-90deg); @@ -89,19 +88,10 @@ } .bezier-curve-editor .coordinate-plane:after { - content: 'Time'; margin-bottom: -1.5em; white-space: nowrap; } -.bezier-curve-editor .coordinate-plane:hover:before { - content: 'Progression (' attr(data-progression) '%)'; -} - -.bezier-curve-editor .coordinate-plane:hover:after { - content: 'Time (' attr(data-time) '%)'; -} - .bezier-curve-editor .control-point { background: -webkit-linear-gradient(270deg, rgb(249, 249, 249) 50%, rgb(237, 237, 237) 50%); position: absolute; diff --git a/src/extensions/default/InlineBezierCurveEditor/main.js b/src/extensions/default/InlineBezierCurveEditor/main.js index ae952917af6..6db1894263a 100644 --- a/src/extensions/default/InlineBezierCurveEditor/main.js +++ b/src/extensions/default/InlineBezierCurveEditor/main.js @@ -49,9 +49,11 @@ define(function (require, exports, module) { // Brackets modules var EditorManager = brackets.getModule("editor/EditorManager"), ExtensionUtils = brackets.getModule("utils/ExtensionUtils"), + Strings = brackets.getModule("strings"), InlineBezierCurveEditor = require("InlineBezierCurveEditor").InlineBezierCurveEditor, - BezierCurveUtils = require("BezierCurveUtils"); + BezierCurveUtils = require("BezierCurveUtils"), + EmbeddedStyles = require("text!EmbeddedStyles.css"); // Functions @@ -152,6 +154,7 @@ define(function (require, exports, module) { function init() { // Load our stylesheet ExtensionUtils.loadStyleSheet(module, "main.css"); + ExtensionUtils.addEmbeddedStyleSheet(Mustache.render(EmbeddedStyles, Strings)); EditorManager.registerInlineEditProvider(inlineBezierCurveEditorProvider); } diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 8c0acd37b0d..231bac62abf 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -454,6 +454,10 @@ define({ "LOCALE_ZH_CN" : "Chinesisch, vereinfacht", "LOCALE_HU" : "Ungarisch", + // extensions/default/InlineBezierCurveEditor + "INLINE_BEZIER_EDITOR_TIME" : "Zeit", + "INLINE_BEZIER_EDITOR_PROGRESSION" : "Verlauf", + // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Aktuelle Farbe", "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "Original-Farbe", diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 2b75bd1e083..ffa2f5d22dc 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -461,6 +461,10 @@ define({ "LOCALE_ZH_CN" : "Chinese, simplified", "LOCALE_HU" : "Hungarian", + // extensions/default/InlineBezierCurveEditor + "INLINE_BEZIER_EDITOR_TIME" : "Time", + "INLINE_BEZIER_EDITOR_PROGRESSION" : "Progression", + // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Current Color", "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "Original Color", From 3c934b0f94705146fb561f36e461249a745575e4 Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Thu, 17 Oct 2013 13:11:49 -0700 Subject: [PATCH 0216/1140] Rewrite getRangeSelectors() to use extractAllSelectors() --- src/language/CSSUtils.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js index 03370206095..62287264dc9 100644 --- a/src/language/CSSUtils.js +++ b/src/language/CSSUtils.js @@ -1269,20 +1269,31 @@ define(function (require, exports, module) { } /** - * Given a TextRange, extracts the selector(s) at the beginning of the range and returns it. + * Given a TextRange, extracts the selector(s) for the rule in the range and returns it. + * Assumes the range only contains one rule; if there's more than one, it will return the + * selector(s) for the first rule. * @param {TextRange} range The range to extract the selector(s) from. - * @return {string} The selector(s) at the beginning of the range. + * @return {string} The selector(s) for the rule in the range. */ function getRangeSelectors(range) { // There's currently no immediate way to access a given line in a Document, because it's just // stored as a string. Eventually, we should have Documents cache the lines in the document // as well, or make them use CodeMirror documents which do the same thing. - var i, startIndex = 0, text = range.document.getText(); + var i, startIndex = 0, endIndex, text = range.document.getText(); for (i = 0; i < range.startLine; i++) { startIndex = text.indexOf("\n", startIndex) + 1; } - var nextBrace = text.indexOf("{", startIndex); - return text.substring(startIndex, nextBrace).trim().replace("\n", " "); + endIndex = startIndex; + // Go one line past the end line. We'll extract text up to but not including the last newline. + for (i = range.startLine + 1; i <= range.endLine + 1; i++) { + endIndex = text.indexOf("\n", endIndex) + 1; + } + var allSelectors = extractAllSelectors(text.substring(startIndex, endIndex)); + + // There should only be one rule in the range, and if there are multiple selectors for + // the first rule, they'll all be recorded in the "selectorGroup" for the first selector, + // so we only need to look at the first one. + return (allSelectors.length ? allSelectors[0].selectorGroup || allSelectors[0].selector : ""); } exports._findAllMatchingSelectorsInText = _findAllMatchingSelectorsInText; // For testing only From 82b197a013fbbdf95526ebe9bfd1c2e28261e328 Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Thu, 17 Oct 2013 13:13:44 -0700 Subject: [PATCH 0217/1140] Made unit test for getRangeSelectors() slightly more realistic --- test/spec/CSSUtils-test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js index dd1edb6055e..681a1694084 100644 --- a/test/spec/CSSUtils-test.js +++ b/test/spec/CSSUtils-test.js @@ -1656,15 +1656,15 @@ define(function (require, exports, module) { }); it("should extract selectors at the beginning of a text range", function () { - var doc = SpecRunnerUtils.createMockDocument(".foo {}\n.bar, #baz {}\nh2 {}\n"), - range = new TextRange(doc, 1, 1); + var doc = SpecRunnerUtils.createMockDocument(".foo {}\n.bar, #baz {\n color: #fff;\n}\nh2 {}\n"), + range = new TextRange(doc, 1, 3); expect(CSSUtils.getRangeSelectors(range)).toBe(".bar, #baz"); range.dispose(); }); it("should extract selectors spanning multiple lines at the beginning of a text range, with newlines replaced", function () { - var doc = SpecRunnerUtils.createMockDocument(".foo {}\n.bar,\n#baz {}\nh2 {}\n"), - range = new TextRange(doc, 1, 2); + var doc = SpecRunnerUtils.createMockDocument(".foo {}\n.bar,\n#baz {\n color: #fff;\n}\nh2 {}\n"), + range = new TextRange(doc, 1, 3); expect(CSSUtils.getRangeSelectors(range)).toBe(".bar, #baz"); range.dispose(); }); From 634ab0257db0d435ed8729991578f410153e1115 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Thu, 17 Oct 2013 13:29:07 -0700 Subject: [PATCH 0218/1140] Fix non-absolute path assertions while running unit tests --- test/spec/SpecRunnerUtils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index 5393ebf651b..875cbb79f8e 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -45,6 +45,7 @@ define(function (require, exports, module) { OPEN_TAG = "{{", CLOSE_TAG = "}}", RE_MARKER = /\{\{(\d+)\}\}/g, + absPathPrefix = (brackets.platform === "win" ? "c:/" : "/"), _testSuites = {}, _testWindow, _doLoadExtensions, @@ -333,7 +334,7 @@ define(function (require, exports, module) { */ function createMockActiveDocument(options) { var language = options.language || LanguageManager.getLanguage("javascript"), - filename = options.filename || "_unitTestDummyFile_" + Date.now() + "." + language._fileExtensions[0], + filename = options.filename || (absPathPrefix + "_unitTestDummyPath_/_dummyFile_" + Date.now() + "." + language._fileExtensions[0]), content = options.content || ""; // Use unique filename to avoid collissions in open documents list From dee5f30ed879762a5f72261d467be71b0764303a Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Thu, 17 Oct 2013 13:42:29 -0700 Subject: [PATCH 0219/1140] If there's only one stylesheet, make New Rule button create the rule immediately --- src/editor/CSSInlineEditor.js | 27 +++++++++++++--------- src/styles/brackets_patterns_override.less | 7 ++++-- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/editor/CSSInlineEditor.js b/src/editor/CSSInlineEditor.js index 644a94a2fe0..06416e9006b 100644 --- a/src/editor/CSSInlineEditor.js +++ b/src/editor/CSSInlineEditor.js @@ -102,16 +102,18 @@ define(function (require, exports, module) { /** * @private - * Add a new rule for the given selector to the given document, then add the rule to the + * Add a new rule for the given selector to the given stylesheet, then add the rule to the * given inline editor. * @param {string} selectorName The selector to create a rule for. * @param {MultiRangeInlineEditor} inlineEditor The inline editor to display the new rule in. - * @param {Document} styleDoc The document the rule should be inserted in. + * @param {string} path The path to the stylesheet file. */ - function _addRule(selectorName, inlineEditor, styleDoc) { - var newRuleInfo = CSSUtils.addRuleToDocument(styleDoc, selectorName, Editor.getUseTabChar(), Editor.getSpaceUnits()); - inlineEditor.addAndSelectRange(selectorName, styleDoc, newRuleInfo.range.from.line, newRuleInfo.range.to.line); - inlineEditor.editor.setCursorPos(newRuleInfo.pos.line, newRuleInfo.pos.ch); + function _addRule(selectorName, inlineEditor, path) { + DocumentManager.getDocumentForPath(path).done(function (styleDoc) { + var newRuleInfo = CSSUtils.addRuleToDocument(styleDoc, selectorName, Editor.getUseTabChar(), Editor.getSpaceUnits()); + inlineEditor.addAndSelectRange(selectorName, styleDoc, newRuleInfo.range.from.line, newRuleInfo.range.to.line); + inlineEditor.editor.setCursorPos(newRuleInfo.pos.line, newRuleInfo.pos.ch); + }); } /** @@ -185,9 +187,7 @@ define(function (require, exports, module) { var path = $link.data("path"); if (path) { - DocumentManager.getDocumentForPath(path).done(function (styleDoc) { - _addRule(selectorName, cssInlineEditor, styleDoc); - }); + _addRule(selectorName, cssInlineEditor, path); } } @@ -240,8 +240,10 @@ define(function (require, exports, module) { .text(Strings.BUTTON_NEW_RULE) .on("click", function (e) { if (!$newRuleButton.hasClass("disabled")) { - // toggle dropdown - if ($dropdown) { + if (cssFileInfos.length === 1) { + // Just go ahead and create the rule. + _addRule(selectorName, cssInlineEditor, cssFileInfos[0].fullPath); + } else if ($dropdown) { _closeDropdown(); } else { _showDropdown(); @@ -263,6 +265,9 @@ define(function (require, exports, module) { if (cssFileInfos.length > 0) { $newRuleButton.removeClass("disabled"); } + if (cssFileInfos.length > 1) { + $newRuleButton.addClass("btn-dropdown"); + } }); }) .fail(function () { diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index 4a1d8701b2a..c780c894181 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -398,12 +398,15 @@ a:focus { .stylesheet-button.btn-mini { margin-left: 8px; - padding-right: 24px; position: relative; top: -1px; } -.stylesheet-button::after { +.stylesheet-button.btn-mini.btn-dropdown { + padding-right: 24px; +} + +.stylesheet-button.btn-dropdown::after { content: ""; display: block; height: 0px; From 6269015699e5e57de39e0c752f2961c805594e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Hyyti=C3=A4l=C3=A4?= Date: Thu, 17 Oct 2013 23:44:53 +0300 Subject: [PATCH 0220/1140] [fi] Fixed some typos --- samples/fi/Aloitus/index.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/samples/fi/Aloitus/index.html b/samples/fi/Aloitus/index.html index 3f366ca80b6..e15c1f27c7d 100644 --- a/samples/fi/Aloitus/index.html +++ b/samples/fi/Aloitus/index.html @@ -30,8 +30,8 @@

    Tämä on oppaasi!

    Brackets on erityyppinen editori. Yksi huomattava ero on se, että tämä editori on kirjoitettu JavaScriptilla, HTML:llä ja CSS:llä. Tämä - tarkoittaa, että useimmilla Brackets-sovelluksen käyttäjillä on on välttämättömät taidot muokata ja - laajentaa editoria. Itse asiassa käytämme Bracketsia joka päivä Brackets’n rakentamiseen. Siinä on myös + tarkoittaa, että useimmilla Brackets-sovelluksen käyttäjillä on välttämättömät taidot muokata ja + laajentaa editoria. Itse asiassa käytämme Bracketsia joka päivä Bracketsin rakentamiseen. Siinä on myös joitakin ainutlaatuisia ominaisuuksia, kuten pikamuokkaus, reaaliaikainen esikatselu ja muita, joita et voi löytää toisista editoreista. Oppiaksesi lisää, kuinka käyttää näitä ominaisuuksia, jatka lukemista.

    @@ -80,27 +80,27 @@

    Esikatsele CSS:n muutoksia reaaliaikaisesti selaimessa

    Brackets avaa reaaliaikaisen yhteyden paikalliseen selaimeesi ja vie CSS:n päivitykset samalla kun kirjoitat! Saatat jo olla tehnyt jotain tämän kaltaista selainpohjaisilla työkaluilla, mutta - Brackets’lla ei tarvitse kopioida ja liittää lopullista CSS:ää takaisin editoriin. Koodisi suoritetaan + Bracketsilla ei tarvitse kopioida ja liittää lopullista CSS:ää takaisin editoriin. Koodisi suoritetaan selaimessasi, mutta se sijaitsee editorissasi!

    Korosta HTML-elementtejä ja CSS-sääntöjä reaaliaikaisesti

    Brackets tekee helpoksi nähdä, kuinka muutoksesi HTML:ssä ja CSS:ssä vaikuttavat sivuun. Kun - osoittimesi on CSS-säännön päällä, Brackets korostaa kaikki vaikuttavat elementit selaimessa. Samoin, - kun muokatessa HTML-tiedostoa, Brackets korostaa vastaavat HTML-elementit selaimessa. + osoittimesi on CSS-säännön päällä, Brackets korostaa kaikki vaikuttavat elementit selaimessa. Samoin + kuin muokatessa HTML-tiedostoa, Brackets korostaa vastaavat HTML-elementit selaimessa.

    Jos sinulla on Google Chrome asennettuna, voit kokeilla tätä itse. Napsauta salama-kuvaketta - Brackets-ikkunan oikeassa yläkulmassa tai napsauta Cmd/Ctrl + Alt + P. Kun esikatselu on + Brackets-ikkunan oikeassa yläkulmassa tai paina Cmd/Ctrl + Alt + P. Kun esikatselu on käytössä HTML-dokumentissa, kaikkia linkitettyjä CSS-dokumentteja voidaan muokata reaaliajassa. Kuvake muuttuu harmaasta kultaiseksi, kun Brackets muodostaa yhteyden selaimeesi. Aseta osoittimesi nyt -tagin yläpuolelle. Huomaa sininen korostus, joka ilmestyy kuvan ympärille Chromessa. Käytä seuraavaksi Cmd/Ctrl + E -pikanäppäintä avataksesi määritellyt - säännöt. Yritä muuttaa kehyksen kokoa 1 pikselistä 10 pikseliin tai vaihda taustaväriä ”dimgray”:sta - ”hotpink”:iin. Jos sinulla on Brackets ja selaimesi suoritetaan rintarinnan sen kanssa, näet muutokset + säännöt. Yritä muuttaa kehyksen kokoa 1 pikselistä 10 pikseliin tai vaihtaa taustaväriä ”dimgraysta” + ”hotpinkiin”. Jos sinulla on Brackets ja selaimesi rinta rinnan, näet muutokset välittömästi selaimessasi. Siistiä, eikö? @@ -115,16 +115,16 @@

    Korosta HTML-elementtejä ja CSS-sääntöjä reaaliaikaisesti

    Pikanäkymä

    Niille meistä, joilla ei ole vielä muistissa värien vastineita HEX- tai RGB-arvoina, Brackets tekee - nopeaksi ja helpoksi nähdä täsmälleen, mitä väriä käyttää. Sekä CSS:ssä että HTML:ssä, yksinkertaisesti - osoita mitä tahansa väriarvoa tai gradienttia ja Brackets näyttää esikatselun tästä - väristä/gradientista automaattisesti. Sama tulee kuviin: yksinkertaisesti osoita kuvalinkkiä + nopeaksi ja helpoksi nähdä täsmälleen, mitä väriä käyttää. Sekä CSS:ssä että HTML:ssä yksinkertaisesti + osoita mitä tahansa väriarvoa tai liukuväriä ja Brackets näyttää esikatselun tästä + väristä/liukuväristä automaattisesti. Sama tulee kuviin: yksinkertaisesti osoita kuvalinkkiä Brackets-editorissa ja se näyttää esikatselussa tämän kuvan pikkukuvan.

    Kokeillaksesi pikanäkymää itse aseta osoittimesi -tagin päälle tämän dokumentin yläosaan ja paina Cmd/Ctrl + E avataksesi CSS:n pikaeditorin. Nyt yksinkertaisesti osoita - mitä tahansa väriarvoista CSS:n sisällä. Voit myös nähdä sen toiminnassa gradienteissa avaamalla CSS:n + mitä tahansa väriarvoista CSS:n sisällä. Voit myös nähdä sen toiminnassa liukuvärin kohdalla avaamalla CSS:n pikaeditorin -tagilla ja osoittamalla mitä tahansa taustakuvan arvoista. Kokeillaksesi kuvan esikatselua aseta osoittimesi kuvankaappauskuvan päälle, joka on aimemmin tässä asiakirjassa. @@ -135,18 +135,18 @@

    Pikanäkymä

    Tule mukaan

    Brackets on avoimen lähdekoodin projekti. Web-kehittäjät ympäri maailmaa osallistuvat paremman - koodieditorin rakentamiseen. Monet muut rakentavat laajennuksia, jotka laajentavat Brackets’n kykyjä. + koodieditorin rakentamiseen. Monet muut rakentavat laajennuksia, jotka laajentavat Bracketsin kykyjä. Anna meidän tietää, mitä mieltä olet. Jaa ideasi tai osallistu suoraan projektiin.

    From ae6146cd6e4b116b4d5f4433fcfb9baf660c9706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Hyyti=C3=A4l=C3=A4?= Date: Thu, 17 Oct 2013 23:56:25 +0300 Subject: [PATCH 0221/1140] [fi] Fixed #5554 for Finnish translation --- src/nls/fi/strings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nls/fi/strings.js b/src/nls/fi/strings.js index f905ff4f14b..b4b56bafa21 100644 --- a/src/nls/fi/strings.js +++ b/src/nls/fi/strings.js @@ -402,9 +402,9 @@ define({ "CMD_SWITCH_LANGUAGE" : "Vaihda kieltä", "CMD_RUN_UNIT_TESTS" : "Suorita testejä", "CMD_SHOW_PERF_DATA" : "Näytä suorituskyvyn tiedot", - "CMD_ENABLE_NODE_DEBUGGER" : "Ota solmujen virheenjäljitin käyttöön", - "CMD_LOG_NODE_STATE" : "Kirjaa solmun tila konsoliin", - "CMD_RESTART_NODE" : "Käynnistä solmu uudelleen", + "CMD_ENABLE_NODE_DEBUGGER" : "Ota Noden virheenjäljitin käyttöön", + "CMD_LOG_NODE_STATE" : "Kirjaa Noden tila konsoliin", + "CMD_RESTART_NODE" : "Käynnistä Node uudelleen", "LANGUAGE_TITLE" : "Vaihda kieltä", "LANGUAGE_MESSAGE" : "Kieli:", From 6dbe617b99323e876cfa5d68c93ac13faa906b9d Mon Sep 17 00:00:00 2001 From: Jochen Hagenstroem Date: Thu, 17 Oct 2013 13:13:46 -0700 Subject: [PATCH 0222/1140] - fix minor nits: update jsdoc + format + copyrights + style + quotes + comments, remove unused vars - refactored & simplified some code around removing custom viewers per suggestion by @RaymonLim --- src/document/DocumentManager.js | 2 +- src/editor/EditorManager.js | 6 ++---- src/editor/ImageViewer.js | 30 +++++++++++++----------------- src/htmlContent/image-holder.html | 4 ++-- src/utils/StringUtils.js | 25 ++++++++++++++----------- test/spec/DocumentManager-test.js | 2 +- test/spec/StringUtils-test.js | 18 +++++++++++------- 7 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 56cfeb9a186..5af41b1ff23 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -680,7 +680,7 @@ define(function (require, exports, module) { FileUtils.readAsText(fileEntry) .always(function () { - // document is no longer pending + // document is no longer pending delete getDocumentForPath._pendingDocumentPromises[fullPath]; }) .done(function (rawText, readTimestamp) { diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js index c35eb1facc2..2b4baae2cf7 100644 --- a/src/editor/EditorManager.js +++ b/src/editor/EditorManager.js @@ -611,6 +611,8 @@ define(function (require, exports, module) { $("#" + customViewId).remove(); } } + _previousCustomViewer = _currentCustomViewer; + _currentCustomViewer = null; } /** append custom view to editor-holder @@ -676,8 +678,6 @@ define(function (require, exports, module) { /** Handle project close, remove customView */ function _onBeforeProjectClose() { clearCurrentlyViewedFile(); - _previousCustomViewer = _currentCustomViewer; - _currentCustomViewer = null; _removeCustomViewer(); } @@ -694,8 +694,6 @@ define(function (require, exports, module) { // longer needed. if (doc) { _currentlyViewedFile = doc.file.fullPath; - _previousCustomViewer = _currentCustomViewer; - _currentCustomViewer = null; _showEditor(doc); } else { _showNoEditor(); diff --git a/src/editor/ImageViewer.js b/src/editor/ImageViewer.js index b0eb255f787..1ea71e453f2 100644 --- a/src/editor/ImageViewer.js +++ b/src/editor/ImageViewer.js @@ -38,7 +38,7 @@ define(function (require, exports, module) { var _naturalWidth = 0; - + /** Update the scale element, i.e. on reize */ function _updateScale(currentWidth) { if (currentWidth < _naturalWidth) { var scale = Math.floor(currentWidth / _naturalWidth * 100); @@ -49,20 +49,18 @@ define(function (require, exports, module) { } } - /** - * Update the scale element on reisze - */ + /** handle editor resize event, i.e. update scale sticker */ function onEditorAreaResize() { _updateScale($("#img-preview").width()); } - /** - * creates a DOM node to place in the editor-holder - * in order to display an image. - * @param {?string} path to image file - * @return {Array.} - * - */ + /** + * creates a DOM node to place in the editor-holder + * in order to display an image. + * @param {!string} fullPath path to image file + * @return {JQuery} + * + */ function getImageHolder(fullPath) { if (!fullPath) { return; @@ -75,9 +73,10 @@ define(function (require, exports, module) { } return $imageHolder; } - /** performs decorations on the view that require loading the image in thebrowser, - * i.e. getting atural and actual width and height, placing the scale steicker - * @param{?string} path to the image file + + /** Perform decorations on the view that require loading the image in the browser, + * i.e. getting actual and natural width and height andplacing the scale sticker + * @param {?string} path to the image file */ function render(fullPath) { // null check on the require param @@ -85,8 +84,6 @@ define(function (require, exports, module) { return; } var relPath = ProjectManager.makeProjectRelativeIfPossible(fullPath), - scale = 100, - TEXT_HEIGHT = 170, mode = LanguageManager.getLanguageForPath(fullPath); // only do this if we actually do have an image path @@ -120,4 +117,3 @@ define(function (require, exports, module) { exports.onEditorAreaResize = onEditorAreaResize; exports.render = render; }); - \ No newline at end of file diff --git a/src/htmlContent/image-holder.html b/src/htmlContent/image-holder.html index 7cd6d953c70..178d6f2c91f 100644 --- a/src/htmlContent/image-holder.html +++ b/src/htmlContent/image-holder.html @@ -1,10 +1,10 @@ -
    +
    - +
    \ No newline at end of file diff --git a/src/utils/StringUtils.js b/src/utils/StringUtils.js index 7d0638d4671..8a03c63eeac 100644 --- a/src/utils/StringUtils.js +++ b/src/utils/StringUtils.js @@ -170,29 +170,32 @@ define(function (require, exports, module) { /** * Convert number of bytes into human readable format * - * @param integer bytes Number of bytes to convert - * @param integer precision Number of digits after the decimal separator + * @param number bytes Number of bytes to convert + * @param number precision Number of digits after the decimal separator * @return string */ function prettyPrintBytes(bytes, precision) { - var kilobyte = 1024; - var megabyte = kilobyte * 1024; - var gigabyte = megabyte * 1024; - var terabyte = gigabyte * 1024; + var kilobyte = 1024, + megabyte = kilobyte * 1024, + gigabyte = megabyte * 1024, + terabyte = gigabyte * 1024; if ((bytes >= 0) && (bytes < kilobyte)) { return bytes + ' B'; - - } else if ((bytes >= kilobyte) && (bytes < megabyte)) { + } + if ((bytes >= kilobyte) && (bytes < megabyte)) { return (bytes / kilobyte).toFixed(precision) + ' KB'; - } else if ((bytes >= megabyte) && (bytes < gigabyte)) { + } + if ((bytes >= megabyte) && (bytes < gigabyte)) { return (bytes / megabyte).toFixed(precision) + ' MB'; - } else if ((bytes >= gigabyte) && (bytes < terabyte)) { + } + if ((bytes >= gigabyte) && (bytes < terabyte)) { return (bytes / gigabyte).toFixed(precision) + ' GB'; - } else if (bytes >= terabyte) { + } + if (bytes >= terabyte) { return (bytes / terabyte).toFixed(precision) + ' TB'; } else { diff --git a/test/spec/DocumentManager-test.js b/test/spec/DocumentManager-test.js index a747fb0cbf5..d57adbab3ca 100644 --- a/test/spec/DocumentManager-test.js +++ b/test/spec/DocumentManager-test.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. + * 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"), diff --git a/test/spec/StringUtils-test.js b/test/spec/StringUtils-test.js index 64f44d3ddd4..b678a3d6be9 100644 --- a/test/spec/StringUtils-test.js +++ b/test/spec/StringUtils-test.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. + * 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"), @@ -29,7 +29,11 @@ define(function (require, exports, module) { 'use strict'; - var StringUtils = require("utils/StringUtils"); + var StringUtils = require("utils/StringUtils"), + kilobyte = 1024, + megabyte = kilobyte * 1024, + gigabyte = megabyte * 1024, + terabyte = gigabyte * 1024; describe("StringUtils", function () { @@ -40,17 +44,17 @@ define(function (require, exports, module) { var prettyBytes = StringUtils.prettyPrintBytes(1); expect(prettyBytes).toBe("1 B"); - prettyBytes = StringUtils.prettyPrintBytes(1024); + prettyBytes = StringUtils.prettyPrintBytes(kilobyte); expect(prettyBytes).toBe("1 KB"); - prettyBytes = StringUtils.prettyPrintBytes(1024 * 1024); + prettyBytes = StringUtils.prettyPrintBytes(megabyte); expect(prettyBytes).toBe("1 MB"); - prettyBytes = StringUtils.prettyPrintBytes(1024 * 1024 * 1024); + prettyBytes = StringUtils.prettyPrintBytes(gigabyte); expect(prettyBytes).toBe("1 GB"); - prettyBytes = StringUtils.prettyPrintBytes(1024 * 1024 * 1024 * 1024); - expect(prettyBytes).toBe("1 TB"); + prettyBytes = StringUtils.prettyPrintBytes(terabyte); + expect(prettyBytes).toBe("1 TB"); }); }); From b826bc8219f2ebbb8f66e1a3cfb9eb5f381fa167 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 17 Oct 2013 17:04:57 -0400 Subject: [PATCH 0223/1140] Fix JSLint error in CodeInspection. --- src/language/CodeInspection.js | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/language/CodeInspection.js b/src/language/CodeInspection.js index a3e5c68153f..1746e38a919 100644 --- a/src/language/CodeInspection.js +++ b/src/language/CodeInspection.js @@ -134,26 +134,6 @@ define(function (require, exports, module) { } - /** - * The provider is passed the text of the file and its fullPath. Providers should not assume - * that the file is open (i.e. DocumentManager.getOpenDocumentForPath() may return null) or - * that the file on disk matches the text given (file may have unsaved changes). - * - * @param {string} languageId - * @param {{name:string, scanFile:function(string, string):?{!errors:Array, aborted:boolean}} provider - * - * Each error is: { pos:{line,ch}, endPos:?{line,ch}, message:string, type:?Type } - * If type is unspecified, Type.WARNING is assumed. - */ - function register(languageId, provider) { - if (_providers[languageId]) { - console.warn("Overwriting existing inspection/linting provider for language " + languageId); - } - _providers[languageId] = provider; - - run(); // in case a file of this type is open currently - } - /** * Returns a provider for given file path, if one is available. * Decision is made depending on the file extension. @@ -303,6 +283,26 @@ define(function (require, exports, module) { } } + /** + * The provider is passed the text of the file and its fullPath. Providers should not assume + * that the file is open (i.e. DocumentManager.getOpenDocumentForPath() may return null) or + * that the file on disk matches the text given (file may have unsaved changes). + * + * @param {string} languageId + * @param {{name:string, scanFile:function(string, string):?{!errors:Array, aborted:boolean}} provider + * + * Each error is: { pos:{line,ch}, endPos:?{line,ch}, message:string, type:?Type } + * If type is unspecified, Type.WARNING is assumed. + */ + function register(languageId, provider) { + if (_providers[languageId]) { + console.warn("Overwriting existing inspection/linting provider for language " + languageId); + } + _providers[languageId] = provider; + + run(); // in case a file of this type is open currently + } + /** * Update DocumentManager listeners. */ From 413fe4f2c7490005bb2f16396e22e59bb71ca024 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Thu, 17 Oct 2013 14:15:53 -0700 Subject: [PATCH 0224/1140] Move shouldShow() back onto ProjectManager, and pass it into FileSystem as a client-specific filter function. Share the same filter for both watch() and Directory.getContents() - API now reconciled so it always takes a path (string), not an entry obj. Note that FileSystem._indexFilter() has a little more overhead, because it has to find the watch-root. I timed this and it only adds a cumulative total of 25ms while loading & watch()ing the brackets repo, so it seems manageable. This does NOT fix the pre-existing issues around items that may be filtered out of watching and getContents() but still added to the index anyway via explicit getFile/getDirectoryForPath() calls. --- src/extensions/default/UrlCodeHints/main.js | 2 +- src/filesystem/Directory.js | 2 +- src/filesystem/FileSystem.js | 44 ++++++++++++++------- src/project/ProjectManager.js | 28 +++++++++++-- test/spec/ProjectManager-test.js | 2 +- 5 files changed, 57 insertions(+), 21 deletions(-) diff --git a/src/extensions/default/UrlCodeHints/main.js b/src/extensions/default/UrlCodeHints/main.js index 3c6f592475e..4d924ea3020 100644 --- a/src/extensions/default/UrlCodeHints/main.js +++ b/src/extensions/default/UrlCodeHints/main.js @@ -135,7 +135,7 @@ define(function (require, exports, module) { directory.getContents(function (err, contents) { if (!err) { contents.forEach(function (entry) { - if (fileSystem.shouldShow(entry.fullPath)) { + if (ProjectManager.shouldShow(entry.fullPath)) { // convert to doc relative path var entryStr = entry.fullPath.replace(docDir, ""); diff --git a/src/filesystem/Directory.js b/src/filesystem/Directory.js index 4b1a051a9af..59e4e6fc5e4 100644 --- a/src/filesystem/Directory.js +++ b/src/filesystem/Directory.js @@ -84,7 +84,7 @@ define(function (require, exports, module) { // Note: not all entries necessarily have associated stats. // For now, silently ignore such entries. - if (stats[i] && this._fileSystem.shouldShow(entryPath)) { + if (stats[i] && this._fileSystem._indexFilter(entryPath)) { if (stats[i].isFile()) { entry = this._fileSystem.getFileForPath(entryPath); } else { diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js index 98fb421f1e9..d2795d7c224 100644 --- a/src/filesystem/FileSystem.js +++ b/src/filesystem/FileSystem.js @@ -152,9 +152,9 @@ define(function (require, exports, module) { * The set of watched roots, encoded as a mapping from full paths to objects * which contain a file entry, filter function, and change handler function. * - * @type{Object.>} + * @type{Object.} */ FileSystem.prototype._watchedRoots = null; @@ -178,7 +178,7 @@ define(function (require, exports, module) { paths.push(child.fullPath); } - return watchedRoot.filter(child); + return watchedRoot.filter(child.fullPath); }.bind(this); entry.visit(visitor, function (err) { @@ -268,16 +268,31 @@ define(function (require, exports, module) { }; /** - * Returns false for files and directories that are not commonly useful to display. - * - * @param {string} path File or directory to filter - * @return boolean true if the file should be displayed + * Returns true if the given path should be automatically added to the index & watch list when one of its ancestors + * is a watch-root. (Files are added automatically when the watch-root is first established, or later when a new + * directory is created and its children enumerated). + * + * Entries explicitly created via FileSystem.getFile/DirectoryForPath() are *always* added to the index regardless + * of this filtering - but they will not be watched if the watch-root's filter excludes them. */ - var _exclusionListRegEx = /\.pyc$|^\.git$|^\.gitignore$|^\.gitmodules$|^\.svn$|^\.DS_Store$|^Thumbs\.db$|^\.hg$|^CVS$|^\.cvsignore$|^\.gitattributes$|^\.hgtags$|^\.hgignore$/; - FileSystem.prototype.shouldShow = function (path) { - var name = path.substr(path.lastIndexOf("/") + 1); + FileSystem.prototype._indexFilter = function (path) { + var parentRoot; + + Object.keys(this._watchedRoots).some(function (watchedPath) { + if (path.indexOf(watchedPath) === 0) { + parentRoot = this._watchedRoots[watchedPath]; + return true; + } + }, this); + + if (parentRoot) { + return parentRoot.filter(path); + } - return !name.match(_exclusionListRegEx); + // It might seem more sensible to return false (exclude) for files outside the watch roots, but + // that would break usage of appFileSystem for 'system'-level things like enumerating extensions. + // (Or in general, Directory.getContents() for any Directory outside the watch roots). + return true; }; FileSystem.prototype._beginWrite = function () { @@ -569,8 +584,9 @@ define(function (require, exports, module) { * * @param {FileSystemEntry} entry - The root entry to watch. If entry is a directory, * all subdirectories that aren't explicitly filtered will also be watched. - * @param {function(FileSystemEntry): boolean} filter - A function to determine whether - * a particular FileSystemEntry should be watched or ignored. + * @param {function(string): boolean} filter - A function to determine whether + * a particular path should be watched or ignored. Paths that are ignored are also + * filtered from Directory.getContents() results within this subtree. * @param {function(FileSystemEntry)} handleChange - A function that is called whenever * a particular FileSystemEntry is changed. * @param {function(?string)} callback - A function that is called when the watch has diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 6554192e667..10c950eb427 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -87,6 +87,15 @@ define(function (require, exports, module) { var _fileSystemChange, _fileSystemRename; + /** + * @private + * File and folder names which are not displayed or searched + * TODO: We should add the rest of the file names that TAR excludes: + * http://www.gnu.org/software/tar/manual/html_section/exclude.html + * @type {RegExp} + */ + var _exclusionListRegEx = /\.pyc$|^\.git$|^\.gitignore$|^\.gitmodules$|^\.svn$|^\.DS_Store$|^Thumbs\.db$|^\.hg$|^CVS$|^\.cvsignore$|^\.gitattributes$|^\.hgtags$|^\.hgignore$/; + /** * @private * File names which are not showed in quick open dialog @@ -644,6 +653,18 @@ define(function (require, exports, module) { return Async.withTimeout(result.promise(), 1000); } + /** + * Returns false for files and directories that are not commonly useful to display. + * + * @param {string} path File or directory to filter + * @return boolean true if the file should be displayed + */ + function shouldShow(path) { + var name = path.substr(path.lastIndexOf("/") + 1); + + return !name.match(_exclusionListRegEx); + } + /** * Returns true if fileName's extension doesn't belong to binary (e.g. archived) * @param {string} fileName @@ -674,7 +695,7 @@ define(function (require, exports, module) { for (entryI = 0; entryI < entries.length; entryI++) { entry = entries[entryI]; - if (_fileSystem.shouldShow(entry.fullPath)) { + if (shouldShow(entry.fullPath)) { jsonEntry = { data: entry.name, attr: { id: "node" + _projectInitialLoad.id++ }, @@ -835,9 +856,7 @@ define(function (require, exports, module) { $(_fileSystem).on("change", _fileSystemChange); $(_fileSystem).on("rename", _fileSystemRename); - _fileSystem.watch(_fileSystem.getDirectoryForPath(rootPath), function (entry) { - return _fileSystem.shouldShow(entry.fullPath); - }, function (entry) { + _fileSystem.watch(_fileSystem.getDirectoryForPath(rootPath), shouldShow, function (entry) { console.log("Entry changed!", entry); }, function (err) { if (err) { @@ -1738,6 +1757,7 @@ define(function (require, exports, module) { exports.setBaseUrl = setBaseUrl; exports.isWithinProject = isWithinProject; exports.makeProjectRelativeIfPossible = makeProjectRelativeIfPossible; + exports.shouldShow = shouldShow; exports.isBinaryFile = isBinaryFile; exports.openProject = openProject; exports.getSelectedItem = getSelectedItem; diff --git a/test/spec/ProjectManager-test.js b/test/spec/ProjectManager-test.js index d7924764f13..baf8c1cf15e 100644 --- a/test/spec/ProjectManager-test.js +++ b/test/spec/ProjectManager-test.js @@ -599,7 +599,7 @@ define(function (require, exports, module) { describe("File Display", function () { it("should not show useless directory entries", function () { - var shouldShow = ProjectManager.getFileSystem().shouldShow; + var shouldShow = ProjectManager.shouldShow; expect(shouldShow(".git")).toBe(false); expect(shouldShow(".svn")).toBe(false); From a8945f304f1441a79d0ae4070fd57970420d4785 Mon Sep 17 00:00:00 2001 From: Jochen Hagenstroem Date: Thu, 17 Oct 2013 14:26:25 -0700 Subject: [PATCH 0225/1140] minor nit + typo --- src/editor/ImageViewer.js | 2 +- test/spec/StringUtils-test.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/editor/ImageViewer.js b/src/editor/ImageViewer.js index 1ea71e453f2..15fd0314ba5 100644 --- a/src/editor/ImageViewer.js +++ b/src/editor/ImageViewer.js @@ -38,7 +38,7 @@ define(function (require, exports, module) { var _naturalWidth = 0; - /** Update the scale element, i.e. on reize */ + /** Update the scale element, i.e. on resize */ function _updateScale(currentWidth) { if (currentWidth < _naturalWidth) { var scale = Math.floor(currentWidth / _naturalWidth * 100); diff --git a/test/spec/StringUtils-test.js b/test/spec/StringUtils-test.js index b678a3d6be9..8962e2a4e7d 100644 --- a/test/spec/StringUtils-test.js +++ b/test/spec/StringUtils-test.js @@ -24,7 +24,6 @@ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ /*global define: false, require: false, describe: false, it: false, xit: false, expect: false, beforeEach: false, afterEach: false, waitsFor: false, runs: false, jasmine: false */ -/*unittests: StringMatch */ define(function (require, exports, module) { 'use strict'; @@ -39,7 +38,7 @@ define(function (require, exports, module) { describe("prettyPrintBytes", function () { - it("should convert a number of bytes into a human readable string", function () { + it("should convert a number of bytes into a human readable string", function () { var prettyBytes = StringUtils.prettyPrintBytes(1); expect(prettyBytes).toBe("1 B"); From 290da888da7b28b99e668e3c10cbeaee60b63f19 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Thu, 17 Oct 2013 15:39:35 -0700 Subject: [PATCH 0226/1140] Make FileSystem a singleton. --- src/brackets.js | 8 +- src/document/DocumentCommandHandlers.js | 17 ++- src/document/DocumentManager.js | 10 +- src/extensibility/ExtensionManager.js | 7 +- src/extensibility/InstallExtensionDialog.js | 3 +- src/extensibility/Package.js | 7 +- src/extensions/default/DebugCommands/main.js | 5 +- .../JavaScriptCodeHints/ScopeManager.js | 18 ++- .../default/JavaScriptCodeHints/unittests.js | 3 +- src/extensions/default/RecentProjects/main.js | 49 +++------ src/extensions/default/UrlCodeHints/main.js | 6 +- .../default/WebPlatformDocs/main.js | 3 +- src/filesystem/FileSystem.js | 54 +++++---- src/filesystem/FileSystemEntry.js | 6 +- src/filesystem/FileSystemManager.js | 104 ------------------ .../impls/appshell/AppshellFileSystem.js | 4 +- src/language/JSUtils.js | 3 +- src/project/ProjectManager.js | 53 ++++----- src/utils/BuildInfoUtils.js | 3 +- src/utils/DragAndDrop.js | 3 +- src/utils/ExtensionLoader.js | 11 +- test/SpecRunner.js | 7 +- test/spec/CSSUtils-test.js | 19 ++-- test/spec/DocumentCommandHandlers-test.js | 14 ++- test/spec/ExtensionInstallation-test.js | 7 +- test/spec/FileSystem-test.js | 9 +- test/spec/JSUtils-test.js | 15 +-- test/spec/LiveDevelopment-test.js | 3 +- test/spec/ProjectManager-test.js | 20 ++-- test/spec/SpecRunnerUtils.js | 13 ++- 30 files changed, 187 insertions(+), 297 deletions(-) delete mode 100644 src/filesystem/FileSystemManager.js diff --git a/src/brackets.js b/src/brackets.js index 0c9a3ce4b98..fdba0ec1cd5 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -76,7 +76,7 @@ define(function (require, exports, module) { CommandManager = require("command/CommandManager"), CodeHintManager = require("editor/CodeHintManager"), PerfUtils = require("utils/PerfUtils"), - FileSystemManager = require("filesystem/FileSystemManager"), + FileSystem = require("filesystem/FileSystem"), QuickOpen = require("search/QuickOpen"), Menus = require("command/Menus"), FileUtils = require("file/FileUtils"), @@ -114,6 +114,9 @@ define(function (require, exports, module) { PerfUtils.addMeasurement("brackets module dependencies resolved"); + // Initialize the file system + FileSystem.init(require("filesystem/impls/appshell/AppshellFileSystem")); + // Local variables var params = new UrlParams(); @@ -139,6 +142,7 @@ define(function (require, exports, module) { JSUtils : JSUtils, CommandManager : CommandManager, FileSyncManager : FileSyncManager, + FileSystem : FileSystem, Menus : Menus, KeyBindingManager : KeyBindingManager, CodeHintManager : CodeHintManager, @@ -220,7 +224,7 @@ define(function (require, exports, module) { if (!params.get("skipSampleProjectLoad") && !prefs.getValue("afterFirstLaunch")) { prefs.setValue("afterFirstLaunch", "true"); if (ProjectManager.isWelcomeProjectPath(initialProjectPath)) { - brackets.appFileSystem.resolve(initialProjectPath + "index.html", function (err, file) { + FileSystem.resolve(initialProjectPath + "index.html", function (err, file) { if (!err) { var promise = CommandManager.execute(Commands.FILE_ADD_TO_WORKING_SET, { fullPath: file.fullPath }); promise.then(deferred.resolve, deferred.reject); diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index 25526c8c1ff..11b97d2be21 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -35,6 +35,7 @@ define(function (require, exports, module) { ProjectManager = require("project/ProjectManager"), DocumentManager = require("document/DocumentManager"), EditorManager = require("editor/EditorManager"), + FileSystem = require("filesystem/FileSystem"), FileUtils = require("file/FileUtils"), FileViewController = require("project/FileViewController"), InMemoryFile = require("document/InMemoryFile"), @@ -192,7 +193,7 @@ define(function (require, exports, module) { .fail(function (fileError) { function _cleanup() { // For performance, we do lazy checking of file existence, so it may be in working set - DocumentManager.removeFromWorkingSet(ProjectManager.getFileSystem().getFileForPath(fullPath)); + DocumentManager.removeFromWorkingSet(FileSystem.getFileForPath(fullPath)); EditorManager.focusEditor(); result.reject(); } @@ -226,8 +227,6 @@ define(function (require, exports, module) { function _doOpenWithOptionalPath(fullPath, silent) { var result; if (!fullPath) { - var fileSystem = ProjectManager.getFileSystem(); - // Create placeholder deferred result = new $.Deferred(); @@ -236,14 +235,14 @@ define(function (require, exports, module) { _defaultOpenDialogFullPath = ProjectManager.getProjectRoot().fullPath; } // Prompt the user with a dialog - fileSystem.showOpenDialog(true, false, Strings.OPEN_FILE, _defaultOpenDialogFullPath, null, function (err, paths) { + FileSystem.showOpenDialog(true, false, Strings.OPEN_FILE, _defaultOpenDialogFullPath, null, function (err, paths) { if (!err) { if (paths.length > 0) { // Add all files to the working set without verifying that // they still exist on disk (for faster opening) var filesToOpen = []; paths.forEach(function (file) { - filesToOpen.push(fileSystem.getFileForPath(file)); + filesToOpen.push(FileSystem.getFileForPath(file)); }); DocumentManager.addListToWorkingSet(filesToOpen); @@ -353,7 +352,6 @@ define(function (require, exports, module) { */ function _getUntitledFileSuggestion(dir, baseFileName, fileExt, isFolder) { var result = new $.Deferred(); - var fileSystem = ProjectManager.getFileSystem(); var suggestedName = baseFileName + "-" + _nextUntitledIndexToUse++ + fileExt; result.progress(function attemptNewName(suggestedName) { @@ -364,7 +362,7 @@ define(function (require, exports, module) { } var path = dir + "/" + suggestedName; - var entry = isFolder ? fileSystem.getDirectoryForPath(path) : fileSystem.getFileForPath(path); + var entry = isFolder ? FileSystem.getDirectoryForPath(path) : FileSystem.getFileForPath(path); entry.exists(function (exists) { if (exists) { @@ -557,11 +555,10 @@ define(function (require, exports, module) { var origPath, saveAsDefaultPath, defaultName, - fileSystem = ProjectManager.getFileSystem(), result = new $.Deferred(); function _doSaveAfterSaveDialog(path) { - var newFile = fileSystem.getFileForPath(path); + var newFile = FileSystem.getFileForPath(path); // Reconstruct old doc's editor's view state, & finally resolve overall promise function _configureEditorAndResolve() { @@ -649,7 +646,7 @@ define(function (require, exports, module) { saveAsDefaultPath = FileUtils.getDirectoryPath(origPath); } defaultName = FileUtils.getBaseName(origPath); - fileSystem.showSaveDialog(Strings.SAVE_FILE_AS, saveAsDefaultPath, defaultName, function (err, selection) { + FileSystem.showSaveDialog(Strings.SAVE_FILE_AS, saveAsDefaultPath, defaultName, function (err, selection) { if (!err) { _doSaveAfterSaveDialog(selection); } else { diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index fed494b0bf7..9875f052f98 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -92,6 +92,7 @@ define(function (require, exports, module) { ProjectManager = require("project/ProjectManager"), EditorManager = require("editor/EditorManager"), FileSyncManager = require("project/FileSyncManager"), + FileSystem = require("filesystem/FileSystem"), PreferencesManager = require("preferences/PreferencesManager"), FileUtils = require("file/FileUtils"), InMemoryFile = require("document/InMemoryFile"), @@ -618,7 +619,7 @@ define(function (require, exports, module) { * with a filesystem.Error if the file is not yet open and can't be read from disk. */ function getDocumentForPath(fullPath) { - var file = ProjectManager.getFileSystem().getFileForPath(fullPath), + var file = FileSystem.getFileForPath(fullPath), doc = getOpenDocumentForPath(fullPath), pendingPromise = getDocumentForPath._pendingDocumentPromises[file.id]; @@ -630,8 +631,7 @@ define(function (require, exports, module) { return pendingPromise; } else { var result = new $.Deferred(), - promise = result.promise(), - fileSystem = ProjectManager.getFileSystem() || brackets.appFileSystem; + promise = result.promise(); if (fullPath.indexOf(_untitledDocumentPath) === 0) { console.error("getDocumentForPath called for non-open untitled document: " + fullPath); @@ -695,7 +695,7 @@ define(function (require, exports, module) { var filename = Strings.UNTITLED + "-" + counter + fileExt, fullPath = _untitledDocumentPath + "/" + filename, now = new Date(), - file = new InMemoryFile(fullPath, ProjectManager.getFileSystem()); + file = new InMemoryFile(fullPath, FileSystem); return new DocumentModule.Document(file, now, ""); } @@ -790,7 +790,7 @@ define(function (require, exports, module) { // Add all files to the working set without verifying that // they still exist on disk (for faster project switching) files.forEach(function (value, index) { - filesToOpen.push(ProjectManager.getFileSystem().getFileForPath(value.file)); + filesToOpen.push(FileSystem.getFileForPath(value.file)); if (value.active) { activeFile = value.file; } diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js index 32829f9cc37..d789ae9ff3c 100644 --- a/src/extensibility/ExtensionManager.js +++ b/src/extensibility/ExtensionManager.js @@ -43,6 +43,7 @@ define(function (require, exports, module) { Package = require("extensibility/Package"), Async = require("utils/Async"), ExtensionLoader = require("utils/ExtensionLoader"), + FileSystem = require("filesystem/FileSystem"), Strings = require("strings"), StringUtils = require("utils/StringUtils"); @@ -174,7 +175,7 @@ define(function (require, exports, module) { * or rejected if there is no package.json or the contents are not valid JSON. */ function _loadPackageJson(folder) { - var file = brackets.appFileSystem.getFileForPath(folder + "/package.json"), + var file = FileSystem.getFileForPath(folder + "/package.json"), result = new $.Deferred(); FileUtils.readAsText(file) .done(function (text) { @@ -331,7 +332,7 @@ define(function (require, exports, module) { Object.keys(_idsToUpdate).forEach(function (id) { var filename = _idsToUpdate[id].localPath; if (filename) { - brackets.appFileSystem.getFileForPath(filename).unlink(); + FileSystem.getFileForPath(filename).unlink(); } }); _idsToUpdate = {}; @@ -405,7 +406,7 @@ define(function (require, exports, module) { return; } if (installationResult.localPath) { - brackets.appFileSystem.getFileForPath(installationResult.localPath).unlink(); + FileSystem.getFileForPath(installationResult.localPath).unlink(); } delete _idsToUpdate[id]; $(exports).triggerHandler("statusChange", [id]); diff --git a/src/extensibility/InstallExtensionDialog.js b/src/extensibility/InstallExtensionDialog.js index ccb915574a8..902bca9bcec 100644 --- a/src/extensibility/InstallExtensionDialog.js +++ b/src/extensibility/InstallExtensionDialog.js @@ -33,6 +33,7 @@ define(function (require, exports, module) { Strings = require("strings"), Commands = require("command/Commands"), CommandManager = require("command/CommandManager"), + FileSystem = require("filesystem/FileSystem"), KeyEvent = require("utils/KeyEvent"), Package = require("extensibility/Package"), NativeApp = require("utils/NativeApp"), @@ -253,7 +254,7 @@ define(function (require, exports, module) { // and the user cancels, we can delete the downloaded file. if (this._installResult && this._installResult.localPath) { var filename = this._installResult.localPath; - brackets.appFileSystem.getFileForPath(filename).unlink(); + FileSystem.getFileForPath(filename).unlink(); } this._enterState(STATE_CLOSED); } else if (this._state !== STATE_CANCELING_INSTALL) { diff --git a/src/extensibility/Package.js b/src/extensibility/Package.js index 7932c747bac..8124a85bdad 100644 --- a/src/extensibility/Package.js +++ b/src/extensibility/Package.js @@ -32,6 +32,7 @@ define(function (require, exports, module) { "use strict"; var AppInit = require("utils/AppInit"), + FileSystem = require("filesystem/FileSystem"), FileUtils = require("file/FileUtils"), StringUtils = require("utils/StringUtils"), Strings = require("strings"), @@ -311,7 +312,7 @@ define(function (require, exports, module) { result.localPath = downloadResult.localPath; d.resolve(result); } else { - brackets.appFileSystem.getFileForPath(downloadResult.localPath).unlink(); + FileSystem.getFileForPath(downloadResult.localPath).unlink(); if (result.errors && result.errors.length > 0) { // Validation errors - for now, only return the first one state = STATE_FAILED; @@ -330,7 +331,7 @@ define(function (require, exports, module) { .fail(function (err) { // File IO errors, internal error in install()/validate(), or extension startup crashed state = STATE_FAILED; - brackets.appFileSystem.getFileForPath(downloadResult.localPath).unlink(); + FileSystem.getFileForPath(downloadResult.localPath).unlink(); d.reject(err); // TODO: needs to be err.message ? }); }) @@ -418,7 +419,7 @@ define(function (require, exports, module) { d.reject(error); }) .always(function () { - brackets.appFileSystem.getFileForPath(path).unlink(); + FileSystem.getFileForPath(path).unlink(); }); return d.promise(); } diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index 6d5201d5130..a0cd51a7dea 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -33,6 +33,7 @@ define(function (require, exports, module) { KeyBindingManager = brackets.getModule("command/KeyBindingManager"), Menus = brackets.getModule("command/Menus"), Editor = brackets.getModule("editor/Editor").Editor, + FileSystem = brackets.getModule("filesystem/FileSystem"), FileUtils = brackets.getModule("file/FileUtils"), ProjectManager = brackets.getModule("project/ProjectManager"), PerfUtils = brackets.getModule("utils/PerfUtils"), @@ -140,7 +141,7 @@ define(function (require, exports, module) { function _handleSwitchLanguage() { var stringsPath = FileUtils.getNativeBracketsDirectoryPath() + "/nls"; - brackets.appFileSystem.getDirectoryForPath(stringsPath).getContents(function (err, contents) { + FileSystem.getDirectoryForPath(stringsPath).getContents(function (err, contents) { if (!err) { var $dialog, $submit, @@ -210,7 +211,7 @@ define(function (require, exports, module) { } // Check for the SpecRunner.html file - var file = brackets.appFileSystem.getFileForPath( + var file = FileSystem.getFileForPath( FileUtils.getNativeBracketsDirectoryPath() + "/../test/SpecRunner.html" ); diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js index a8122986bbb..418b5b01230 100644 --- a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js +++ b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js @@ -39,6 +39,7 @@ define(function (require, exports, module) { ProjectManager = brackets.getModule("project/ProjectManager"), CollectionUtils = brackets.getModule("utils/CollectionUtils"), ExtensionUtils = brackets.getModule("utils/ExtensionUtils"), + FileSystem = brackets.getModule("filesystem/FileSystem"), FileUtils = brackets.getModule("file/FileUtils"), HintUtils = require("HintUtils"), MessageIds = require("MessageIds"), @@ -78,7 +79,7 @@ define(function (require, exports, module) { library; files.forEach(function (i) { - brackets.appFileSystem.resolve(path + i, function (err, file) { + FileSystem.resolve(path + i, function (err, file) { if (!err) { FileUtils.readAsText(file).done(function (text) { library = JSON.parse(text); @@ -120,10 +121,9 @@ define(function (require, exports, module) { console.log("initPreferences: projectRootPath has no value"); } - var path = projectRootPath + Preferences.FILE_NAME, - fileSystem = ProjectManager.getFileSystem() || brackets.appFileSystem; + var path = projectRootPath + Preferences.FILE_NAME; - fileSystem.resolve(path, function (err, file) { + FileSystem.resolve(path, function (err, file) { if (!err) { FileUtils.readAsText(file).done(function (text) { var configObj = null; @@ -184,10 +184,9 @@ define(function (require, exports, module) { * @param {!function(string)=} errorCallback - Callback for errors (optional). */ function forEachFileInDirectory(dir, doneCallback, fileCallback, directoryCallback, errorCallback) { - var fileSystem = ProjectManager.getFileSystem() || brackets.appFileSystem, - files = []; + var files = []; - fileSystem.resolve(dir, function (err, directory) { + FileSystem.resolve(dir, function (err, directory) { if (!err && directory.isDirectory()) { directory.getContents(function (err, contents) { if (!err) { @@ -837,10 +836,9 @@ define(function (require, exports, module) { * @return {jQuery.Promise} - the Promise returned from DocumentMangaer.getDocumentForPath */ function getDocText(filePath) { - var fileSystem = ProjectManager.getFileSystem() || brackets.appFileSystem, - result = new $.Deferred(); + var result = new $.Deferred(); - fileSystem.resolve(filePath, function (err, file) { + FileSystem.resolve(filePath, function (err, file) { if (!err && file.isFile()) { DocumentManager.getDocumentForPath(filePath) .done(function (document) { diff --git a/src/extensions/default/JavaScriptCodeHints/unittests.js b/src/extensions/default/JavaScriptCodeHints/unittests.js index b5c4228f5e9..7e477c330f6 100644 --- a/src/extensions/default/JavaScriptCodeHints/unittests.js +++ b/src/extensions/default/JavaScriptCodeHints/unittests.js @@ -32,6 +32,7 @@ define(function (require, exports, module) { DocumentManager = brackets.getModule("document/DocumentManager"), Editor = brackets.getModule("editor/Editor").Editor, EditorManager = brackets.getModule("editor/EditorManager"), + FileSystem = brackets.getModule("filesystem/FileSystem"), FileUtils = brackets.getModule("file/FileUtils"), SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"), UnitTestReporter = brackets.getModule("test/UnitTestReporter"), @@ -1544,7 +1545,7 @@ define(function (require, exports, module) { function getPreferences(path) { preferences = null; - brackets.appFileSystem.resolve(path, function (err, file) { + FileSystem.resolve(path, function (err, file) { if (!err) { FileUtils.readAsText(file).done(function (text) { var configObj = null; diff --git a/src/extensions/default/RecentProjects/main.js b/src/extensions/default/RecentProjects/main.js index e04b7a4420e..f25360bc973 100644 --- a/src/extensions/default/RecentProjects/main.js +++ b/src/extensions/default/RecentProjects/main.js @@ -37,6 +37,7 @@ define(function (require, exports, module) { Menus = brackets.getModule("command/Menus"), EditorManager = brackets.getModule("editor/EditorManager"), ExtensionUtils = brackets.getModule("utils/ExtensionUtils"), + FileSystem = brackets.getModule("filesystem/FileSystem"), AppInit = brackets.getModule("utils/AppInit"), KeyEvent = brackets.getModule("utils/KeyEvent"), FileUtils = brackets.getModule("file/FileUtils"), @@ -62,33 +63,15 @@ define(function (require, exports, module) { $dropdown, $links; - /** - * Return the index of the item that contains path, - * or -1 if not found. - */ - function getIndex(projects, path) { - var i, len = projects.length; - - for (i = 0; i < len; i++) { - if (projects[i].path === path) { - return i; - } - } - - return -1; - } - /** * Get the stored list of recent projects, canonicalizing and updating paths as appropriate. */ - // TODO: FileSystem - the preferences key is changed to avoid conflict with old values. We should - // probably migrate old values instead (old values are an array of strings). - function getRecentProjects(includeFileSystem) { - var recentProjects = prefs.getValue("recentProjects2") || [], + function getRecentProjects() { + var recentProjects = prefs.getValue("recentProjects") || [], i; for (i = 0; i < recentProjects.length; i++) { - recentProjects[i].path = FileUtils.canonicalizeFolderPath(ProjectManager.updateWelcomeProjectPath(recentProjects[i].path)); + recentProjects[i] = FileUtils.canonicalizeFolderPath(ProjectManager.updateWelcomeProjectPath(recentProjects[i])); } return recentProjects; } @@ -98,18 +81,17 @@ define(function (require, exports, module) { */ function add() { var root = FileUtils.canonicalizeFolderPath(ProjectManager.getProjectRoot().fullPath), - fileSystem = ProjectManager.getFileSystem().getSystemName(), recentProjects = getRecentProjects(), - index = getIndex(recentProjects, root); + index = recentProjects.indexOf(root); if (index !== -1) { recentProjects.splice(index, 1); } - recentProjects.unshift({path: root, fileSystem: fileSystem}); + recentProjects.unshift(root); if (recentProjects.length > MAX_PROJECTS) { recentProjects = recentProjects.slice(0, MAX_PROJECTS); } - prefs.setValue("recentProjects2", recentProjects); + prefs.setValue("recentProjects", recentProjects); } /** @@ -141,7 +123,7 @@ define(function (require, exports, module) { // Remove the project from the preferences. var recentProjects = getRecentProjects(), - index = getIndex(recentProjects, $(this).parent().data("path")), + index = recentProjects.indexOf($(this).parent().data("path")), newProjects = [], i; for (i = 0; i < recentProjects.length; i++) { @@ -149,7 +131,7 @@ define(function (require, exports, module) { newProjects.push(recentProjects[i]); } } - prefs.setValue("recentProjects2", newProjects); + prefs.setValue("recentProjects", newProjects); $(this).closest("li").remove(); checkHovers(e.pageX, e.pageY); @@ -265,17 +247,16 @@ define(function (require, exports, module) { .on("click", "a", function (e) { var $link = $(e.target).closest("a"), id = $link.attr("id"), - path = $link.data("path"), - fileSystem = $link.data("file-system"); + path = $link.data("path"); if (path) { - ProjectManager.openProject(path, fileSystem) + ProjectManager.openProject(path) .fail(function () { // Remove the project from the list only if it does not exist on disk var recentProjects = getRecentProjects(), - index = getIndex(recentProjects, path); + index = recentProjects.indexOf(path); if (index !== -1) { - ProjectManager.getFileSystem().resolve(path, function (err, item) { + FileSystem.resolve(path, function (err, item) { if (err) { recentProjects.splice(index, 1); } @@ -348,9 +329,7 @@ define(function (require, exports, module) { recentProjects.forEach(function (root) { if (root.path !== currentProject) { - var params = parsePath(root.path); - params.fileSystem = root.fileSystem; - templateVars.projectList.push(params); + templateVars.projectList.push(parsePath(root)); } }); diff --git a/src/extensions/default/UrlCodeHints/main.js b/src/extensions/default/UrlCodeHints/main.js index 3c6f592475e..5c1b17cc8d4 100644 --- a/src/extensions/default/UrlCodeHints/main.js +++ b/src/extensions/default/UrlCodeHints/main.js @@ -33,6 +33,7 @@ define(function (require, exports, module) { CSSUtils = brackets.getModule("language/CSSUtils"), DocumentManager = brackets.getModule("document/DocumentManager"), EditorManager = brackets.getModule("editor/EditorManager"), + FileSystem = brackets.getModule("filesystem/FileSystem"), FileUtils = brackets.getModule("file/FileUtils"), HTMLUtils = brackets.getModule("language/HTMLUtils"), ProjectManager = brackets.getModule("project/ProjectManager"), @@ -120,8 +121,7 @@ define(function (require, exports, module) { unfiltered = this.cachedHints.unfiltered; } else { - var fileSystem = ProjectManager.getFileSystem() || brackets.appFileSystem, - directory = fileSystem.getDirectoryForPath(targetDir), + var directory = FileSystem.getDirectoryForPath(targetDir), self = this; if (self.cachedHints && self.cachedHints.deferred) { @@ -135,7 +135,7 @@ define(function (require, exports, module) { directory.getContents(function (err, contents) { if (!err) { contents.forEach(function (entry) { - if (fileSystem.shouldShow(entry.fullPath)) { + if (FileSystem.shouldShow(entry.fullPath)) { // convert to doc relative path var entryStr = entry.fullPath.replace(docDir, ""); diff --git a/src/extensions/default/WebPlatformDocs/main.js b/src/extensions/default/WebPlatformDocs/main.js index 4bd801d6574..b63d221a71e 100644 --- a/src/extensions/default/WebPlatformDocs/main.js +++ b/src/extensions/default/WebPlatformDocs/main.js @@ -30,6 +30,7 @@ define(function (require, exports, module) { // Core modules var EditorManager = brackets.getModule("editor/EditorManager"), + FileSystem = brackets.getModule("filesystem/FileSystem"), FileUtils = brackets.getModule("file/FileUtils"), ExtensionUtils = brackets.getModule("utils/ExtensionUtils"), CSSUtils = brackets.getModule("language/CSSUtils"), @@ -52,7 +53,7 @@ define(function (require, exports, module) { var result = new $.Deferred(); var path = ExtensionUtils.getModulePath(module, "css.json"), - file = brackets.appFileSystem.getFileForPath(path); + file = FileSystem.getFileForPath(path); FileUtils.readAsText(file) .done(function (text) { diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js index 98518cbca68..f241348eed9 100644 --- a/src/filesystem/FileSystem.js +++ b/src/filesystem/FileSystem.js @@ -32,17 +32,11 @@ define(function (require, exports, module) { File = require("filesystem/File"), FileIndex = require("filesystem/FileIndex"); - /** * Constructor. FileSystem objects should not be constructed directly. - * Use FileSystemManager.createFileSystem() instead. * The FileSystem is not usable until init() signals its callback. - * @param {!FileSystemImpl} impl Low-level file system implementation to use. */ - function FileSystem(impl, system) { - this._impl = impl; - this._system = system; - + function FileSystem() { // Create a file index this._index = new FileIndex(); @@ -59,12 +53,6 @@ define(function (require, exports, module) { */ FileSystem.prototype._impl = null; - /** - * The name of the low-level file system implementation used by this object. - * This is set in the constructor and cannot be changed. - */ - FileSystem.prototype._system = null; - /** * The FileIndex used by this object. This is initialized in the constructor. */ @@ -170,19 +158,15 @@ define(function (require, exports, module) { /** * @param {function(?err)} callback */ - FileSystem.prototype.init = function (callback) { + FileSystem.prototype.init = function (impl, callback) { + console.assert(!this._impl, "This FileSystem has already been initialized!"); + + this._impl = impl; this._impl.init(callback); // Initialize watchers this._impl.initWatchers(this._watcherCallback.bind(this)); }; - - /** - * The name of the low-level file system implementation used by this object. - */ - FileSystem.prototype.getSystemName = function () { - return this._system; - }; /** * Close a file system. Clear all caches, indexes, and file watchers. @@ -558,6 +542,30 @@ define(function (require, exports, module) { }.bind(this)); }; - // Export the FileSystem class - module.exports = FileSystem; + // The singleton instance + var _instance; + + function _wrap(func) { + return function () { + return func.apply(_instance, arguments); + }; + } + + // Export public methods as proxies to the singleton instance + exports.init = _wrap(FileSystem.prototype.init); + exports.close = _wrap(FileSystem.prototype.close); + exports.shouldShow = _wrap(FileSystem.prototype.shouldShow); + exports.getFileForPath = _wrap(FileSystem.prototype.getFileForPath); + exports.getDirectoryForPath = _wrap(FileSystem.prototype.getDirectoryForPath); + exports.resolve = _wrap(FileSystem.prototype.resolve); + exports.showOpenDialog = _wrap(FileSystem.prototype.showOpenDialog); + exports.showSaveDialog = _wrap(FileSystem.prototype.showSaveDialog); + exports.watch = _wrap(FileSystem.prototype.watch); + exports.unwatch = _wrap(FileSystem.prototype.unwatch); + + // Export the FileSystem class as "private" for unit testing only. + exports._FileSystem = FileSystem; + + // Create the singleton instance + _instance = new FileSystem(); }); diff --git a/src/filesystem/FileSystemEntry.js b/src/filesystem/FileSystemEntry.js index 86354eacde8..fdc05fc9d33 100644 --- a/src/filesystem/FileSystemEntry.js +++ b/src/filesystem/FileSystemEntry.js @@ -40,7 +40,7 @@ define(function (require, exports, module) { function FileSystemEntry(path, fileSystem) { this._path = path; this._fileSystem = fileSystem; - this._impl = fileSystem._impl; +// this._impl = fileSystem._impl; this._id = nextId++; } @@ -64,6 +64,10 @@ define(function (require, exports, module) { "id": { get: function () { return this._id; }, set: function (val) { throw new Error("Cannot set id"); } + }, + "_impl": { + get: function () { return this._fileSystem._impl; }, + set: function (val) { console.log("trying to set _impl"); } } }); diff --git a/src/filesystem/FileSystemManager.js b/src/filesystem/FileSystemManager.js deleted file mode 100644 index 9015c4a74aa..00000000000 --- a/src/filesystem/FileSystemManager.js +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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, regexp: true, indent: 4, maxerr: 50 */ -/*global define, $, appshell */ - -define(function (require, exports, module) { - "use strict"; - - var FileSystem = require("filesystem/FileSystem"); - - // File system impls. These should be mixed in instead of being hard-coded here. - var appshellFileSystem = require("filesystem/impls/appshell/AppshellFileSystem"), - dropboxFileSystem = require("filesystem/impls/dropbox/DropboxFileSystem"); - - var _defaultFileSystem, - _impls = {}; // File system implementations. Key is the string name, value is the _impl obj - - /** - * Register a file system implementation - * @param {string} name Name of the implementation - * @param {object} impl File system implementation. Must implement the methods - * described in FileSystemImpl. - */ - function registerFileSystemImpl(name, impl) { - _impls[name] = impl; - } - - /** - * Sets the default file system implementation to use. - * @param {!string} system The name of the default file system implementation. This - * system must be registered by calling registerFileSystemImpl - */ - function setDefaultFileSystem(system) { - _defaultFileSystem = system; - } - - /** - * Create a new FileSystem object. This should only be done by the application (to create - * the global brackets.fileSystem) or the ProjectManager (to create the file system for a - * project). - * - * @param {?string} system The name of the low-level file system implementation. If omitted, - * the default system is used. - * @param {!function(?err, ?FileSystem)} callback Passed either an error or a fully-initialized - * FileSystem once it's ready - */ - function createFileSystem(system, callback) { - var impl = _impls[system || _defaultFileSystem]; - - console.assert(impl, "File System implementation not found: " + (system || _defaultFileSystem)); - - var fs = new FileSystem(impl, system); - fs.init(function (err) { - callback(err, err ? null : fs); - }); - } - - // TODO: Registration and assigning default should be done in brackets.js or globals.js - - // Register built-in file systems - registerFileSystemImpl("appshell", appshellFileSystem); - registerFileSystemImpl("dropbox", dropboxFileSystem); - - // Set default file system - setDefaultFileSystem("appshell"); - - // Initialze the app file system. This is used to load application files like - // extensions and config.json. - // This file system is created with the "default" file system implementation, - // which is different when running in the shell and in browsers. - if (!appshell.appFileSystem) { - createFileSystem(null, function (err, fs) { - appshell.appFileSystem = fs; - }); - console.assert(appshell.appFileSystem, "Root 'appFileSystem' must be created synchronously!"); - } - - // Export public API - exports.registerFileSystemImpl = registerFileSystemImpl; - exports.setDefaultFileSystem = setDefaultFileSystem; - exports.createFileSystem = createFileSystem; -}); diff --git a/src/filesystem/impls/appshell/AppshellFileSystem.js b/src/filesystem/impls/appshell/AppshellFileSystem.js index e93135ebb1a..6332a77faf0 100644 --- a/src/filesystem/impls/appshell/AppshellFileSystem.js +++ b/src/filesystem/impls/appshell/AppshellFileSystem.js @@ -113,7 +113,9 @@ define(function (require, exports, module) { // Don't want to block on _nodeConnectionDeferred because we're needed as the 'root' fs // at startup -- and the Node-side stuff isn't needed for most functionality anyway. - callback(); + if (callback) { + callback(); + } } function _wrap(cb) { diff --git a/src/language/JSUtils.js b/src/language/JSUtils.js index 05d06294d75..6068f2ccfae 100644 --- a/src/language/JSUtils.js +++ b/src/language/JSUtils.js @@ -34,6 +34,7 @@ define(function (require, exports, module) { var Async = require("utils/Async"), DocumentManager = require("document/DocumentManager"), ChangedDocumentTracker = require("document/ChangedDocumentTracker"), + FileSystem = require("filesystem/FileSystem"), FileUtils = require("file/FileUtils"), CollectionUtils = require("utils/CollectionUtils"), PerfUtils = require("utils/PerfUtils"), @@ -229,7 +230,7 @@ define(function (require, exports, module) { result.resolve(false); } else { // If a cache exists, check the timestamp on disk - var file = ProjectManager.getFileSystem().getFileForPath(fileInfo.fullPath); + var file = FileSystem.getFileForPath(fileInfo.fullPath); file.stat(function (err, stat) { if (!err) { diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index fd1d09be465..65bee62c32a 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -61,6 +61,7 @@ define(function (require, exports, module) { Menus = require("command/Menus"), StringUtils = require("utils/StringUtils"), Strings = require("strings"), + FileSystem = require("filesystem/FileSystem"), FileViewController = require("project/FileViewController"), PerfUtils = require("utils/PerfUtils"), ViewUtils = require("utils/ViewUtils"), @@ -70,15 +71,8 @@ define(function (require, exports, module) { Urls = require("i18n!nls/urls"), KeyEvent = require("utils/KeyEvent"), Async = require("utils/Async"), - FileSystemManager = require("filesystem/FileSystemManager"), FileSyncManager = require("project/FileSyncManager"); - - /** - * @private - * Reference to the FileSystem used by the current project - */ - var _fileSystem; /** * @private @@ -674,7 +668,7 @@ define(function (require, exports, module) { for (entryI = 0; entryI < entries.length; entryI++) { entry = entries[entryI]; - if (_fileSystem.shouldShow(entry.fullPath)) { + if (FileSystem.shouldShow(entry.fullPath)) { jsonEntry = { data: entry.name, attr: { id: "node" + _projectInitialLoad.id++ }, @@ -832,11 +826,11 @@ define(function (require, exports, module) { } function _watchProjectRoot(rootPath) { - $(_fileSystem).on("change", _fileSystemChange); - $(_fileSystem).on("rename", _fileSystemRename); + $(FileSystem).on("change", _fileSystemChange); + $(FileSystem).on("rename", _fileSystemRename); - _fileSystem.watch(_fileSystem.getDirectoryForPath(rootPath), function (entry) { - return _fileSystem.shouldShow(entry.fullPath); + FileSystem.watch(FileSystem.getDirectoryForPath(rootPath), function (entry) { + return FileSystem.shouldShow(entry.fullPath); }, function (entry) { console.log("Entry changed!", entry); }, function (err) { @@ -854,11 +848,11 @@ define(function (require, exports, module) { * Close the file system and remove listeners. */ function _unwatchProjectRoot() { - if (_fileSystem) { - $(_fileSystem).off("change", _fileSystemChange); - $(_fileSystem).off("rename", _fileSystemRename); + if (_projectRoot) { + $(FileSystem).off("change", _fileSystemChange); + $(FileSystem).off("rename", _fileSystemRename); - _fileSystem.unwatch(_projectRoot, function (err) { + FileSystem.unwatch(_projectRoot, function (err) { if (err) { console.log("Error unwatching project root: ", _projectRoot.fullPath, err); } else { @@ -901,15 +895,16 @@ define(function (require, exports, module) { function ensureFileSystem() { var fsResult = new $.Deferred(); - if (_fileSystem) { + if (FileSystem) { fsResult.resolve(); - } else { + } /* else { + TODO: remove me FileSystemManager.createFileSystem(filesystem, function (err, fs) { // TODO: check err? _fileSystem = fs; fsResult.resolve(); }); - } + } */ return fsResult.promise(); } @@ -934,7 +929,7 @@ define(function (require, exports, module) { _watchProjectRoot(rootPath); } // Point at a real folder structure on local disk - var rootEntry = _fileSystem.getDirectoryForPath(rootPath); + var rootEntry = FileSystem.getDirectoryForPath(rootPath); rootEntry.exists(function (exists) { if (exists) { var projectRootChanged = (!_projectRoot || !rootEntry) || @@ -1137,7 +1132,7 @@ define(function (require, exports, module) { _loadProject(path, false, filesystem).then(result.resolve, result.reject); } else { // Pop up a folder browse dialog - _fileSystem.showOpenDialog(false, true, Strings.CHOOSE_FOLDER, _projectRoot.fullPath, null, function (err, files) { + FileSystem.showOpenDialog(false, true, Strings.CHOOSE_FOLDER, _projectRoot.fullPath, null, function (err, files) { if (!err) { // If length == 0, user canceled the dialog; length should never be > 1 if (files.length > 0) { @@ -1344,13 +1339,13 @@ define(function (require, exports, module) { var newItemPath = selectionEntry.fullPath + data.rslt.name; - _fileSystem.resolve(newItemPath, function (err, item) { + FileSystem.resolve(newItemPath, function (err, item) { if (!err) { // Item already exists, fail with error errorCallback(Error.ALREADY_EXISTS); } else { if (isFolder) { - var directory = _fileSystem.getDirectoryForPath(newItemPath); + var directory = FileSystem.getDirectoryForPath(newItemPath); directory.create(function (err) { if (err) { @@ -1361,7 +1356,7 @@ define(function (require, exports, module) { }); } else { // Create an empty file - var file = _fileSystem.getFileForPath(newItemPath); + var file = FileSystem.getFileForPath(newItemPath); file.write("", function (err) { if (!err) { @@ -1436,7 +1431,7 @@ define(function (require, exports, module) { return result.promise(); } - _fileSystem.resolve(oldName, function (err, item) { + FileSystem.resolve(oldName, function (err, item) { if (!err) { result.resolve(item); } else { @@ -1610,13 +1605,6 @@ define(function (require, exports, module) { return result.promise(); } - - /** - * Returns the FileSystem instance used for this project - */ - function getFileSystem() { - return _fileSystem || brackets.appFileSystem; - } /** * Returns an Array of all files for this project, optionally including @@ -1754,6 +1742,5 @@ define(function (require, exports, module) { exports.forceFinishRename = forceFinishRename; exports.showInTree = showInTree; exports.refreshFileTree = refreshFileTree; - exports.getFileSystem = getFileSystem; exports.getAllFiles = getAllFiles; }); diff --git a/src/utils/BuildInfoUtils.js b/src/utils/BuildInfoUtils.js index eeb07942319..7b7f7449a0e 100644 --- a/src/utils/BuildInfoUtils.js +++ b/src/utils/BuildInfoUtils.js @@ -33,6 +33,7 @@ define(function (require, exports, module) { "use strict"; var Global = require("utils/Global"), + FileSystem = require("filesystem/FileSystem"), FileUtils = require("file/FileUtils"); var _bracketsSHA; @@ -49,7 +50,7 @@ define(function (require, exports, module) { } else { // HEAD contains a SHA in detached-head mode; otherwise it contains a relative path // to a file in /refs which in turn contains the SHA - var file = brackets.appFileSystem.getFileForPath(path); + var file = FileSystem.getFileForPath(path); FileUtils.readAsText(file).done(function (text) { if (text.indexOf("ref: ") === 0) { // e.g. "ref: refs/heads/branchname" diff --git a/src/utils/DragAndDrop.js b/src/utils/DragAndDrop.js index 38ef1859de8..fa3aa3fd2c6 100644 --- a/src/utils/DragAndDrop.js +++ b/src/utils/DragAndDrop.js @@ -34,6 +34,7 @@ define(function (require, exports, module) { Dialogs = require("widgets/Dialogs"), DefaultDialogs = require("widgets/DefaultDialogs"), DocumentManager = require("document/DocumentManager"), + FileSystem = require("filesystem/FileSystem"), FileUtils = require("file/FileUtils"), ProjectManager = require("project/ProjectManager"), Strings = require("strings"), @@ -78,7 +79,7 @@ define(function (require, exports, module) { var result = new $.Deferred(); // Only open files. - ProjectManager.getFileSystem().resolve(path, function (err, item) { + FileSystem.resolve(path, function (err, item) { if (!err && item.isFile()) { // If the file is already open, and this isn't the last // file in the list, return. If this *is* the last file, diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js index 47c59a281a9..16dc724f37a 100644 --- a/src/utils/ExtensionLoader.js +++ b/src/utils/ExtensionLoader.js @@ -39,7 +39,8 @@ define(function (require, exports, module) { require("utils/Global"); - var FileUtils = require("file/FileUtils"), + var FileSystem = require("filesystem/FileSystem"), + FileUtils = require("file/FileUtils"), Async = require("utils/Async"); // default async initExtension timeout @@ -193,7 +194,7 @@ define(function (require, exports, module) { extensionPath = config.baseUrl + "/" + entryPoint + ".js"; var fileExists = false, statComplete = false; - var file = brackets.appFileSystem.getFileForPath(extensionPath); + var file = FileSystem.getFileForPath(extensionPath); file.stat(function (err, stat) { if (!err) { @@ -236,7 +237,7 @@ define(function (require, exports, module) { function _loadAll(directory, config, entryPoint, processExtension) { var result = new $.Deferred(); - brackets.appFileSystem.getDirectoryForPath(directory).getContents(function (err, contents) { + FileSystem.getDirectoryForPath(directory).getContents(function (err, contents) { if (!err) { var i, extensions = []; @@ -334,11 +335,11 @@ define(function (require, exports, module) { // If the directory *does* exist, nothing else needs to be done. It will be scanned normally // during extension loading. var extensionPath = getUserExtensionPath(); - brackets.appFileSystem.getDirectoryForPath(extensionPath).create(); + FileSystem.getDirectoryForPath(extensionPath).create(); // Create the extensions/disabled directory, too. var disabledExtensionPath = extensionPath.replace(/\/user$/, "/disabled"); - brackets.appFileSystem.getDirectoryForPath(disabledExtensionPath).create(); + FileSystem.getDirectoryForPath(disabledExtensionPath).create(); var promise = Async.doInParallel(paths.split(","), function (item) { var extensionPath = item; diff --git a/test/SpecRunner.js b/test/SpecRunner.js index bb7c0dd3520..72c2932ac20 100644 --- a/test/SpecRunner.js +++ b/test/SpecRunner.js @@ -45,8 +45,8 @@ define(function (require, exports, module) { SpecRunnerUtils = require("spec/SpecRunnerUtils"), ExtensionLoader = require("utils/ExtensionLoader"), Async = require("utils/Async"), + FileSystem = require("filesystem/FileSystem"), FileUtils = require("file/FileUtils"), - FileSystemManager = require("filesystem/FileSystemManager"), Menus = require("command/Menus"), UrlParams = require("utils/UrlParams").UrlParams, UnitTestReporter = require("test/UnitTestReporter").UnitTestReporter, @@ -86,6 +86,9 @@ define(function (require, exports, module) { */ var NODE_CONNECTION_TIMEOUT = 30000; // 30 seconds - TODO: share with StaticServer? + // Initialize the file system + FileSystem.init(require("filesystem/impls/appshell/AppshellFileSystem")); + // parse URL parameters params.parse(); resultsPath = params.get("resultsPath"); @@ -147,7 +150,7 @@ define(function (require, exports, module) { function writeResults(path, text) { // check if the file already exists - var file = brackets.appFileSystem.getFileForPath(path); + var file = FileSystem.getFileForPath(path); file.exists(function (exists) { if (exists) { diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js index 6e8ffaa52f7..f38e2133594 100644 --- a/test/spec/CSSUtils-test.js +++ b/test/spec/CSSUtils-test.js @@ -28,20 +28,21 @@ define(function (require, exports, module) { "use strict"; var Async = require("utils/Async"), + FileSystem = require("filesystem/FileSystem"), FileUtils = require("file/FileUtils"), CSSUtils = require("language/CSSUtils"), HTMLUtils = require("language/HTMLUtils"), SpecRunnerUtils = require("spec/SpecRunnerUtils"); var testPath = SpecRunnerUtils.getTestPath("/spec/CSSUtils-test-files"), - simpleCssFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/simple.css"), - universalCssFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/universal.css"), - groupsFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/groups.css"), - offsetsCssFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/offsets.css"), - bootstrapCssFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/bootstrap.css"), - escapesCssFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/escaped-identifiers.css"), - embeddedHtmlFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/embedded.html"), - cssRegionsFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/regions.css"); + simpleCssFileEntry = FileSystem.getFileForPath(testPath + "/simple.css"), + universalCssFileEntry = FileSystem.getFileForPath(testPath + "/universal.css"), + groupsFileEntry = FileSystem.getFileForPath(testPath + "/groups.css"), + offsetsCssFileEntry = FileSystem.getFileForPath(testPath + "/offsets.css"), + bootstrapCssFileEntry = FileSystem.getFileForPath(testPath + "/bootstrap.css"), + escapesCssFileEntry = FileSystem.getFileForPath(testPath + "/escaped-identifiers.css"), + embeddedHtmlFileEntry = FileSystem.getFileForPath(testPath + "/embedded.html"), + cssRegionsFileEntry = FileSystem.getFileForPath(testPath + "/regions.css"); var contextTestCss = require("text!spec/CSSUtils-test-files/contexts.css"), @@ -201,7 +202,7 @@ define(function (require, exports, module) { describe("with sprint 4 exemptions", function () { beforeEach(function () { - var sprint4exemptions = brackets.appFileSystem.getFileForPath(testPath + "/sprint4.css"); + var sprint4exemptions = FileSystem.getFileForPath(testPath + "/sprint4.css"); init(this, sprint4exemptions); }); diff --git a/test/spec/DocumentCommandHandlers-test.js b/test/spec/DocumentCommandHandlers-test.js index d04b0c8a474..7f3fbd973f6 100644 --- a/test/spec/DocumentCommandHandlers-test.js +++ b/test/spec/DocumentCommandHandlers-test.js @@ -34,6 +34,7 @@ define(function (require, exports, module) { DocumentCommandHandlers, // loaded from brackets.test DocumentManager, // loaded from brackets.test Dialogs, // loaded from brackets.test + FileSystem, // loaded from brackets.test FileViewController, // loaded from brackets.test ProjectManager, // loaded from brackets.test SpecRunnerUtils = require("spec/SpecRunnerUtils"), @@ -61,6 +62,7 @@ define(function (require, exports, module) { DocumentCommandHandlers = testWindow.brackets.test.DocumentCommandHandlers; DocumentManager = testWindow.brackets.test.DocumentManager; Dialogs = testWindow.brackets.test.Dialogs; + FileSystem = testWindow.brackets.test.FileSystem; FileViewController = testWindow.brackets.test.FileViewController; ProjectManager = testWindow.brackets.test.ProjectManager; }); @@ -659,7 +661,7 @@ define(function (require, exports, module) { // confirm file contents var actualContent = null, error = -1; runs(function () { - promise = FileUtils.readAsText(ProjectManager.getFileSystem().getFileForPath(filePath)) + promise = FileUtils.readAsText(FileSystem.getFileForPath(filePath)) .done(function (actualText) { expect(actualText).toBe(TEST_JS_NEW_CONTENT); }); @@ -668,7 +670,7 @@ define(function (require, exports, module) { // reset file contents runs(function () { - promise = FileUtils.writeText(ProjectManager.getFileSystem().getFileForPath(filePath), TEST_JS_CONTENT); + promise = FileUtils.writeText(FileSystem.getFileForPath(filePath), TEST_JS_CONTENT); waitsForDone(promise, "Revert test file"); }); }); @@ -683,11 +685,11 @@ define(function (require, exports, module) { // create test files (Git rewrites line endings, so these can't be kept in src control) runs(function () { - promise = FileUtils.writeText(ProjectManager.getFileSystem().getFileForPath(crlfPath), crlfText); + promise = FileUtils.writeText(FileSystem.getFileForPath(crlfPath), crlfText); waitsForDone(promise, "Create CRLF test file"); }); runs(function () { - promise = FileUtils.writeText(ProjectManager.getFileSystem().getFileForPath(lfPath), lfText); + promise = FileUtils.writeText(FileSystem.getFileForPath(lfPath), lfText); waitsForDone(promise, "Create LF test file"); }); @@ -717,7 +719,7 @@ define(function (require, exports, module) { // verify file contents runs(function () { - promise = FileUtils.readAsText(ProjectManager.getFileSystem().getFileForPath(crlfPath)) + promise = FileUtils.readAsText(FileSystem.getFileForPath(crlfPath)) .done(function (actualText) { expect(actualText).toBe(crlfText.replace("line2", "line2a\r\nline2b")); }); @@ -725,7 +727,7 @@ define(function (require, exports, module) { }); runs(function () { - promise = FileUtils.readAsText(ProjectManager.getFileSystem().getFileForPath(lfPath)) + promise = FileUtils.readAsText(FileSystem.getFileForPath(lfPath)) .done(function (actualText) { expect(actualText).toBe(lfText.replace("line2", "line2a\nline2b")); }); diff --git a/test/spec/ExtensionInstallation-test.js b/test/spec/ExtensionInstallation-test.js index eb881a2d9e5..f4299ee7518 100644 --- a/test/spec/ExtensionInstallation-test.js +++ b/test/spec/ExtensionInstallation-test.js @@ -32,6 +32,7 @@ define(function (require, exports, module) { var SpecRunnerUtils = require("spec/SpecRunnerUtils"), ExtensionLoader = require("utils/ExtensionLoader"), + FileSystem = require("filesystem/FileSystem"), Package = require("extensibility/Package"), NodeConnection = require("utils/NodeConnection"); @@ -158,7 +159,7 @@ define(function (require, exports, module) { var expectedPath = mockGetUserExtensionPath() + "/basic-valid-extension"; expect(lastExtensionLoad.config.baseUrl).toEqual(expectedPath); expect(lastExtensionLoad.entryPoint).toEqual("main"); - brackets.appFileSystem.resolve(extensionsRoot + "/user/basic-valid-extension/main.js", function (err, item) { + FileSystem.resolve(extensionsRoot + "/user/basic-valid-extension/main.js", function (err, item) { if (!err) { mainCheckComplete = true; } else { @@ -181,7 +182,7 @@ define(function (require, exports, module) { expect(packageData.disabledReason).not.toBeNull(); expect(packageData.name).toEqual("incompatible-version"); expect(lastExtensionLoad).toEqual({}); - brackets.appFileSystem.resolve(extensionsRoot + "/disabled/incompatible-version", function (err, item) { + FileSystem.resolve(extensionsRoot + "/disabled/incompatible-version", function (err, item) { if (!err) { directoryCheckComplete = true; } else { @@ -203,7 +204,7 @@ define(function (require, exports, module) { handlePackage(installPath, Package.remove); }); runs(function () { - brackets.appFileSystem.resolve(installPath, function (err, item) { + FileSystem.resolve(installPath, function (err, item) { if (!err) { checkComplete = true; expect("installation path was removed").toEqual(true); diff --git a/test/spec/FileSystem-test.js b/test/spec/FileSystem-test.js index 17d7941f53b..8446ec6763d 100644 --- a/test/spec/FileSystem-test.js +++ b/test/spec/FileSystem-test.js @@ -27,8 +27,7 @@ define(function (require, exports, module) { "use strict"; - var FileSystem = require("filesystem/FileSystem"), - FileSystemManager = require("filesystem/FileSystemManager"); + var FileSystem = require("filesystem/FileSystem"); describe("FileSystem", function () { @@ -36,11 +35,7 @@ define(function (require, exports, module) { beforeEach(function () { // Create an FS instance for testing - FileSystemManager.createFileSystem(null, function (err, fs) { - fileSystem = fs; - expect(err).toBeFalsy(); - }); - waitsFor(function () { return fileSystem; }); + fileSystem = new FileSystem._FileSystem(); }); diff --git a/test/spec/JSUtils-test.js b/test/spec/JSUtils-test.js index 46a057fd08e..bdedad609b2 100644 --- a/test/spec/JSUtils-test.js +++ b/test/spec/JSUtils-test.js @@ -33,6 +33,7 @@ define(function (require, exports, module) { ProjectManager, // loaded from brackets.test JSUtils = require("language/JSUtils"), + FileSystem = require("filesystem/FileSystem"), FileUtils = require("file/FileUtils"), SpecRunnerUtils = require("spec/SpecRunnerUtils"); @@ -47,13 +48,13 @@ define(function (require, exports, module) { return this.actual.functionName.trim() === expected; }; - var simpleJsFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/simple.js"); - var trickyJsFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/tricky.js"); - var invalidJsFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/invalid.js"); - var jQueryJsFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/jquery-1.7.js"); - var braceEndJsFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/braceEnd.js"); - var eofJsFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/eof.js"); - var eof2JsFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/eof2.js"); + var simpleJsFileEntry = FileSystem.getFileForPath(testPath + "/simple.js"); + var trickyJsFileEntry = FileSystem.getFileForPath(testPath + "/tricky.js"); + var invalidJsFileEntry = FileSystem.getFileForPath(testPath + "/invalid.js"); + var jQueryJsFileEntry = FileSystem.getFileForPath(testPath + "/jquery-1.7.js"); + var braceEndJsFileEntry = FileSystem.getFileForPath(testPath + "/braceEnd.js"); + var eofJsFileEntry = FileSystem.getFileForPath(testPath + "/eof.js"); + var eof2JsFileEntry = FileSystem.getFileForPath(testPath + "/eof2.js"); function init(spec, fileEntry) { if (fileEntry) { diff --git a/test/spec/LiveDevelopment-test.js b/test/spec/LiveDevelopment-test.js index 57117b448ad..935cf1ce4ed 100644 --- a/test/spec/LiveDevelopment-test.js +++ b/test/spec/LiveDevelopment-test.js @@ -32,6 +32,7 @@ define(function (require, exports, module) { PreferencesDialogs = require("preferences/PreferencesDialogs"), Strings = require("strings"), StringUtils = require("utils/StringUtils"), + FileSystem = require("filesystem/FileSystem"), FileUtils = require("file/FileUtils"), DefaultDialogs = require("widgets/DefaultDialogs"), FileServer = require("LiveDevelopment/Servers/FileServer").FileServer, @@ -366,7 +367,7 @@ define(function (require, exports, module) { instrumentedHtml = "", elementIds = {}, testPath = SpecRunnerUtils.getTestPath("/spec/HTMLInstrumentation-test-files"), - WellFormedFileEntry = brackets.appFileSystem.getFileForPath(testPath + "/wellformed.html"); + WellFormedFileEntry = FileSystem.getFileForPath(testPath + "/wellformed.html"); function init(fileEntry) { if (fileEntry) { diff --git a/test/spec/ProjectManager-test.js b/test/spec/ProjectManager-test.js index d7924764f13..8effa8bd084 100644 --- a/test/spec/ProjectManager-test.js +++ b/test/spec/ProjectManager-test.js @@ -30,6 +30,7 @@ define(function (require, exports, module) { var ProjectManager, // Load from brackets.test CommandManager, // Load from brackets.test + FileSystem, // Load from brackets.test Dialogs = require("widgets/Dialogs"), DefaultDialogs = require("widgets/DefaultDialogs"), Commands = require("command/Commands"), @@ -53,6 +54,7 @@ define(function (require, exports, module) { brackets = testWindow.brackets; ProjectManager = testWindow.brackets.test.ProjectManager; CommandManager = testWindow.brackets.test.CommandManager; + FileSystem = testWindow.brackets.test.FileSystem; SpecRunnerUtils.loadProjectInTestWindow(testPath); }); @@ -80,9 +82,8 @@ define(function (require, exports, module) { waitsFor(function () { return didCreate && !gotError; }, "ProjectManager.createNewItem() timeout", 1000); var error, stat, complete = false; - var fileSystem = ProjectManager.getFileSystem(); var filePath = testPath + "/Untitled.js"; - var file = fileSystem.getFileForPath(filePath); + var file = FileSystem.getFileForPath(filePath); runs(function () { file.stat(function (err, _stat) { @@ -238,7 +239,7 @@ define(function (require, exports, module) { describe("deleteItem", function () { it("should delete the selected file in the project tree", function () { var complete = false, - newFile = ProjectManager.getFileSystem().getFileForPath(testPath + "/delete_me.js"), + newFile = FileSystem.getFileForPath(testPath + "/delete_me.js"), selectedFile, error, stat; @@ -322,7 +323,6 @@ define(function (require, exports, module) { // TODO: FileSystem - fix this test xit("should delete the selected folder and all items in it.", function () { var complete = false, - fileSystem = ProjectManager.getFileSystem(), newFolderName = testPath + "/toDelete", rootFolderName = newFolderName, rootFolderEntry, @@ -332,7 +332,7 @@ define(function (require, exports, module) { // Make sure we don't have any test files/folders left from previous failure // by explicitly deleting the root test folder if it exists. runs(function () { - var rootFolder = fileSystem.getDirectoryForPath(rootFolderName); + var rootFolder = FileSystem.getDirectoryForPath(rootFolderName); complete = false; rootFolder.moveToTrash(function (err) { complete = true; @@ -349,7 +349,7 @@ define(function (require, exports, module) { waitsFor(function () { return complete; }, "ProjectManager.createNewItem() timeout", 1000); runs(function () { - var newFolder = fileSystem.getDirectoryForPath(newFolderName); + var newFolder = FileSystem.getDirectoryForPath(newFolderName); complete = false; newFolder.stat(function (err, _stat) { if (!err) { @@ -384,7 +384,7 @@ define(function (require, exports, module) { var newFolder; newFolderName += "toDelete1/"; - newFolder = fileSystem.getDirectoryForPath(newFolderName); + newFolder = FileSystem.getDirectoryForPath(newFolderName); complete = false; newFolder.stat(function (err, _stat) { if (!err) { @@ -413,7 +413,7 @@ define(function (require, exports, module) { waitsFor(function () { return complete; }, "ProjectManager.createNewItem() timeout", 1000); runs(function () { - var file = fileSystem.getFileForPath(newFolderName + "/toDelete2.txt"); + var file = FileSystem.getFileForPath(newFolderName + "/toDelete2.txt"); complete = false; file.stat(function (err, _stat) { if (!err) { @@ -444,7 +444,7 @@ define(function (require, exports, module) { // Verify that the root folder no longer exists. runs(function () { - var rootFolder = fileSystem.getDirectoryForPath(rootFolderName); + var rootFolder = FileSystem.getDirectoryForPath(rootFolderName); complete = false; rootFolder.stat(function (err, _stat) { if (!err) { @@ -599,7 +599,7 @@ define(function (require, exports, module) { describe("File Display", function () { it("should not show useless directory entries", function () { - var shouldShow = ProjectManager.getFileSystem().shouldShow; + var shouldShow = FileSystem.shouldShow; expect(shouldShow(".git")).toBe(false); expect(shouldShow(".svn")).toBe(false); diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index 5393ebf651b..e776e4dc978 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -34,6 +34,7 @@ define(function (require, exports, module) { Editor = require("editor/Editor").Editor, EditorManager = require("editor/EditorManager"), Error = require("filesystem/Error"), + FileSystem = require("filesystem/FileSystem"), PanelManager = require("view/PanelManager"), ExtensionLoader = require("utils/ExtensionLoader"), UrlParams = require("utils/UrlParams").UrlParams, @@ -61,7 +62,7 @@ define(function (require, exports, module) { */ function deletePath(fullPath, silent) { var result = new $.Deferred(); - brackets.appFileSystem.resolve(fullPath, function (err, item) { + FileSystem.resolve(fullPath, function (err, item) { if (!err) { item.unlink(function (err) { if (!err) { @@ -148,7 +149,7 @@ define(function (require, exports, module) { function resolveNativeFileSystemPath(path) { var result = new $.Deferred(); - brackets.appFileSystem.resolve(path, function (err, item) { + FileSystem.resolve(path, function (err, item) { if (!err) { result.resolve(item); } else { @@ -229,7 +230,7 @@ define(function (require, exports, module) { var deferred = new $.Deferred(); runs(function () { - var dir = brackets.appFileSystem.getDirectoryForPath(getTempDirectory()).create(function (err) { + var dir = FileSystem.getDirectoryForPath(getTempDirectory()).create(function (err) { if (err) { deferred.reject(); } else { @@ -337,7 +338,7 @@ define(function (require, exports, module) { content = options.content || ""; // Use unique filename to avoid collissions in open documents list - var dummyFile = brackets.appFileSystem.getFileForPath(filename); + var dummyFile = FileSystem.getFileForPath(filename); var docToShim = new DocumentManager.Document(dummyFile, new Date(), content); // Prevent adding doc to working set @@ -760,7 +761,7 @@ define(function (require, exports, module) { */ function createTextFile(path, text) { var deferred = new $.Deferred(), - file = brackets.appFileSystem.getFileForPath(path); + file = FileSystem.getFileForPath(path); file.write(text, function (err) { if (!err) { @@ -839,7 +840,7 @@ define(function (require, exports, module) { var parseOffsets = options.parseOffsets || false, removePrefix = options.removePrefix || true, deferred = new $.Deferred(), - destDir = brackets.appFileSystem.getDirectoryForPath(destination); + destDir = FileSystem.getDirectoryForPath(destination); // create the destination folder destDir.create(function (err) { From 1af2a17ee29e51a3abd552c4fc2e86af51b2c77c Mon Sep 17 00:00:00 2001 From: Jochen Hagenstroem Date: Thu, 17 Oct 2013 15:01:30 -0700 Subject: [PATCH 0227/1140] fixes for various nits found by @RaymondLim in code review. --- src/editor/EditorManager.js | 8 ++++---- src/editor/ImageViewer.js | 22 ++++++++++++---------- src/utils/StringUtils.js | 10 +++------- test/spec/DocumentManager-test.js | 4 ++-- test/spec/StringUtils-test.js | 2 +- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js index 2b4baae2cf7..70b3990711d 100644 --- a/src/editor/EditorManager.js +++ b/src/editor/EditorManager.js @@ -612,13 +612,13 @@ define(function (require, exports, module) { } } _previousCustomViewer = _currentCustomViewer; - _currentCustomViewer = null; + _currentCustomViewer = null; } /** append custom view to editor-holder - * @param {?JQuery} $customView DOM node representing UI of custom view - * @param {?string} fullPath path to the file displayed in the custom view - */ + * @param {!JQuery} $customView DOM node representing UI of custom view + * @param {!string} fullPath path to the file displayed in the custom view + */ function showCustomViewer($customView, fullPath) { var mode = LanguageManager.getLanguageForPath(fullPath); diff --git a/src/editor/ImageViewer.js b/src/editor/ImageViewer.js index 15fd0314ba5..21530087e69 100644 --- a/src/editor/ImageViewer.js +++ b/src/editor/ImageViewer.js @@ -38,7 +38,9 @@ define(function (require, exports, module) { var _naturalWidth = 0; - /** Update the scale element, i.e. on resize */ + /** Update the scale element, i.e. on resize + * @param {!string} currentWidth actual width of image in view + */ function _updateScale(currentWidth) { if (currentWidth < _naturalWidth) { var scale = Math.floor(currentWidth / _naturalWidth * 100); @@ -55,12 +57,12 @@ define(function (require, exports, module) { } /** - * creates a DOM node to place in the editor-holder - * in order to display an image. - * @param {!string} fullPath path to image file - * @return {JQuery} - * - */ + * creates a DOM node to place in the editor-holder + * in order to display an image. + * @param {!string} fullPath path to image file + * @return {JQuery} + * + */ function getImageHolder(fullPath) { if (!fullPath) { return; @@ -75,9 +77,9 @@ define(function (require, exports, module) { } /** Perform decorations on the view that require loading the image in the browser, - * i.e. getting actual and natural width and height andplacing the scale sticker - * @param {?string} path to the image file - */ + * i.e. getting actual and natural width and height andplacing the scale sticker + * @param {!string} fullPath path to the image file + */ function render(fullPath) { // null check on the require param if (!fullPath) { diff --git a/src/utils/StringUtils.js b/src/utils/StringUtils.js index 8a03c63eeac..ce14945f48e 100644 --- a/src/utils/StringUtils.js +++ b/src/utils/StringUtils.js @@ -170,9 +170,9 @@ define(function (require, exports, module) { /** * Convert number of bytes into human readable format * - * @param number bytes Number of bytes to convert - * @param number precision Number of digits after the decimal separator - * @return string + * @param {!number} bytes - Number of bytes to convert + * @param {?number} precision - Number of digits after the decimal separator + * @return {string} */ function prettyPrintBytes(bytes, precision) { var kilobyte = 1024, @@ -185,19 +185,15 @@ define(function (require, exports, module) { } if ((bytes >= kilobyte) && (bytes < megabyte)) { return (bytes / kilobyte).toFixed(precision) + ' KB'; - } if ((bytes >= megabyte) && (bytes < gigabyte)) { return (bytes / megabyte).toFixed(precision) + ' MB'; - } if ((bytes >= gigabyte) && (bytes < terabyte)) { return (bytes / gigabyte).toFixed(precision) + ' GB'; - } if (bytes >= terabyte) { return (bytes / terabyte).toFixed(precision) + ' TB'; - } else { return bytes + ' B'; } diff --git a/test/spec/DocumentManager-test.js b/test/spec/DocumentManager-test.js index d57adbab3ca..2cde7803ccd 100644 --- a/test/spec/DocumentManager-test.js +++ b/test/spec/DocumentManager-test.js @@ -23,7 +23,7 @@ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define, $, describe, beforeEach, afterEach, it, runs, waits, waitsFor, expect, brackets, waitsForDone, waitsForFail, spyOn, beforeFirst, afterLast, jasmine */ +/*global define, $, describe, beforeEach, afterEach, it, runs, waits, waitsFor, expect, brackets, waitsForDone, spyOn, beforeFirst, afterLast, jasmine */ define(function (require, exports, module) { 'use strict'; @@ -170,7 +170,7 @@ define(function (require, exports, module) { }); runs(function () { spyOn(EditorManager, "clearCurrentlyViewedFile"); - DocumentManager.nullifyCurrentDocument(); + DocumentManager.clearCurrentDocument(); expect(EditorManager.clearCurrentlyViewedFile).toHaveBeenCalled(); }); diff --git a/test/spec/StringUtils-test.js b/test/spec/StringUtils-test.js index 8962e2a4e7d..3950fe01a57 100644 --- a/test/spec/StringUtils-test.js +++ b/test/spec/StringUtils-test.js @@ -23,7 +23,7 @@ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define: false, require: false, describe: false, it: false, xit: false, expect: false, beforeEach: false, afterEach: false, waitsFor: false, runs: false, jasmine: false */ +/*global define, describe, it, expect */ define(function (require, exports, module) { 'use strict'; From 281ba29f2460fea1c3ab02e85fa4fb1946b4b12a Mon Sep 17 00:00:00 2001 From: Jochen Hagenstroem Date: Thu, 17 Oct 2013 18:06:45 -0700 Subject: [PATCH 0228/1140] fix test case - per @RamondLim. Thanks for the extra pointer. --- test/spec/DocumentManager-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/spec/DocumentManager-test.js b/test/spec/DocumentManager-test.js index 2cde7803ccd..e61d2f2bea2 100644 --- a/test/spec/DocumentManager-test.js +++ b/test/spec/DocumentManager-test.js @@ -187,7 +187,7 @@ define(function (require, exports, module) { }); runs(function () { expect(DocumentManager.getCurrentDocument()).not.toBe(null); - DocumentManager.nullifyCurrentDocument(); + DocumentManager.clearCurrentDocument(); expect(DocumentManager.getCurrentDocument()).toBe(null); }); From 23e2f4319e27e1ed806492562a535d776a0b997a Mon Sep 17 00:00:00 2001 From: wALF Utility Date: Thu, 17 Oct 2013 20:24:02 -0700 Subject: [PATCH 0229/1140] Updated by ALF automation. --- src/nls/fr/strings.js | 7 +++++++ src/nls/ja/strings.js | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js index 8e1e088753a..6ab91ebf3f9 100644 --- a/src/nls/fr/strings.js +++ b/src/nls/fr/strings.js @@ -333,6 +333,9 @@ define({ "BASEURL_ERROR_INVALID_CHAR": "Les caractères spéciaux tels que '{0}' doivent être codés en %.", "BASEURL_ERROR_UNKNOWN_ERROR": "Erreur inconnue lors de l’analyse de l’URL de base", + // CSS Quick Edit + "BUTTON_NEW_RULE": "Nouvelle règle", + // Extension Management strings "INSTALL": "Installer", "UPDATE": "Mettre à jour", @@ -410,6 +413,10 @@ define({ "EXTENSIONS_AVAILABLE_TITLE": "Disponibles", "EXTENSIONS_UPDATES_TITLE": "Mises à jour", + "INLINE_EDITOR_NO_MATCHES": "[7308180] !é=No matches available.=!", + "CSS_QUICK_EDIT_NO_MATCHES": "[7308178] !é=There are no existing CSS rules that match your selection.
    Click \"New Rule\" to create one.=!", + "CSS_QUICK_EDIT_NO_STYLESHEETS": "[7308179] !é=There are no stylesheets in your project.
    Create one to add CSS rules.=!", + /** * Unit names */ diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js index 419358c787b..66e333ae824 100644 --- a/src/nls/ja/strings.js +++ b/src/nls/ja/strings.js @@ -333,6 +333,9 @@ define({ "BASEURL_ERROR_INVALID_CHAR": "「{0}」のような特殊文字は、パーセントエンコーディングする必要があります。", "BASEURL_ERROR_UNKNOWN_ERROR": "ベース URL の解析中に不明なエラーが発生しました", + // CSS Quick Edit + "BUTTON_NEW_RULE": "新規ルール", + // Extension Management strings "INSTALL": "インストール", "UPDATE": "更新", @@ -410,6 +413,10 @@ define({ "EXTENSIONS_AVAILABLE_TITLE": "入手可能", "EXTENSIONS_UPDATES_TITLE": "アップデート", + "INLINE_EDITOR_NO_MATCHES": "!能=[7308180] No matches available._=!", + "CSS_QUICK_EDIT_NO_MATCHES": "!能=[7308178] There are no existing CSS rules that match your selection.
    Click \"New Rule\" to create one._=!", + "CSS_QUICK_EDIT_NO_STYLESHEETS": "!能=[7308179] There are no stylesheets in your project.
    Create one to add CSS rules._=!", + /** * Unit names */ From b167c9eca9f30d77be4cd7b503975b7ef5f2aece Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Fri, 18 Oct 2013 08:15:25 -0400 Subject: [PATCH 0230/1140] Remove unneeded Request tests --- .../request/tests/googledoodle.jpg | Bin 38510 -> 0 bytes .../node/node_modules/request/tests/run.js | 40 ---- .../node/node_modules/request/tests/server.js | 90 -------- .../node_modules/request/tests/squid.conf | 77 ------- .../node_modules/request/tests/ssl/ca/ca.cnf | 20 -- .../node_modules/request/tests/ssl/ca/ca.crl | 0 .../node_modules/request/tests/ssl/ca/ca.crt | 17 -- .../node_modules/request/tests/ssl/ca/ca.csr | 13 -- .../node_modules/request/tests/ssl/ca/ca.key | 18 -- .../node_modules/request/tests/ssl/ca/ca.srl | 1 - .../request/tests/ssl/ca/server.cnf | 19 -- .../request/tests/ssl/ca/server.crt | 16 -- .../request/tests/ssl/ca/server.csr | 11 - .../request/tests/ssl/ca/server.js | 28 --- .../request/tests/ssl/ca/server.key | 9 - .../node_modules/request/tests/ssl/npm-ca.crt | 16 -- .../node_modules/request/tests/ssl/test.crt | 15 -- .../node_modules/request/tests/ssl/test.key | 15 -- .../request/tests/test-agentOptions.js | 23 -- .../request/tests/test-basic-auth.js | 163 ------------- .../node_modules/request/tests/test-body.js | 122 ---------- .../request/tests/test-defaults.js | 129 ----------- .../request/tests/test-digest-auth.js | 69 ------ .../request/tests/test-emptyBody.js | 20 -- .../node_modules/request/tests/test-errors.js | 37 --- .../request/tests/test-follow-all-303.js | 30 --- .../request/tests/test-follow-all.js | 36 --- .../node_modules/request/tests/test-form.js | 79 ------- .../node_modules/request/tests/test-hawk.js | 33 --- .../request/tests/test-headers.js | 52 ----- .../request/tests/test-http-signature.js | 106 --------- .../request/tests/test-httpModule.js | 94 -------- .../request/tests/test-https-strict.js | 97 -------- .../node_modules/request/tests/test-https.js | 87 ------- .../node_modules/request/tests/test-isUrl.js | 28 --- .../request/tests/test-localAddress.js | 15 -- .../node_modules/request/tests/test-oauth.js | 117 ---------- .../request/tests/test-onelineproxy.js | 46 ---- .../node_modules/request/tests/test-params.js | 93 -------- .../request/tests/test-piped-redirect.js | 42 ---- .../node_modules/request/tests/test-pipes.js | 216 ------------------ .../node_modules/request/tests/test-pool.js | 16 -- .../tests/test-protocol-changing-redirect.js | 61 ----- .../node_modules/request/tests/test-proxy.js | 39 ---- .../node_modules/request/tests/test-qs.js | 42 ---- .../request/tests/test-redirect.js | 155 ------------- .../node_modules/request/tests/test-s3.js | 13 -- .../request/tests/test-timeout.js | 87 ------- .../node_modules/request/tests/test-toJSON.js | 14 -- .../node_modules/request/tests/test-tunnel.js | 75 ------ .../node_modules/request/tests/unicycle.jpg | Bin 19806 -> 0 bytes 51 files changed, 2641 deletions(-) delete mode 100644 src/extensibility/node/node_modules/request/tests/googledoodle.jpg delete mode 100644 src/extensibility/node/node_modules/request/tests/run.js delete mode 100644 src/extensibility/node/node_modules/request/tests/server.js delete mode 100644 src/extensibility/node/node_modules/request/tests/squid.conf delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/ca.cnf delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/ca.crl delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/ca.crt delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/ca.csr delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/ca.key delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/ca.srl delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/server.cnf delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/server.crt delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/server.csr delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/server.js delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/ca/server.key delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/npm-ca.crt delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/test.crt delete mode 100644 src/extensibility/node/node_modules/request/tests/ssl/test.key delete mode 100644 src/extensibility/node/node_modules/request/tests/test-agentOptions.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-basic-auth.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-body.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-defaults.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-digest-auth.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-emptyBody.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-errors.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-follow-all-303.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-follow-all.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-form.js delete mode 100755 src/extensibility/node/node_modules/request/tests/test-hawk.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-headers.js delete mode 100755 src/extensibility/node/node_modules/request/tests/test-http-signature.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-httpModule.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-https-strict.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-https.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-isUrl.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-localAddress.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-oauth.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-onelineproxy.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-params.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-piped-redirect.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-pipes.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-pool.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-protocol-changing-redirect.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-proxy.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-qs.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-redirect.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-s3.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-timeout.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-toJSON.js delete mode 100644 src/extensibility/node/node_modules/request/tests/test-tunnel.js delete mode 100644 src/extensibility/node/node_modules/request/tests/unicycle.jpg diff --git a/src/extensibility/node/node_modules/request/tests/googledoodle.jpg b/src/extensibility/node/node_modules/request/tests/googledoodle.jpg deleted file mode 100644 index f80c9c52d3c507996535a19ee0bcfe3821de322d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38510 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 diff --git a/src/extensibility/node/node_modules/request/tests/run.js b/src/extensibility/node/node_modules/request/tests/run.js deleted file mode 100644 index e717f02a31b..00000000000 --- a/src/extensibility/node/node_modules/request/tests/run.js +++ /dev/null @@ -1,40 +0,0 @@ -var spawn = require('child_process').spawn - , exitCode = 0 - , timeout = 10000 - , fs = require('fs') - ; - -fs.readdir(__dirname, function (e, files) { - if (e) throw e - - var tests = files.filter(function (f) {return f.slice(0, 'test-'.length) === 'test-'}) - - var next = function () { - if (tests.length === 0) process.exit(exitCode); - - var file = tests.shift() - console.log(file) - var proc = spawn('node', [ 'tests/' + file ]) - - var killed = false - var t = setTimeout(function () { - proc.kill() - exitCode += 1 - console.error(file + ' timeout') - killed = true - }, timeout) - - proc.stdout.pipe(process.stdout) - proc.stderr.pipe(process.stderr) - proc.on('exit', function (code) { - if (code && !killed) console.error(file + ' failed') - exitCode += code || 0 - clearTimeout(t) - next() - }) - } - next() - -}) - - diff --git a/src/extensibility/node/node_modules/request/tests/server.js b/src/extensibility/node/node_modules/request/tests/server.js deleted file mode 100644 index b6eacbadc05..00000000000 --- a/src/extensibility/node/node_modules/request/tests/server.js +++ /dev/null @@ -1,90 +0,0 @@ -var fs = require('fs') - , http = require('http') - , path = require('path') - , https = require('https') - , events = require('events') - , stream = require('stream') - , assert = require('assert') - ; - -exports.createServer = function (port) { - port = port || 6767 - var s = http.createServer(function (req, resp) { - s.emit(req.url, req, resp); - }) - s.port = port - s.url = 'http://localhost:'+port - return s; -} - -exports.createSSLServer = function(port, opts) { - port = port || 16767 - - var options = { 'key' : path.join(__dirname, 'ssl', 'test.key') - , 'cert': path.join(__dirname, 'ssl', 'test.crt') - } - if (opts) { - for (var i in opts) options[i] = opts[i] - } - - for (var i in options) { - options[i] = fs.readFileSync(options[i]) - } - - var s = https.createServer(options, function (req, resp) { - s.emit(req.url, req, resp); - }) - s.port = port - s.url = 'https://localhost:'+port - return s; -} - -exports.createPostStream = function (text) { - var postStream = new stream.Stream(); - postStream.writeable = true; - postStream.readable = true; - setTimeout(function () {postStream.emit('data', new Buffer(text)); postStream.emit('end')}, 0); - return postStream; -} -exports.createPostValidator = function (text, reqContentType) { - var l = function (req, resp) { - var r = ''; - req.on('data', function (chunk) {r += chunk}) - req.on('end', function () { - if (req.headers['content-type'] && req.headers['content-type'].indexOf('boundary=') >= 0) { - var boundary = req.headers['content-type'].split('boundary=')[1]; - text = text.replace(/__BOUNDARY__/g, boundary); - } - if (r !== text) console.log(r, text); - assert.equal(r, text) - if (reqContentType) { - assert.ok(req.headers['content-type']) - assert.ok(~req.headers['content-type'].indexOf(reqContentType)) - } - resp.writeHead(200, {'content-type':'text/plain'}) - resp.write('OK') - resp.end() - }) - } - return l; -} -exports.createGetResponse = function (text, contentType) { - var l = function (req, resp) { - contentType = contentType || 'text/plain' - resp.writeHead(200, {'content-type':contentType}) - resp.write(text) - resp.end() - } - return l; -} -exports.createChunkResponse = function (chunks, contentType) { - var l = function (req, resp) { - contentType = contentType || 'text/plain' - resp.writeHead(200, {'content-type':contentType}) - chunks.forEach(function (chunk) { - resp.write(chunk) - }) - resp.end() - } - return l; -} diff --git a/src/extensibility/node/node_modules/request/tests/squid.conf b/src/extensibility/node/node_modules/request/tests/squid.conf deleted file mode 100644 index 0d4a3b6fe7a..00000000000 --- a/src/extensibility/node/node_modules/request/tests/squid.conf +++ /dev/null @@ -1,77 +0,0 @@ -# -# Recommended minimum configuration: -# -acl manager proto cache_object -acl localhost src 127.0.0.1/32 ::1 -acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1 - -# Example rule allowing access from your local networks. -# Adapt to list your (internal) IP networks from where browsing -# should be allowed -acl localnet src 10.0.0.0/8 # RFC1918 possible internal network -acl localnet src 172.16.0.0/12 # RFC1918 possible internal network -acl localnet src 192.168.0.0/16 # RFC1918 possible internal network -acl localnet src fc00::/7 # RFC 4193 local private network range -acl localnet src fe80::/10 # RFC 4291 link-local (directly plugged) machines - -acl SSL_ports port 443 -acl Safe_ports port 80 # http -acl Safe_ports port 21 # ftp -acl Safe_ports port 443 # https -acl Safe_ports port 70 # gopher -acl Safe_ports port 210 # wais -acl Safe_ports port 1025-65535 # unregistered ports -acl Safe_ports port 280 # http-mgmt -acl Safe_ports port 488 # gss-http -acl Safe_ports port 591 # filemaker -acl Safe_ports port 777 # multiling http -acl CONNECT method CONNECT - -# -# Recommended minimum Access Permission configuration: -# -# Only allow cachemgr access from localhost -http_access allow manager localhost -http_access deny manager - -# Deny requests to certain unsafe ports -http_access deny !Safe_ports - -# Deny CONNECT to other than secure SSL ports -#http_access deny CONNECT !SSL_ports - -# We strongly recommend the following be uncommented to protect innocent -# web applications running on the proxy server who think the only -# one who can access services on "localhost" is a local user -#http_access deny to_localhost - -# -# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS -# - -# Example rule allowing access from your local networks. -# Adapt localnet in the ACL section to list your (internal) IP networks -# from where browsing should be allowed -http_access allow localnet -http_access allow localhost - -# And finally deny all other access to this proxy -http_access deny all - -# Squid normally listens to port 3128 -http_port 3128 - -# We recommend you to use at least the following line. -hierarchy_stoplist cgi-bin ? - -# Uncomment and adjust the following to add a disk cache directory. -#cache_dir ufs /usr/local/var/cache 100 16 256 - -# Leave coredumps in the first cache dir -coredump_dir /usr/local/var/cache - -# Add any of your own refresh_pattern entries above these. -refresh_pattern ^ftp: 1440 20% 10080 -refresh_pattern ^gopher: 1440 0% 1440 -refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 -refresh_pattern . 0 20% 4320 diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.cnf b/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.cnf deleted file mode 100644 index 425a889156b..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.cnf +++ /dev/null @@ -1,20 +0,0 @@ -[ req ] -default_bits = 1024 -days = 3650 -distinguished_name = req_distinguished_name -attributes = req_attributes -prompt = no -output_password = password - -[ req_distinguished_name ] -C = US -ST = CA -L = Oakland -O = request -OU = request Certificate Authority -CN = requestCA -emailAddress = mikeal@mikealrogers.com - -[ req_attributes ] -challengePassword = password challenge - diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.crl b/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.crl deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.crt b/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.crt deleted file mode 100644 index b4524e44baa..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.crt +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICvTCCAiYCCQDn+P/MSbDsWjANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC -VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1 -ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG -A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n -ZXJzLmNvbTAeFw0xMjAzMDEyMjUwNTZaFw0yMjAyMjcyMjUwNTZaMIGiMQswCQYD -VQQGEwJVUzELMAkGA1UECBMCQ0ExEDAOBgNVBAcTB09ha2xhbmQxEDAOBgNVBAoT -B3JlcXVlc3QxJjAkBgNVBAsTHXJlcXVlc3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5 -MRIwEAYDVQQDEwlyZXF1ZXN0Q0ExJjAkBgkqhkiG9w0BCQEWF21pa2VhbEBtaWtl -YWxyb2dlcnMuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7t9pQUAK4 -5XJYTI6NrF0n3G2HZsfN+rPYSVzzL8SuVyb1tHXos+vbPm3NKI4E8X1yVAXU8CjJ -5SqXnp4DAypAhaseho81cbhk7LXUhFz78OvAa+OD+xTAEAnNQ8tGUr4VGyplEjfD -xsBVuqV2j8GPNTftr+drOCFlqfAgMrBn4wIDAQABMA0GCSqGSIb3DQEBBQUAA4GB -ADVdTlVAL45R+PACNS7Gs4o81CwSclukBu4FJbxrkd4xGQmurgfRrYYKjtqiopQm -D7ysRamS3HMN9/VKq2T7r3z1PMHPAy7zM4uoXbbaTKwlnX4j/8pGPn8Ca3qHXYlo -88L/OOPc6Di7i7qckS3HFbXQCTiULtxWmy97oEuTwrAj ------END CERTIFICATE----- diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.csr b/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.csr deleted file mode 100644 index e48c56eefee..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.csr +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICBjCCAW8CAQAwgaIxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEQMA4GA1UE -BxMHT2FrbGFuZDEQMA4GA1UEChMHcmVxdWVzdDEmMCQGA1UECxMdcmVxdWVzdCBD -ZXJ0aWZpY2F0ZSBBdXRob3JpdHkxEjAQBgNVBAMTCXJlcXVlc3RDQTEmMCQGCSqG -SIb3DQEJARYXbWlrZWFsQG1pa2VhbHJvZ2Vycy5jb20wgZ8wDQYJKoZIhvcNAQEB -BQADgY0AMIGJAoGBALu32lBQArjlclhMjo2sXSfcbYdmx836s9hJXPMvxK5XJvW0 -deiz69s+bc0ojgTxfXJUBdTwKMnlKpeengMDKkCFqx6GjzVxuGTstdSEXPvw68Br -44P7FMAQCc1Dy0ZSvhUbKmUSN8PGwFW6pXaPwY81N+2v52s4IWWp8CAysGfjAgMB -AAGgIzAhBgkqhkiG9w0BCQcxFBMScGFzc3dvcmQgY2hhbGxlbmdlMA0GCSqGSIb3 -DQEBBQUAA4GBAGJO7grHeVHXetjHEK8urIxdnvfB2qeZeObz4GPKIkqUurjr0rfj -bA3EK1kDMR5aeQWR8RunixdM16Q6Ry0lEdLVWkdSwRN9dmirIHT9cypqnD/FYOia -SdezZ0lUzXgmJIwRYRwB1KSMMocIf52ll/xC2bEGg7/ZAEuAyAgcZV3X ------END CERTIFICATE REQUEST----- diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.key b/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.key deleted file mode 100644 index a53e7f75d66..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.key +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,C8B5887048377F02 - -nyD5ZH0Wup2uWsDvurq5mKDaDrf8lvNn9w0SH/ZkVnfR1/bkwqrFriqJWvZNUG+q -nS0iBYczsWLJnbub9a1zLOTENWUKVD5uqbC3aGHhnoUTNSa27DONgP8gHOn6JgR+ -GAKo01HCSTiVT4LjkwN337QKHnMP2fTzg+IoC/CigvMcq09hRLwU1/guq0GJKGwH -gTxYNuYmQC4Tjh8vdS4liF+Ve/P3qPR2CehZrIOkDT8PHJBGQJRo4xGUIB7Tpk38 -VCk+UZ0JCS2coY8VkY/9tqFJp/ZnnQQVmaNbdRqg7ECKL+bXnNo7yjzmazPZmPe3 -/ShbE0+CTt7LrjCaQAxWbeDzqfo1lQfgN1LulTm8MCXpQaJpv7v1VhIhQ7afjMYb -4thW/ypHPiYS2YJCAkAVlua9Oxzzh1qJoh8Df19iHtpd79Q77X/qf+1JvITlMu0U -gi7yEatmQcmYNws1mtTC1q2DXrO90c+NZ0LK/Alse6NRL/xiUdjug2iHeTf/idOR -Gg/5dSZbnnlj1E5zjSMDkzg6EHAFmHV4jYGSAFLEQgp4V3ZhMVoWZrvvSHgKV/Qh -FqrAK4INr1G2+/QTd09AIRzfy3/j6yD4A9iNaOsEf9Ua7Qh6RcALRCAZTWR5QtEf -dX+iSNJ4E85qXs0PqwkMDkoaxIJ+tmIRJY7y8oeylV8cfGAi8Soubt/i3SlR8IHC -uDMas/2OnwafK3N7ODeE1i7r7wkzQkSHaEz0TrF8XRnP25jAICCSLiMdAAjKfxVb -EvzsFSuAy3Jt6bU3hSLY9o4YVYKE+68ITMv9yNjvTsEiW+T+IbN34w== ------END RSA PRIVATE KEY----- diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.srl b/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.srl deleted file mode 100644 index 17128db3ac4..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/ca.srl +++ /dev/null @@ -1 +0,0 @@ -ADF62016AA40C9C3 diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.cnf b/src/extensibility/node/node_modules/request/tests/ssl/ca/server.cnf deleted file mode 100644 index cd1fd1e396b..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.cnf +++ /dev/null @@ -1,19 +0,0 @@ -[ req ] -default_bits = 1024 -days = 3650 -distinguished_name = req_distinguished_name -attributes = req_attributes -prompt = no - -[ req_distinguished_name ] -C = US -ST = CA -L = Oakland -O = request -OU = testing -CN = testing.request.mikealrogers.com -emailAddress = mikeal@mikealrogers.com - -[ req_attributes ] -challengePassword = password challenge - diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.crt b/src/extensibility/node/node_modules/request/tests/ssl/ca/server.crt deleted file mode 100644 index efe96cefc3a..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.crt +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICejCCAeMCCQCt9iAWqkDJwzANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC -VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1 -ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG -A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n -ZXJzLmNvbTAeFw0xMjAzMDEyMjUwNTZaFw0yMjAyMjcyMjUwNTZaMIGjMQswCQYD -VQQGEwJVUzELMAkGA1UECBMCQ0ExEDAOBgNVBAcTB09ha2xhbmQxEDAOBgNVBAoT -B3JlcXVlc3QxEDAOBgNVBAsTB3Rlc3RpbmcxKTAnBgNVBAMTIHRlc3RpbmcucmVx -dWVzdC5taWtlYWxyb2dlcnMuY29tMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlr -ZWFscm9nZXJzLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDgVl0jMumvOpmM -20W5v9yhGgZj8hPhEQF/N7yCBVBn/rWGYm70IHC8T/pR5c0LkWc5gdnCJEvKWQjh -DBKxZD8FAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABShRkNgFbgs4vUWW9R9deNJj -7HJoiTmvkmoOC7QzcYkjdgHbOxsSq3rBnwxsVjY9PAtPwBn0GRspOeG7KzKRgySB -kb22LyrCFKbEOfKO/+CJc80ioK9zEPVjGsFMyAB+ftYRqM+s/4cQlTg/m89l01wC -yapjN3RxZbInGhWR+jA= ------END CERTIFICATE----- diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.csr b/src/extensibility/node/node_modules/request/tests/ssl/ca/server.csr deleted file mode 100644 index a8e7595a561..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.csr +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIBgjCCASwCAQAwgaMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEQMA4GA1UE -BxMHT2FrbGFuZDEQMA4GA1UEChMHcmVxdWVzdDEQMA4GA1UECxMHdGVzdGluZzEp -MCcGA1UEAxMgdGVzdGluZy5yZXF1ZXN0Lm1pa2VhbHJvZ2Vycy5jb20xJjAkBgkq -hkiG9w0BCQEWF21pa2VhbEBtaWtlYWxyb2dlcnMuY29tMFwwDQYJKoZIhvcNAQEB -BQADSwAwSAJBAOBWXSMy6a86mYzbRbm/3KEaBmPyE+ERAX83vIIFUGf+tYZibvQg -cLxP+lHlzQuRZzmB2cIkS8pZCOEMErFkPwUCAwEAAaAjMCEGCSqGSIb3DQEJBzEU -ExJwYXNzd29yZCBjaGFsbGVuZ2UwDQYJKoZIhvcNAQEFBQADQQBD3E5WekQzCEJw -7yOcqvtPYIxGaX8gRKkYfLPoj3pm3GF5SGqtJKhylKfi89szHXgktnQgzff9FN+A -HidVJ/3u ------END CERTIFICATE REQUEST----- diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.js b/src/extensibility/node/node_modules/request/tests/ssl/ca/server.js deleted file mode 100644 index 05e21c1162c..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.js +++ /dev/null @@ -1,28 +0,0 @@ -var fs = require("fs") -var https = require("https") -var options = { key: fs.readFileSync("./server.key") - , cert: fs.readFileSync("./server.crt") } - -var server = https.createServer(options, function (req, res) { - res.writeHead(200) - res.end() - server.close() -}) -server.listen(1337) - -var ca = fs.readFileSync("./ca.crt") -var agent = new https.Agent({ host: "localhost", port: 1337, ca: ca }) - -https.request({ host: "localhost" - , method: "HEAD" - , port: 1337 - , headers: { host: "testing.request.mikealrogers.com" } - , agent: agent - , ca: [ ca ] - , path: "/" }, function (res) { - if (res.client.authorized) { - console.log("node test: OK") - } else { - throw new Error(res.client.authorizationError) - } -}).end() diff --git a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.key b/src/extensibility/node/node_modules/request/tests/ssl/ca/server.key deleted file mode 100644 index 72d86984f18..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/ca/server.key +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIBOwIBAAJBAOBWXSMy6a86mYzbRbm/3KEaBmPyE+ERAX83vIIFUGf+tYZibvQg -cLxP+lHlzQuRZzmB2cIkS8pZCOEMErFkPwUCAwEAAQJAK+r8ZM2sze8s7FRo/ApB -iRBtO9fCaIdJwbwJnXKo4RKwZDt1l2mm+fzZ+/QaQNjY1oTROkIIXmnwRvZWfYlW -gQIhAPKYsG+YSBN9o8Sdp1DMyZ/rUifKX3OE6q9tINkgajDVAiEA7Ltqh01+cnt0 -JEnud/8HHcuehUBLMofeg0G+gCnSbXECIQCqDvkXsWNNLnS/3lgsnvH0Baz4sbeJ -rjIpuVEeg8eM5QIgbu0+9JmOV6ybdmmiMV4yAncoF35R/iKGVHDZCAsQzDECIQDZ -0jGz22tlo5YMcYSqrdD3U4sds1pwiAaWFRbCunoUJw== ------END RSA PRIVATE KEY----- diff --git a/src/extensibility/node/node_modules/request/tests/ssl/npm-ca.crt b/src/extensibility/node/node_modules/request/tests/ssl/npm-ca.crt deleted file mode 100644 index fde2fe933d8..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/npm-ca.crt +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIChzCCAfACCQDauvz/KHp8ejANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC -VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMQwwCgYDVQQKEwNucG0x -IjAgBgNVBAsTGW5wbSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxDjAMBgNVBAMTBW5w -bUNBMRcwFQYJKoZIhvcNAQkBFghpQGl6cy5tZTAeFw0xMTA5MDUwMTQ3MTdaFw0y -MTA5MDIwMTQ3MTdaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExEDAOBgNV -BAcTB09ha2xhbmQxDDAKBgNVBAoTA25wbTEiMCAGA1UECxMZbnBtIENlcnRpZmlj -YXRlIEF1dGhvcml0eTEOMAwGA1UEAxMFbnBtQ0ExFzAVBgkqhkiG9w0BCQEWCGlA -aXpzLm1lMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLI4tIqPpRW+ACw9GE -OgBlJZwK5f8nnKCLK629Pv5yJpQKs3DENExAyOgDcyaF0HD0zk8zTp+ZsLaNdKOz -Gn2U181KGprGKAXP6DU6ByOJDWmTlY6+Ad1laYT0m64fERSpHw/hjD3D+iX4aMOl -y0HdbT5m1ZGh6SJz3ZqxavhHLQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAC4ySDbC -l7W1WpLmtLGEQ/yuMLUf6Jy/vr+CRp4h+UzL+IQpCv8FfxsYE7dhf/bmWTEupBkv -yNL18lipt2jSvR3v6oAHAReotvdjqhxddpe5Holns6EQd1/xEZ7sB1YhQKJtvUrl -ZNufy1Jf1r0ldEGeA+0ISck7s+xSh9rQD2Op ------END CERTIFICATE----- diff --git a/src/extensibility/node/node_modules/request/tests/ssl/test.crt b/src/extensibility/node/node_modules/request/tests/ssl/test.crt deleted file mode 100644 index b357f8641f3..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/test.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQzCCAawCCQCO/XWtRFck1jANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJU -SDEQMA4GA1UECBMHQmFuZ2tvazEOMAwGA1UEBxMFU2lsb20xGzAZBgNVBAoTElRo -ZSBSZXF1ZXN0IE1vZHVsZTEYMBYGA1UEAxMPcmVxdWVzdC5leGFtcGxlMB4XDTEx -MTIwMzAyMjkyM1oXDTIxMTEzMDAyMjkyM1owZjELMAkGA1UEBhMCVEgxEDAOBgNV -BAgTB0Jhbmdrb2sxDjAMBgNVBAcTBVNpbG9tMRswGQYDVQQKExJUaGUgUmVxdWVz -dCBNb2R1bGUxGDAWBgNVBAMTD3JlcXVlc3QuZXhhbXBsZTCBnzANBgkqhkiG9w0B -AQEFAAOBjQAwgYkCgYEAwmctddZqlA48+NXs0yOy92DijcQV1jf87zMiYAIlNUto -wghVbTWgJU5r0pdKrD16AptnWJTzKanhItEX8XCCPgsNkq1afgTtJP7rNkwu3xcj -eIMkhJg/ay4ZnkbnhYdsii5VTU5prix6AqWRAhbkBgoA+iVyHyof8wvZyKBoFTMC -AwEAATANBgkqhkiG9w0BAQUFAAOBgQB6BybMJbpeiABgihDfEVBcAjDoQ8gUMgwV -l4NulugfKTDmArqnR9aPd4ET5jX5dkMP4bwCHYsvrcYDeWEQy7x5WWuylOdKhua4 -L4cEi2uDCjqEErIG3cc1MCOk6Cl6Ld6tkIzQSf953qfdEACRytOeUqLNQcrXrqeE -c7U8F6MWLQ== ------END CERTIFICATE----- diff --git a/src/extensibility/node/node_modules/request/tests/ssl/test.key b/src/extensibility/node/node_modules/request/tests/ssl/test.key deleted file mode 100644 index b85810dda8b..00000000000 --- a/src/extensibility/node/node_modules/request/tests/ssl/test.key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDCZy111mqUDjz41ezTI7L3YOKNxBXWN/zvMyJgAiU1S2jCCFVt -NaAlTmvSl0qsPXoCm2dYlPMpqeEi0RfxcII+Cw2SrVp+BO0k/us2TC7fFyN4gySE -mD9rLhmeRueFh2yKLlVNTmmuLHoCpZECFuQGCgD6JXIfKh/zC9nIoGgVMwIDAQAB -AoGBALXFwfUf8vHTSmGlrdZS2AGFPvEtuvldyoxi9K5u8xmdFCvxnOcLsF2RsTHt -Mu5QYWhUpNJoG+IGLTPf7RJdj/kNtEs7xXqWy4jR36kt5z5MJzqiK+QIgiO9UFWZ -fjUb6oeDnTIJA9YFBdYi97MDuL89iU/UK3LkJN3hd4rciSbpAkEA+MCkowF5kSFb -rkOTBYBXZfiAG78itDXN6DXmqb9XYY+YBh3BiQM28oxCeQYyFy6pk/nstnd4TXk6 -V/ryA2g5NwJBAMgRKTY9KvxJWbESeMEFe2iBIV0c26/72Amgi7ZKUCLukLfD4tLF -+WSZdmTbbqI1079YtwaiOVfiLm45Q/3B0eUCQAaQ/0eWSGE+Yi8tdXoVszjr4GXb -G81qBi91DMu6U1It+jNfIba+MPsiHLcZJMVb4/oWBNukN7bD1nhwFWdlnu0CQQCf -Is9WHkdvz2RxbZDxb8verz/7kXXJQJhx5+rZf7jIYFxqX3yvTNv3wf2jcctJaWlZ -fVZwB193YSivcgt778xlAkEAprYUz3jczjF5r2hrgbizPzPDR94tM5BTO3ki2v3w -kbf+j2g7FNAx6kZiVN8XwfLc8xEeUGiPKwtq3ddPDFh17w== ------END RSA PRIVATE KEY----- diff --git a/src/extensibility/node/node_modules/request/tests/test-agentOptions.js b/src/extensibility/node/node_modules/request/tests/test-agentOptions.js deleted file mode 100644 index 47fe3aaed60..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-agentOptions.js +++ /dev/null @@ -1,23 +0,0 @@ -var request = require('../index') - , http = require('http') - , server = require('./server') - , assert = require('assert') - ; - -var s = http.createServer(function (req, resp) { - resp.statusCode = 200 - resp.end('') -}).listen(6767, function () { - // requests without agentOptions should use global agent - var r = request('http://localhost:6767', function (e, resp, body) { - assert.deepEqual(r.agent, http.globalAgent); - assert.equal(Object.keys(r.pool).length, 0); - - // requests with agentOptions should apply agentOptions to new agent in pool - var r2 = request('http://localhost:6767', { agentOptions: { foo: 'bar' } }, function (e, resp, body) { - assert.deepEqual(r2.agent.options, { foo: 'bar' }); - assert.equal(Object.keys(r2.pool).length, 1); - s.close() - }); - }) -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-basic-auth.js b/src/extensibility/node/node_modules/request/tests/test-basic-auth.js deleted file mode 100644 index 7cf1d6d8206..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-basic-auth.js +++ /dev/null @@ -1,163 +0,0 @@ -var assert = require('assert') - , http = require('http') - , request = require('../index') - ; - -var numBasicRequests = 0; - -var basicServer = http.createServer(function (req, res) { - console.error('Basic auth server: ', req.method, req.url); - numBasicRequests++; - - var ok; - - if (req.headers.authorization) { - if (req.headers.authorization == 'Basic ' + new Buffer('test:testing2').toString('base64')) { - ok = true; - } else if ( req.headers.authorization == 'Basic ' + new Buffer(':apassword').toString('base64')) { - ok = true; - } else if ( req.headers.authorization == 'Basic ' + new Buffer('justauser').toString('base64')) { - ok = true; - } else { - // Bad auth header, don't send back WWW-Authenticate header - ok = false; - } - } else { - // No auth header, send back WWW-Authenticate header - ok = false; - res.setHeader('www-authenticate', 'Basic realm="Private"'); - } - - if (req.url == '/post/') { - var expectedContent = 'data_key=data_value'; - req.on('data', function(data) { - assert.equal(data, expectedContent); - console.log('received request data: ' + data); - }); - assert.equal(req.method, 'POST'); - assert.equal(req.headers['content-length'], '' + expectedContent.length); - assert.equal(req.headers['content-type'], 'application/x-www-form-urlencoded; charset=utf-8'); - } - - if (ok) { - console.log('request ok'); - res.end('ok'); - } else { - console.log('status=401'); - res.statusCode = 401; - res.end('401'); - } -}); - -basicServer.listen(6767); - -var tests = [ - function(next) { - request({ - 'method': 'GET', - 'uri': 'http://localhost:6767/test/', - 'auth': { - 'user': 'test', - 'pass': 'testing2', - 'sendImmediately': false - } - }, function(error, res, body) { - assert.equal(res.statusCode, 200); - assert.equal(numBasicRequests, 2); - next(); - }); - }, - - function(next) { - // If we don't set sendImmediately = false, request will send basic auth - request({ - 'method': 'GET', - 'uri': 'http://localhost:6767/test2/', - 'auth': { - 'user': 'test', - 'pass': 'testing2' - } - }, function(error, res, body) { - assert.equal(res.statusCode, 200); - assert.equal(numBasicRequests, 3); - next(); - }); - }, - - function(next) { - request({ - 'method': 'GET', - 'uri': 'http://test:testing2@localhost:6767/test2/' - }, function(error, res, body) { - assert.equal(res.statusCode, 200); - assert.equal(numBasicRequests, 4); - next(); - }); - }, - - function(next) { - request({ - 'method': 'POST', - 'form': { 'data_key': 'data_value' }, - 'uri': 'http://localhost:6767/post/', - 'auth': { - 'user': 'test', - 'pass': 'testing2', - 'sendImmediately': false - } - }, function(error, res, body) { - assert.equal(res.statusCode, 200); - assert.equal(numBasicRequests, 6); - next(); - }); - }, - - function(next) { - assert.doesNotThrow( function() { - request({ - 'method': 'GET', - 'uri': 'http://localhost:6767/allow_empty_user/', - 'auth': { - 'user': '', - 'pass': 'apassword', - 'sendImmediately': false - } - }, function(error, res, body ) { - assert.equal(res.statusCode, 200); - assert.equal(numBasicRequests, 8); - next(); - }); - }) - }, - - function(next) { - assert.doesNotThrow( function() { - request({ - 'method': 'GET', - 'uri': 'http://localhost:6767/allow_undefined_password/', - 'auth': { - 'user': 'justauser', - 'pass': undefined, - 'sendImmediately': false - } - }, function(error, res, body ) { - assert.equal(res.statusCode, 200); - assert.equal(numBasicRequests, 10); - next(); - }); - }) - } -]; - -function runTest(i) { - if (i < tests.length) { - tests[i](function() { - runTest(i + 1); - }); - } else { - console.log('All tests passed'); - basicServer.close(); - } -} - -runTest(0); diff --git a/src/extensibility/node/node_modules/request/tests/test-body.js b/src/extensibility/node/node_modules/request/tests/test-body.js deleted file mode 100644 index 186de123f6f..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-body.js +++ /dev/null @@ -1,122 +0,0 @@ -var server = require('./server') - , events = require('events') - , stream = require('stream') - , assert = require('assert') - , request = require('../index') - ; - -var s = server.createServer(); - -var tests = - { testGet : - { resp : server.createGetResponse("TESTING!") - , expectBody: "TESTING!" - } - , testGetChunkBreak : - { resp : server.createChunkResponse( - [ new Buffer([239]) - , new Buffer([163]) - , new Buffer([191]) - , new Buffer([206]) - , new Buffer([169]) - , new Buffer([226]) - , new Buffer([152]) - , new Buffer([131]) - ]) - , expectBody: "Ω☃" - } - , testGetBuffer : - { resp : server.createGetResponse(new Buffer("TESTING!")) - , encoding: null - , expectBody: new Buffer("TESTING!") - } - , testGetEncoding : - { resp : server.createGetResponse(new Buffer('efa3bfcea9e29883', 'hex')) - , encoding: 'hex' - , expectBody: "efa3bfcea9e29883" - } - , testGetUTF8: - { resp: server.createGetResponse(new Buffer([0xEF, 0xBB, 0xBF, 226, 152, 131])) - , encoding: "utf8" - , expectBody: "☃" - } - , testGetJSON : - { resp : server.createGetResponse('{"test":true}', 'application/json') - , json : true - , expectBody: {"test":true} - } - , testPutString : - { resp : server.createPostValidator("PUTTINGDATA") - , method : "PUT" - , body : "PUTTINGDATA" - } - , testPutBuffer : - { resp : server.createPostValidator("PUTTINGDATA") - , method : "PUT" - , body : new Buffer("PUTTINGDATA") - } - , testPutJSON : - { resp : server.createPostValidator(JSON.stringify({foo: 'bar'})) - , method: "PUT" - , json: {foo: 'bar'} - } - , testPutMultipart : - { resp: server.createPostValidator( - '--__BOUNDARY__\r\n' + - 'content-type: text/html\r\n' + - '\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__\r\n\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__--' - ) - , method: "PUT" - , multipart: - [ {'content-type': 'text/html', 'body': 'Oh hi.'} - , {'body': 'Oh hi.'} - ] - } - , testPutMultipartPreambleCRLF : - { resp: server.createPostValidator( - '\r\n--__BOUNDARY__\r\n' + - 'content-type: text/html\r\n' + - '\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__\r\n\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__--' - ) - , method: "PUT" - , preambleCRLF: true - , multipart: - [ {'content-type': 'text/html', 'body': 'Oh hi.'} - , {'body': 'Oh hi.'} - ] - } - } - -s.listen(s.port, function () { - - var counter = 0 - - for (i in tests) { - (function () { - var test = tests[i] - s.on('/'+i, test.resp) - test.uri = s.url + '/' + i - request(test, function (err, resp, body) { - if (err) throw err - if (test.expectBody) { - assert.deepEqual(test.expectBody, body) - } - counter = counter - 1; - if (counter === 0) { - console.log(Object.keys(tests).length+" tests passed.") - s.close() - } - }) - counter++ - })() - } -}) - diff --git a/src/extensibility/node/node_modules/request/tests/test-defaults.js b/src/extensibility/node/node_modules/request/tests/test-defaults.js deleted file mode 100644 index f6c40246020..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-defaults.js +++ /dev/null @@ -1,129 +0,0 @@ -var server = require('./server') - , assert = require('assert') - , request = require('../index') - ; - -var s = server.createServer(); - -s.listen(s.port, function () { - var counter = 0; - s.on('/get', function (req, resp) { - assert.equal(req.headers.foo, 'bar'); - assert.equal(req.method, 'GET') - resp.writeHead(200, {'Content-Type': 'text/plain'}); - resp.end('TESTING!'); - }); - - // test get(string, function) - request.defaults({headers:{foo:"bar"}})(s.url + '/get', function (e, r, b){ - if (e) throw e; - assert.deepEqual("TESTING!", b); - counter += 1; - }); - - s.on('/post', function (req, resp) { - assert.equal(req.headers.foo, 'bar'); - assert.equal(req.headers['content-type'], null); - assert.equal(req.method, 'POST') - resp.writeHead(200, {'Content-Type': 'application/json'}); - resp.end(JSON.stringify({foo:'bar'})); - }); - - // test post(string, object, function) - request.defaults({headers:{foo:"bar"}}).post(s.url + '/post', {json: true}, function (e, r, b){ - if (e) throw e; - assert.deepEqual('bar', b.foo); - counter += 1; - }); - - s.on('/patch', function (req, resp) { - assert.equal(req.headers.foo, 'bar'); - assert.equal(req.headers['content-type'], null); - assert.equal(req.method, 'PATCH') - resp.writeHead(200, {'Content-Type': 'application/json'}); - resp.end(JSON.stringify({foo:'bar'})); - }); - - // test post(string, object, function) - request.defaults({headers:{foo:"bar"}}).patch(s.url + '/patch', {json: true}, function (e, r, b){ - if (e) throw e; - assert.deepEqual('bar', b.foo); - counter += 1; - }); - - s.on('/post-body', function (req, resp) { - assert.equal(req.headers.foo, 'bar'); - assert.equal(req.headers['content-type'], 'application/json'); - assert.equal(req.method, 'POST') - resp.writeHead(200, {'Content-Type': 'application/json'}); - resp.end(JSON.stringify({foo:'bar'})); - }); - - // test post(string, object, function) with body - request.defaults({headers:{foo:"bar"}}).post(s.url + '/post-body', {json: true, body:{bar:"baz"}}, function (e, r, b){ - if (e) throw e; - assert.deepEqual('bar', b.foo); - counter += 1; - }); - - s.on('/del', function (req, resp) { - assert.equal(req.headers.foo, 'bar'); - assert.equal(req.method, 'DELETE') - resp.writeHead(200, {'Content-Type': 'application/json'}); - resp.end(JSON.stringify({foo:'bar'})); - }); - - // test .del(string, function) - request.defaults({headers:{foo:"bar"}, json:true}).del(s.url + '/del', function (e, r, b){ - if (e) throw e; - assert.deepEqual('bar', b.foo); - counter += 1; - }); - - s.on('/head', function (req, resp) { - assert.equal(req.headers.foo, 'bar'); - assert.equal(req.method, 'HEAD') - resp.writeHead(200, {'Content-Type': 'text/plain'}); - resp.end(); - }); - - // test head.(object, function) - request.defaults({headers:{foo:"bar"}}).head({uri: s.url + '/head'}, function (e, r, b){ - if (e) throw e; - counter += 1; - }); - - s.on('/get_custom', function(req, resp) { - assert.equal(req.headers.foo, 'bar'); - assert.equal(req.headers.x, 'y'); - resp.writeHead(200, {'Content-Type': 'text/plain'}); - resp.end(); - }); - - // test custom request handler function - var defaultRequest = request.defaults({ - headers:{foo:"bar"} - , body: 'TESTING!' - }, function(uri, options, callback) { - var params = request.initParams(uri, options, callback); - options = params.options; - options.headers.x = 'y'; - - return request(params.uri, params.options, params.callback); - }); - - var msg = 'defaults test failed. head request should throw earlier'; - assert.throws(function() { - defaultRequest.head(s.url + '/get_custom', function(e, r, b) { - throw new Error(msg); - }); - counter+=1; - }, msg); - - defaultRequest.get(s.url + '/get_custom', function(e, r, b) { - if(e) throw e; - counter += 1; - console.log(counter.toString() + " tests passed."); - s.close(); - }); -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-digest-auth.js b/src/extensibility/node/node_modules/request/tests/test-digest-auth.js deleted file mode 100644 index 5f2d6eb7dd0..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-digest-auth.js +++ /dev/null @@ -1,69 +0,0 @@ -var assert = require('assert') - , http = require('http') - , request = require('../index') - ; - -// Test digest auth -// Using header values captured from interaction with Apache - -var numDigestRequests = 0; - -var digestServer = http.createServer(function (req, res) { - console.error('Digest auth server: ', req.method, req.url); - numDigestRequests++; - - var ok; - - if (req.headers.authorization) { - if (req.headers.authorization == 'Digest username="test", realm="Private", nonce="WpcHS2/TBAA=dffcc0dbd5f96d49a5477166649b7c0ae3866a93", uri="/test/", qop="auth", response="54753ce37c10cb20b09b769f0bed730e", nc="1", cnonce=""') { - ok = true; - } else { - // Bad auth header, don't send back WWW-Authenticate header - ok = false; - } - } else { - // No auth header, send back WWW-Authenticate header - ok = false; - res.setHeader('www-authenticate', 'Digest realm="Private", nonce="WpcHS2/TBAA=dffcc0dbd5f96d49a5477166649b7c0ae3866a93", algorithm=MD5, qop="auth"'); - } - - if (ok) { - console.log('request ok'); - res.end('ok'); - } else { - console.log('status=401'); - res.statusCode = 401; - res.end('401'); - } -}); - -digestServer.listen(6767); - -request({ - 'method': 'GET', - 'uri': 'http://localhost:6767/test/', - 'auth': { - 'user': 'test', - 'pass': 'testing', - 'sendImmediately': false - } -}, function(error, response, body) { - assert.equal(response.statusCode, 200); - assert.equal(numDigestRequests, 2); - - // If we don't set sendImmediately = false, request will send basic auth - request({ - 'method': 'GET', - 'uri': 'http://localhost:6767/test/', - 'auth': { - 'user': 'test', - 'pass': 'testing' - } - }, function(error, response, body) { - assert.equal(response.statusCode, 401); - assert.equal(numDigestRequests, 3); - - console.log('All tests passed'); - digestServer.close(); - }); -}); diff --git a/src/extensibility/node/node_modules/request/tests/test-emptyBody.js b/src/extensibility/node/node_modules/request/tests/test-emptyBody.js deleted file mode 100644 index 338c92e5e6b..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-emptyBody.js +++ /dev/null @@ -1,20 +0,0 @@ -var request = require('../index') - , http = require('http') - , assert = require('assert') - ; - -var s = http.createServer(function (req, resp) { - resp.statusCode = 200 - resp.end('') -}).listen(8080, function () { - var r = request('http://localhost:8080', function (e, resp, body) { - assert.equal(resp.statusCode, 200) - assert.equal(body, "") - - var r2 = request({ url: 'http://localhost:8080', json: {} }, function (e, resp, body) { - assert.equal(resp.statusCode, 200) - assert.equal(body, undefined) - s.close() - }); - }) -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-errors.js b/src/extensibility/node/node_modules/request/tests/test-errors.js deleted file mode 100644 index 4df1302a095..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-errors.js +++ /dev/null @@ -1,37 +0,0 @@ -var server = require('./server') - , events = require('events') - , assert = require('assert') - , request = require('../index') - ; - -var local = 'http://localhost:8888/asdf' - -try { - request({uri:local, body:{}}) - assert.fail("Should have throw") -} catch(e) { - assert.equal(e.message, 'Argument error, options.body.') -} - -try { - request({uri:local, multipart: 'foo'}) - assert.fail("Should have throw") -} catch(e) { - assert.equal(e.message, 'Argument error, options.multipart.') -} - -try { - request({uri:local, multipart: [{}]}) - assert.fail("Should have throw") -} catch(e) { - assert.equal(e.message, 'Body attribute missing in multipart.') -} - -try { - request(local, {multipart: [{}]}) - assert.fail("Should have throw") -} catch(e) { - assert.equal(e.message, 'Body attribute missing in multipart.') -} - -console.log("All tests passed.") diff --git a/src/extensibility/node/node_modules/request/tests/test-follow-all-303.js b/src/extensibility/node/node_modules/request/tests/test-follow-all-303.js deleted file mode 100644 index 956e386d14b..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-follow-all-303.js +++ /dev/null @@ -1,30 +0,0 @@ -var request = require('../index'); -var http = require('http'); -var requests = 0; -var assert = require('assert'); - -var server = http.createServer(function (req, res) { - console.error(req.method, req.url); - requests ++; - - if (req.method === 'POST') { - console.error('send 303'); - res.setHeader('location', req.url); - res.statusCode = 303; - res.end('try again, i guess\n'); - } else { - console.error('send 200') - res.end('ok: ' + requests); - } -}); -server.listen(6767); - -request.post({ url: 'http://localhost:6767/foo', - followAllRedirects: true, - form: { foo: 'bar' } }, function (er, req, body) { - if (er) throw er; - assert.equal(body, 'ok: 2'); - assert.equal(requests, 2); - console.error('ok - ' + process.version); - server.close(); -}); diff --git a/src/extensibility/node/node_modules/request/tests/test-follow-all.js b/src/extensibility/node/node_modules/request/tests/test-follow-all.js deleted file mode 100644 index f2e51ffa795..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-follow-all.js +++ /dev/null @@ -1,36 +0,0 @@ -var request = require('../index'); -var http = require('http'); -var requests = 0; -var assert = require('assert'); - -var server = http.createServer(function (req, res) { - requests ++; - - // redirect everything 3 times, no matter what. - var c = req.headers.cookie; - - if (!c) c = 0; - else c = +c.split('=')[1] || 0; - - if (c > 3) { - res.end('ok: '+requests); - return; - } - - res.setHeader('set-cookie', 'c=' + (c + 1)); - res.setHeader('location', req.url); - res.statusCode = 302; - res.end('try again, i guess\n'); -}); -server.listen(6767); - -request.post({ url: 'http://localhost:6767/foo', - followAllRedirects: true, - jar: true, - form: { foo: 'bar' } }, function (er, req, body) { - if (er) throw er; - assert.equal(body, 'ok: 5'); - assert.equal(requests, 5); - console.error('ok - ' + process.version); - server.close(); -}); diff --git a/src/extensibility/node/node_modules/request/tests/test-form.js b/src/extensibility/node/node_modules/request/tests/test-form.js deleted file mode 100644 index 91b9230d42d..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-form.js +++ /dev/null @@ -1,79 +0,0 @@ -var assert = require('assert') -var http = require('http'); -var path = require('path'); -var mime = require('mime'); -var request = require('../index'); -var fs = require('fs'); - -var remoteFile = 'http://nodejs.org/images/logo.png'; - -var FIELDS = [ - {name: 'my_field', value: 'my_value'}, - {name: 'my_buffer', value: new Buffer([1, 2, 3])}, - {name: 'my_file', value: fs.createReadStream(__dirname + '/unicycle.jpg')}, - {name: 'remote_file', value: request(remoteFile) } -]; - -var server = http.createServer(function(req, res) { - - // temp workaround - var data = ''; - req.setEncoding('utf8'); - - req.on('data', function(d) { - data += d; - }); - - req.on('end', function() { - // check for the fields' traces - - // 1st field : my_field - var field = FIELDS.shift(); - assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 ); - assert.ok( data.indexOf(field.value) != -1 ); - - // 2nd field : my_buffer - var field = FIELDS.shift(); - assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 ); - assert.ok( data.indexOf(field.value) != -1 ); - - // 3rd field : my_file - var field = FIELDS.shift(); - assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 ); - assert.ok( data.indexOf('; filename="'+path.basename(field.value.path)+'"') != -1 ); - // check for unicycle.jpg traces - assert.ok( data.indexOf('2005:06:21 01:44:12') != -1 ); - assert.ok( data.indexOf('Content-Type: '+mime.lookup(field.value.path) ) != -1 ); - - // 4th field : remote_file - var field = FIELDS.shift(); - assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 ); - assert.ok( data.indexOf('; filename="'+path.basename(field.value.path)+'"') != -1 ); - // check for http://nodejs.org/images/logo.png traces - assert.ok( data.indexOf('ImageReady') != -1 ); - assert.ok( data.indexOf('Content-Type: '+mime.lookup(remoteFile) ) != -1 ); - - res.writeHead(200); - res.end('done'); - - }); - - -}); - -server.listen(8080, function() { - - var req = request.post('http://localhost:8080/upload', function () { - server.close(); - }) - var form = req.form() - - FIELDS.forEach(function(field) { - form.append(field.name, field.value); - }); - -}); - -process.on('exit', function() { - assert.strictEqual(FIELDS.length, 0); -}); diff --git a/src/extensibility/node/node_modules/request/tests/test-hawk.js b/src/extensibility/node/node_modules/request/tests/test-hawk.js deleted file mode 100755 index 84546258059..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-hawk.js +++ /dev/null @@ -1,33 +0,0 @@ -var createServer = require('http').createServer - , request = require('../index') - , hawk = require('hawk') - , assert = require('assert') - ; - -var server = createServer(function (req, resp) { - - var getCred = function (id, callback) { - assert.equal(id, 'dh37fgj492je') - var credentials = - { key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn' - , algorithm: 'sha256' - , user: 'Steve' - } - return callback(null, credentials) - } - - hawk.server.authenticate(req, getCred, {}, function (err, credentials, attributes) { - resp.writeHead(!err ? 200 : 401, { 'Content-Type': 'text/plain' }) - resp.end(!err ? 'Hello ' + credentials.user : 'Shoosh!') - }) - -}) - -server.listen(8080, function () { - var creds = {key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn', algorithm: 'sha256', id:'dh37fgj492je'} - request('http://localhost:8080', {hawk:{credentials:creds}}, function (e, r, b) { - assert.equal(200, r.statusCode) - assert.equal(b, 'Hello Steve') - server.close() - }) -}) \ No newline at end of file diff --git a/src/extensibility/node/node_modules/request/tests/test-headers.js b/src/extensibility/node/node_modules/request/tests/test-headers.js deleted file mode 100644 index 3982b9be0e5..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-headers.js +++ /dev/null @@ -1,52 +0,0 @@ -var server = require('./server') - , assert = require('assert') - , request = require('../index') - , Cookie = require('cookie-jar') - , Jar = Cookie.Jar - , s = server.createServer() - -s.listen(s.port, function () { - var serverUri = 'http://localhost:' + s.port - , numTests = 0 - , numOutstandingTests = 0 - - function createTest(requestObj, serverAssertFn) { - var testNumber = numTests; - numTests += 1; - numOutstandingTests += 1; - s.on('/' + testNumber, function (req, res) { - serverAssertFn(req, res); - res.writeHead(200); - res.end(); - }); - requestObj.url = serverUri + '/' + testNumber - request(requestObj, function (err, res, body) { - assert.ok(!err) - assert.equal(res.statusCode, 200) - numOutstandingTests -= 1 - if (numOutstandingTests === 0) { - console.log(numTests + ' tests passed.') - s.close() - } - }) - } - - // Issue #125: headers.cookie shouldn't be replaced when a cookie jar isn't specified - createTest({headers: {cookie: 'foo=bar'}}, function (req, res) { - assert.ok(req.headers.cookie) - assert.equal(req.headers.cookie, 'foo=bar') - }) - - // Issue #125: headers.cookie + cookie jar - var jar = new Jar() - jar.add(new Cookie('quux=baz')); - createTest({jar: jar, headers: {cookie: 'foo=bar'}}, function (req, res) { - assert.ok(req.headers.cookie) - assert.equal(req.headers.cookie, 'foo=bar; quux=baz') - }) - - // There should be no cookie header when neither headers.cookie nor a cookie jar is specified - createTest({}, function (req, res) { - assert.ok(!req.headers.cookie) - }) -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-http-signature.js b/src/extensibility/node/node_modules/request/tests/test-http-signature.js deleted file mode 100755 index 93004732011..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-http-signature.js +++ /dev/null @@ -1,106 +0,0 @@ -var createServer = require('http').createServer - , request = require('../index') - , httpSignature = require('http-signature') - , assert = require('assert') - ; - -var privateKeyPEMs = {} - -privateKeyPEMs['key-1'] = - '-----BEGIN RSA PRIVATE KEY-----\n' + - 'MIIEpAIBAAKCAQEAzWSJl+Z9Bqv00FVL5N3+JCUoqmQPjIlya1BbeqQroNQ5yG1i\n' + - 'VbYTTnMRa1zQtR6r2fNvWeg94DvxivxIG9diDMnrzijAnYlTLOl84CK2vOxkj5b6\n' + - '8zrLH9b/Gd6NOHsywo8IjvXvCeTfca5WUHcuVi2lT9VjygFs1ILG4RyeX1BXUumu\n' + - 'Y8fzmposxLYdMxCqUTzAn0u9Saq2H2OVj5u114wS7OQPigu6G99dpn/iPHa3zBm8\n' + - '7baBWDbqZWRW0BP3K6eqq8sut1+NLhNW8ADPTdnO/SO+kvXy7fqd8atSn+HlQcx6\n' + - 'tW42dhXf3E9uE7K78eZtW0KvfyNGAjsI1Fft2QIDAQABAoIBAG1exe3/LEBrPLfb\n' + - 'U8iRdY0lxFvHYIhDgIwohC3wUdMYb5SMurpNdEZn+7Sh/fkUVgp/GKJViu1mvh52\n' + - 'bKd2r52DwG9NQBQjVgkqY/auRYSglIPpr8PpYNSZlcneunCDGeqEY9hMmXc5Ssqs\n' + - 'PQYoEKKPN+IlDTg6PguDgAfLR4IUvt9KXVvmB/SSgV9tSeTy35LECt1Lq3ozbUgu\n' + - '30HZI3U6/7H+X22Pxxf8vzBtzkg5rRCLgv+OeNPo16xMnqbutt4TeqEkxRv5rtOo\n' + - '/A1i9khBeki0OJAFJsE82qnaSZodaRsxic59VnN8sWBwEKAt87tEu5A3K3j4XSDU\n' + - '/avZxAECgYEA+pS3DvpiQLtHlaO3nAH6MxHRrREOARXWRDe5nUQuUNpS1xq9wte6\n' + - 'DkFtba0UCvDLic08xvReTCbo9kH0y6zEy3zMpZuJlKbcWCkZf4S5miYPI0RTZtF8\n' + - 'yps6hWqzYFSiO9hMYws9k4OJLxX0x3sLK7iNZ32ujcSrkPBSiBr0gxkCgYEA0dWl\n' + - '637K41AJ/zy0FP0syq+r4eIkfqv+/t6y2aQVUBvxJYrj9ci6XHBqoxpDV8lufVYj\n' + - 'fUAfeI9/MZaWvQJRbnYLre0I6PJfLuCBIL5eflO77BGso165AF7QJZ+fwtgKv3zv\n' + - 'ZX75eudCSS/cFo0po9hlbcLMT4B82zEkgT8E2MECgYEAnz+3/wrdOmpLGiyL2dff\n' + - '3GjsqmJ2VfY8z+niSrI0BSpbD11tT9Ct67VlCBjA7hsOH6uRfpd6/kaUMzzDiFVq\n' + - 'VDAiFvV8QD6zNkwYalQ9aFvbrvwTTPrBpjl0vamMCiJ/YC0cjq1sGr2zh3sar1Ph\n' + - 'S43kP+s97dcZeelhaiJHVrECgYEAsx61q/loJ/LDFeYzs1cLTVn4V7I7hQY9fkOM\n' + - 'WM0AhInVqD6PqdfXfeFYpjJdGisQ7l0BnoGGW9vir+nkcyPvb2PFRIr6+B8tsU5j\n' + - '7BeVgjDoUfQkcrEBK5fEBtnj/ud9BUkY8oMZZBjVNLRuI7IMwZiPvMp0rcj4zAN/\n' + - 'LfUlpgECgYArBvFcBxSkNAzR3Rtteud1YDboSKluRM37Ey5plrn4BS0DD0jm++aD\n' + - '0pG2Hsik000hibw92lCkzvvBVAqF8BuAcnPlAeYfsOaa97PGEjSKEN5bJVWZ9/om\n' + - '9FV1axotRN2XWlwrhixZLEaagkREXhgQc540FS5O8IaI2Vpa80Atzg==\n' + - '-----END RSA PRIVATE KEY-----' - -var publicKeyPEMs = {} - -publicKeyPEMs['key-1'] = - '-----BEGIN PUBLIC KEY-----\n' + - 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWSJl+Z9Bqv00FVL5N3+\n' + - 'JCUoqmQPjIlya1BbeqQroNQ5yG1iVbYTTnMRa1zQtR6r2fNvWeg94DvxivxIG9di\n' + - 'DMnrzijAnYlTLOl84CK2vOxkj5b68zrLH9b/Gd6NOHsywo8IjvXvCeTfca5WUHcu\n' + - 'Vi2lT9VjygFs1ILG4RyeX1BXUumuY8fzmposxLYdMxCqUTzAn0u9Saq2H2OVj5u1\n' + - '14wS7OQPigu6G99dpn/iPHa3zBm87baBWDbqZWRW0BP3K6eqq8sut1+NLhNW8ADP\n' + - 'TdnO/SO+kvXy7fqd8atSn+HlQcx6tW42dhXf3E9uE7K78eZtW0KvfyNGAjsI1Fft\n' + - '2QIDAQAB\n' + - '-----END PUBLIC KEY-----' - -publicKeyPEMs['key-2'] = - '-----BEGIN PUBLIC KEY-----\n' + - 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqp04VVr9OThli9b35Omz\n' + - 'VqSfWbsoQuRrgyWsrNRn3XkFmbWw4FzZwQ42OgGMzQ84Ta4d9zGKKQyFriTiPjPf\n' + - 'xhhrsaJnDuybcpVhcr7UNKjSZ0S59tU3hpRiEz6hO+Nc/OSSLkvalG0VKrxOln7J\n' + - 'LK/h3rNS/l6wDZ5S/KqsI6CYtV2ZLpn3ahLrizvEYNY038Qcm38qMWx+VJAvZ4di\n' + - 'qqmW7RLIsLT59SWmpXdhFKnkYYGhxrk1Mwl22dBTJNY5SbriU5G3gWgzYkm8pgHr\n' + - '6CtrXch9ciJAcDJehPrKXNvNDOdUh8EW3fekNJerF1lWcwQg44/12v8sDPyfbaKB\n' + - 'dQIDAQAB\n' + - '-----END PUBLIC KEY-----' - -var server = createServer(function (req, res) { - var parsed = httpSignature.parseRequest(req) - var publicKeyPEM = publicKeyPEMs[parsed.keyId] - var verified = httpSignature.verifySignature(parsed, publicKeyPEM) - res.writeHead(verified ? 200 : 400) - res.end() -}) - -server.listen(8080, function () { - function correctKeyTest(callback) { - var options = { - httpSignature: { - keyId: 'key-1', - key: privateKeyPEMs['key-1'] - } - } - request('http://localhost:8080', options, function (e, r, b) { - assert.equal(200, r.statusCode) - callback() - }) - } - - function incorrectKeyTest(callback) { - var options = { - httpSignature: { - keyId: 'key-2', - key: privateKeyPEMs['key-1'] - } - } - request('http://localhost:8080', options, function (e, r, b) { - assert.equal(400, r.statusCode) - callback() - }) - } - - var tests = [correctKeyTest, incorrectKeyTest] - var todo = tests.length; - for(var i = 0; i < tests.length; ++i) { - tests[i](function() { - if(!--todo) { - server.close() - } - }) - } -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-httpModule.js b/src/extensibility/node/node_modules/request/tests/test-httpModule.js deleted file mode 100644 index 2c19615f763..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-httpModule.js +++ /dev/null @@ -1,94 +0,0 @@ -var http = require('http') - , https = require('https') - , server = require('./server') - , assert = require('assert') - , request = require('../index') - - -var faux_requests_made = {'http':0, 'https':0} -function wrap_request(name, module) { - // Just like the http or https module, but note when a request is made. - var wrapped = {} - Object.keys(module).forEach(function(key) { - var value = module[key]; - - if(key != 'request') - wrapped[key] = value; - else - wrapped[key] = function(options, callback) { - faux_requests_made[name] += 1 - return value.apply(this, arguments) - } - }) - - return wrapped; -} - - -var faux_http = wrap_request('http', http) - , faux_https = wrap_request('https', https) - , plain_server = server.createServer() - , https_server = server.createSSLServer() - - -plain_server.listen(plain_server.port, function() { - plain_server.on('/plain', function (req, res) { - res.writeHead(200) - res.end('plain') - }) - plain_server.on('/to_https', function (req, res) { - res.writeHead(301, {'location':'https://localhost:'+https_server.port + '/https'}) - res.end() - }) - - https_server.listen(https_server.port, function() { - https_server.on('/https', function (req, res) { - res.writeHead(200) - res.end('https') - }) - https_server.on('/to_plain', function (req, res) { - res.writeHead(302, {'location':'http://localhost:'+plain_server.port + '/plain'}) - res.end() - }) - - run_tests() - run_tests({}) - run_tests({'http:':faux_http}) - run_tests({'https:':faux_https}) - run_tests({'http:':faux_http, 'https:':faux_https}) - }) -}) - -function run_tests(httpModules) { - var to_https = 'http://localhost:'+plain_server.port+'/to_https' - var to_plain = 'https://localhost:'+https_server.port+'/to_plain' - - request(to_https, {'httpModules':httpModules, strictSSL:false}, function (er, res, body) { - if (er) throw er - assert.equal(body, 'https', 'Received HTTPS server body') - done() - }) - - request(to_plain, {'httpModules':httpModules, strictSSL:false}, function (er, res, body) { - if (er) throw er - assert.equal(body, 'plain', 'Received HTTPS server body') - done() - }) -} - - -var passed = 0; -function done() { - passed += 1 - var expected = 10 - - if(passed == expected) { - plain_server.close() - https_server.close() - - assert.equal(faux_requests_made.http, 4, 'Wrapped http module called appropriately') - assert.equal(faux_requests_made.https, 4, 'Wrapped https module called appropriately') - - console.log((expected+2) + ' tests passed.') - } -} diff --git a/src/extensibility/node/node_modules/request/tests/test-https-strict.js b/src/extensibility/node/node_modules/request/tests/test-https-strict.js deleted file mode 100644 index d49a9afcb90..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-https-strict.js +++ /dev/null @@ -1,97 +0,0 @@ -// a test where we validate the siguature of the keys -// otherwise exactly the same as the ssl test - -var server = require('./server') - , assert = require('assert') - , request = require('../index') - , fs = require('fs') - , path = require('path') - , opts = { key: path.resolve(__dirname, 'ssl/ca/server.key') - , cert: path.resolve(__dirname, 'ssl/ca/server.crt') } - , s = server.createSSLServer(null, opts) - , caFile = path.resolve(__dirname, 'ssl/ca/ca.crt') - , ca = fs.readFileSync(caFile) - -var tests = - { testGet : - { resp : server.createGetResponse("TESTING!") - , expectBody: "TESTING!" - } - , testGetChunkBreak : - { resp : server.createChunkResponse( - [ new Buffer([239]) - , new Buffer([163]) - , new Buffer([191]) - , new Buffer([206]) - , new Buffer([169]) - , new Buffer([226]) - , new Buffer([152]) - , new Buffer([131]) - ]) - , expectBody: "Ω☃" - } - , testGetJSON : - { resp : server.createGetResponse('{"test":true}', 'application/json') - , json : true - , expectBody: {"test":true} - } - , testPutString : - { resp : server.createPostValidator("PUTTINGDATA") - , method : "PUT" - , body : "PUTTINGDATA" - } - , testPutBuffer : - { resp : server.createPostValidator("PUTTINGDATA") - , method : "PUT" - , body : new Buffer("PUTTINGDATA") - } - , testPutJSON : - { resp : server.createPostValidator(JSON.stringify({foo: 'bar'})) - , method: "PUT" - , json: {foo: 'bar'} - } - , testPutMultipart : - { resp: server.createPostValidator( - '--__BOUNDARY__\r\n' + - 'content-type: text/html\r\n' + - '\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__\r\n\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__--' - ) - , method: "PUT" - , multipart: - [ {'content-type': 'text/html', 'body': 'Oh hi.'} - , {'body': 'Oh hi.'} - ] - } - } - -s.listen(s.port, function () { - - var counter = 0 - - for (i in tests) { - (function () { - var test = tests[i] - s.on('/'+i, test.resp) - test.uri = s.url + '/' + i - test.strictSSL = true - test.ca = ca - test.headers = { host: 'testing.request.mikealrogers.com' } - request(test, function (err, resp, body) { - if (err) throw err - if (test.expectBody) { - assert.deepEqual(test.expectBody, body) - } - counter = counter - 1; - if (counter === 0) { - console.log(Object.keys(tests).length+" tests passed.") - s.close() - } - }) - counter++ - })() - } -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-https.js b/src/extensibility/node/node_modules/request/tests/test-https.js deleted file mode 100644 index b6858d433be..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-https.js +++ /dev/null @@ -1,87 +0,0 @@ -var server = require('./server') - , assert = require('assert') - , request = require('../index') - -var s = server.createSSLServer(); - -var tests = - { testGet : - { resp : server.createGetResponse("TESTING!") - , expectBody: "TESTING!" - } - , testGetChunkBreak : - { resp : server.createChunkResponse( - [ new Buffer([239]) - , new Buffer([163]) - , new Buffer([191]) - , new Buffer([206]) - , new Buffer([169]) - , new Buffer([226]) - , new Buffer([152]) - , new Buffer([131]) - ]) - , expectBody: "Ω☃" - } - , testGetJSON : - { resp : server.createGetResponse('{"test":true}', 'application/json') - , json : true - , expectBody: {"test":true} - } - , testPutString : - { resp : server.createPostValidator("PUTTINGDATA") - , method : "PUT" - , body : "PUTTINGDATA" - } - , testPutBuffer : - { resp : server.createPostValidator("PUTTINGDATA") - , method : "PUT" - , body : new Buffer("PUTTINGDATA") - } - , testPutJSON : - { resp : server.createPostValidator(JSON.stringify({foo: 'bar'})) - , method: "PUT" - , json: {foo: 'bar'} - } - , testPutMultipart : - { resp: server.createPostValidator( - '--__BOUNDARY__\r\n' + - 'content-type: text/html\r\n' + - '\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__\r\n\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__--' - ) - , method: "PUT" - , multipart: - [ {'content-type': 'text/html', 'body': 'Oh hi.'} - , {'body': 'Oh hi.'} - ] - } - } - -s.listen(s.port, function () { - - var counter = 0 - - for (i in tests) { - (function () { - var test = tests[i] - s.on('/'+i, test.resp) - test.uri = s.url + '/' + i - test.rejectUnauthorized = false - request(test, function (err, resp, body) { - if (err) throw err - if (test.expectBody) { - assert.deepEqual(test.expectBody, body) - } - counter = counter - 1; - if (counter === 0) { - console.log(Object.keys(tests).length+" tests passed.") - s.close() - } - }) - counter++ - })() - } -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-isUrl.js b/src/extensibility/node/node_modules/request/tests/test-isUrl.js deleted file mode 100644 index 4a51ad0189a..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-isUrl.js +++ /dev/null @@ -1,28 +0,0 @@ -var assert = require('assert') - , request = require('../index') - , http = require('http') - ; - -var s = http.createServer(function(req, res) { - res.statusCode = 200; - res.end(''); -}).listen(6767, function () { - - // Test lowercase - request('http://localhost:6767', function (err, resp, body) { - // just need to get here without throwing an error - assert.equal(true, true); - }) - - // Test uppercase - request('HTTP://localhost:6767', function (err, resp, body) { - assert.equal(true, true); - }) - - // Test mixedcase - request('HtTp://localhost:6767', function (err, resp, body) { - assert.equal(true, true); - // clean up - s.close(); - }) -}) \ No newline at end of file diff --git a/src/extensibility/node/node_modules/request/tests/test-localAddress.js b/src/extensibility/node/node_modules/request/tests/test-localAddress.js deleted file mode 100644 index 11a1bd125ca..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-localAddress.js +++ /dev/null @@ -1,15 +0,0 @@ -var request = require('../index') - , assert = require('assert') - ; - -request.get({ - uri: 'http://www.google.com', localAddress: '1.2.3.4' // some invalid address -}, function(err, res) { - assert(!res) // asserting that no response received -}) - -request.get({ - uri: 'http://www.google.com', localAddress: '127.0.0.1' -}, function(err, res) { - assert(!res) // asserting that no response received -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-oauth.js b/src/extensibility/node/node_modules/request/tests/test-oauth.js deleted file mode 100644 index 3269483d8f2..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-oauth.js +++ /dev/null @@ -1,117 +0,0 @@ -var hmacsign = require('oauth-sign').hmacsign - , assert = require('assert') - , qs = require('querystring') - , request = require('../index') - ; - -function getsignature (r) { - var sign - r.headers.Authorization.slice('OAuth '.length).replace(/,\ /g, ',').split(',').forEach(function (v) { - if (v.slice(0, 'oauth_signature="'.length) === 'oauth_signature="') sign = v.slice('oauth_signature="'.length, -1) - }) - return decodeURIComponent(sign) -} - -// Tests from Twitter documentation https://dev.twitter.com/docs/auth/oauth - -var reqsign = hmacsign('POST', 'https://api.twitter.com/oauth/request_token', - { oauth_callback: 'http://localhost:3005/the_dance/process_callback?service_provider_id=11' - , oauth_consumer_key: 'GDdmIQH6jhtmLUypg82g' - , oauth_nonce: 'QP70eNmVz8jvdPevU3oJD2AfF7R7odC2XJcn4XlZJqk' - , oauth_signature_method: 'HMAC-SHA1' - , oauth_timestamp: '1272323042' - , oauth_version: '1.0' - }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98") - -console.log(reqsign) -console.log('8wUi7m5HFQy76nowoCThusfgB+Q=') -assert.equal(reqsign, '8wUi7m5HFQy76nowoCThusfgB+Q=') - -var accsign = hmacsign('POST', 'https://api.twitter.com/oauth/access_token', - { oauth_consumer_key: 'GDdmIQH6jhtmLUypg82g' - , oauth_nonce: '9zWH6qe0qG7Lc1telCn7FhUbLyVdjEaL3MO5uHxn8' - , oauth_signature_method: 'HMAC-SHA1' - , oauth_token: '8ldIZyxQeVrFZXFOZH5tAwj6vzJYuLQpl0WUEYtWc' - , oauth_timestamp: '1272323047' - , oauth_verifier: 'pDNg57prOHapMbhv25RNf75lVRd6JDsni1AJJIDYoTY' - , oauth_version: '1.0' - }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98", "x6qpRnlEmW9JbQn4PQVVeVG8ZLPEx6A0TOebgwcuA") - -console.log(accsign) -console.log('PUw/dHA4fnlJYM6RhXk5IU/0fCc=') -assert.equal(accsign, 'PUw/dHA4fnlJYM6RhXk5IU/0fCc=') - -var upsign = hmacsign('POST', 'http://api.twitter.com/1/statuses/update.json', - { oauth_consumer_key: "GDdmIQH6jhtmLUypg82g" - , oauth_nonce: "oElnnMTQIZvqvlfXM56aBLAf5noGD0AQR3Fmi7Q6Y" - , oauth_signature_method: "HMAC-SHA1" - , oauth_token: "819797-Jxq8aYUDRmykzVKrgoLhXSq67TEa5ruc4GJC2rWimw" - , oauth_timestamp: "1272325550" - , oauth_version: "1.0" - , status: 'setting up my twitter 私のさえずりを設定する' - }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98", "J6zix3FfA9LofH0awS24M3HcBYXO5nI1iYe8EfBA") - -console.log(upsign) -console.log('yOahq5m0YjDDjfjxHaXEsW9D+X0=') -assert.equal(upsign, 'yOahq5m0YjDDjfjxHaXEsW9D+X0=') - - -var rsign = request.post( - { url: 'https://api.twitter.com/oauth/request_token' - , oauth: - { callback: 'http://localhost:3005/the_dance/process_callback?service_provider_id=11' - , consumer_key: 'GDdmIQH6jhtmLUypg82g' - , nonce: 'QP70eNmVz8jvdPevU3oJD2AfF7R7odC2XJcn4XlZJqk' - , timestamp: '1272323042' - , version: '1.0' - , consumer_secret: "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98" - } - }) - -setTimeout(function () { - console.log(getsignature(rsign)) - assert.equal(reqsign, getsignature(rsign)) -}) - -var raccsign = request.post( - { url: 'https://api.twitter.com/oauth/access_token' - , oauth: - { consumer_key: 'GDdmIQH6jhtmLUypg82g' - , nonce: '9zWH6qe0qG7Lc1telCn7FhUbLyVdjEaL3MO5uHxn8' - , signature_method: 'HMAC-SHA1' - , token: '8ldIZyxQeVrFZXFOZH5tAwj6vzJYuLQpl0WUEYtWc' - , timestamp: '1272323047' - , verifier: 'pDNg57prOHapMbhv25RNf75lVRd6JDsni1AJJIDYoTY' - , version: '1.0' - , consumer_secret: "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98" - , token_secret: "x6qpRnlEmW9JbQn4PQVVeVG8ZLPEx6A0TOebgwcuA" - } - }) - -setTimeout(function () { - console.log(getsignature(raccsign)) - assert.equal(accsign, getsignature(raccsign)) -}, 1) - -var rupsign = request.post( - { url: 'http://api.twitter.com/1/statuses/update.json' - , oauth: - { consumer_key: "GDdmIQH6jhtmLUypg82g" - , nonce: "oElnnMTQIZvqvlfXM56aBLAf5noGD0AQR3Fmi7Q6Y" - , signature_method: "HMAC-SHA1" - , token: "819797-Jxq8aYUDRmykzVKrgoLhXSq67TEa5ruc4GJC2rWimw" - , timestamp: "1272325550" - , version: "1.0" - , consumer_secret: "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98" - , token_secret: "J6zix3FfA9LofH0awS24M3HcBYXO5nI1iYe8EfBA" - } - , form: {status: 'setting up my twitter 私のさえずりを設定する'} - }) -setTimeout(function () { - console.log(getsignature(rupsign)) - assert.equal(upsign, getsignature(rupsign)) -}, 1) - - - - diff --git a/src/extensibility/node/node_modules/request/tests/test-onelineproxy.js b/src/extensibility/node/node_modules/request/tests/test-onelineproxy.js deleted file mode 100644 index c239f8921cf..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-onelineproxy.js +++ /dev/null @@ -1,46 +0,0 @@ -var http = require('http') - , assert = require('assert') - , request = require('../index') - ; - -var server = http.createServer(function (req, resp) { - resp.statusCode = 200 - if (req.url === '/get') { - assert.equal(req.method, 'GET') - resp.write('content') - resp.end() - return - } - if (req.url === '/put') { - var x = '' - assert.equal(req.method, 'PUT') - req.on('data', function (chunk) { - x += chunk - }) - req.on('end', function () { - assert.equal(x, 'content') - resp.write('success') - resp.end() - }) - return - } - if (req.url === '/proxy') { - assert.equal(req.method, 'PUT') - return req.pipe(request('http://localhost:8080/put')).pipe(resp) - } - - if (req.url === '/test') { - return request('http://localhost:8080/get').pipe(request.put('http://localhost:8080/proxy')).pipe(resp) - } - throw new Error('Unknown url', req.url) -}).listen(8080, function () { - request('http://localhost:8080/test', function (e, resp, body) { - if (e) throw e - if (resp.statusCode !== 200) throw new Error('statusCode not 200 ' + resp.statusCode) - assert.equal(body, 'success') - server.close() - }) -}) - - - diff --git a/src/extensibility/node/node_modules/request/tests/test-params.js b/src/extensibility/node/node_modules/request/tests/test-params.js deleted file mode 100644 index a5831a14071..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-params.js +++ /dev/null @@ -1,93 +0,0 @@ -var server = require('./server') - , assert = require('assert') - , request = require('../index') - ; - -var s = server.createServer(); - -var tests = - { testGet : - { resp : server.createGetResponse("TESTING!") - , expectBody: "TESTING!" - } - , testGetChunkBreak : - { resp : server.createChunkResponse( - [ new Buffer([239]) - , new Buffer([163]) - , new Buffer([191]) - , new Buffer([206]) - , new Buffer([169]) - , new Buffer([226]) - , new Buffer([152]) - , new Buffer([131]) - ]) - , expectBody: "Ω☃" - } - , testGetBuffer : - { resp : server.createGetResponse(new Buffer("TESTING!")) - , encoding: null - , expectBody: new Buffer("TESTING!") - } - , testGetJSON : - { resp : server.createGetResponse('{"test":true}', 'application/json') - , json : true - , expectBody: {"test":true} - } - , testPutString : - { resp : server.createPostValidator("PUTTINGDATA") - , method : "PUT" - , body : "PUTTINGDATA" - } - , testPutBuffer : - { resp : server.createPostValidator("PUTTINGDATA") - , method : "PUT" - , body : new Buffer("PUTTINGDATA") - } - , testPutJSON : - { resp : server.createPostValidator(JSON.stringify({foo: 'bar'})) - , method: "PUT" - , json: {foo: 'bar'} - } - , testPutMultipart : - { resp: server.createPostValidator( - '--__BOUNDARY__\r\n' + - 'content-type: text/html\r\n' + - '\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__\r\n\r\n' + - 'Oh hi.' + - '\r\n--__BOUNDARY__--' - ) - , method: "PUT" - , multipart: - [ {'content-type': 'text/html', 'body': 'Oh hi.'} - , {'body': 'Oh hi.'} - ] - } - } - -s.listen(s.port, function () { - - var counter = 0 - - for (i in tests) { - (function () { - var test = tests[i] - s.on('/'+i, test.resp) - //test.uri = s.url + '/' + i - request(s.url + '/' + i, test, function (err, resp, body) { - if (err) throw err - if (test.expectBody) { - assert.deepEqual(test.expectBody, body) - } - counter = counter - 1; - if (counter === 0) { - assert.notEqual(typeof test.callback, 'function') - console.log(1 + Object.keys(tests).length+" tests passed.") - s.close() - } - }) - counter++ - })() - } -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-piped-redirect.js b/src/extensibility/node/node_modules/request/tests/test-piped-redirect.js deleted file mode 100644 index e295ec7fa91..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-piped-redirect.js +++ /dev/null @@ -1,42 +0,0 @@ -var http = require('http') - , assert = require('assert') - , request = require('../index') - ; - -var portOne = 8968 - , portTwo = 8969 - ; - - -// server one -var s1 = http.createServer(function (req, resp) { - if (req.url == '/original') { - resp.writeHeader(302, {'location': '/redirected'}) - resp.end() - } else if (req.url == '/redirected') { - resp.writeHeader(200, {'content-type': 'text/plain'}) - resp.write('OK') - resp.end() - } - -}).listen(portOne); - - -// server two -var s2 = http.createServer(function (req, resp) { - var x = request('http://localhost:'+portOne+'/original') - req.pipe(x) - x.pipe(resp) - -}).listen(portTwo, function () { - var r = request('http://localhost:'+portTwo+'/original', function (err, res, body) { - assert.equal(body, 'OK') - - s1.close() - s2.close() - }); - - // it hangs, so wait a second :) - r.timeout = 1000; - -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-pipes.js b/src/extensibility/node/node_modules/request/tests/test-pipes.js deleted file mode 100644 index 52a15cc7e85..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-pipes.js +++ /dev/null @@ -1,216 +0,0 @@ -var server = require('./server') - , events = require('events') - , stream = require('stream') - , assert = require('assert') - , fs = require('fs') - , request = require('../index') - , path = require('path') - , util = require('util') - ; - -var s = server.createServer(3453); - -function ValidationStream(str) { - this.str = str - this.buf = '' - this.on('data', function (data) { - this.buf += data - }) - this.on('end', function () { - assert.equal(this.str, this.buf) - }) - this.writable = true -} -util.inherits(ValidationStream, stream.Stream) -ValidationStream.prototype.write = function (chunk) { - this.emit('data', chunk) -} -ValidationStream.prototype.end = function (chunk) { - if (chunk) emit('data', chunk) - this.emit('end') -} - -s.listen(s.port, function () { - counter = 0; - - var check = function () { - counter = counter - 1 - if (counter === 0) { - console.log('All tests passed.') - setTimeout(function () { - process.exit(); - }, 500) - } - } - - // Test pipeing to a request object - s.once('/push', server.createPostValidator("mydata")); - - var mydata = new stream.Stream(); - mydata.readable = true - - counter++ - var r1 = request.put({url:'http://localhost:3453/push'}, function () { - check(); - }) - mydata.pipe(r1) - - mydata.emit('data', 'mydata'); - mydata.emit('end'); - - // Test pipeing to a request object with a json body - s.once('/push-json', server.createPostValidator("{\"foo\":\"bar\"}", "application/json")); - - var mybodydata = new stream.Stream(); - mybodydata.readable = true - - counter++ - var r2 = request.put({url:'http://localhost:3453/push-json',json:true}, function () { - check(); - }) - mybodydata.pipe(r2) - - mybodydata.emit('data', JSON.stringify({foo:"bar"})); - mybodydata.emit('end'); - - // Test pipeing from a request object. - s.once('/pull', server.createGetResponse("mypulldata")); - - var mypulldata = new stream.Stream(); - mypulldata.writable = true - - counter++ - request({url:'http://localhost:3453/pull'}).pipe(mypulldata) - - var d = ''; - - mypulldata.write = function (chunk) { - d += chunk; - } - mypulldata.end = function () { - assert.equal(d, 'mypulldata'); - check(); - }; - - - s.on('/cat', function (req, resp) { - if (req.method === "GET") { - resp.writeHead(200, {'content-type':'text/plain-test', 'content-length':4}); - resp.end('asdf') - } else if (req.method === "PUT") { - assert.equal(req.headers['content-type'], 'text/plain-test'); - assert.equal(req.headers['content-length'], 4) - var validate = ''; - - req.on('data', function (chunk) {validate += chunk}) - req.on('end', function () { - resp.writeHead(201); - resp.end(); - assert.equal(validate, 'asdf'); - check(); - }) - } - }) - s.on('/pushjs', function (req, resp) { - if (req.method === "PUT") { - assert.equal(req.headers['content-type'], 'application/javascript'); - check(); - } - }) - s.on('/catresp', function (req, resp) { - request.get('http://localhost:3453/cat').pipe(resp) - }) - s.on('/doodle', function (req, resp) { - if (req.headers['x-oneline-proxy']) { - resp.setHeader('x-oneline-proxy', 'yup') - } - resp.writeHead('200', {'content-type':'image/jpeg'}) - fs.createReadStream(path.join(__dirname, 'googledoodle.jpg')).pipe(resp) - }) - s.on('/onelineproxy', function (req, resp) { - var x = request('http://localhost:3453/doodle') - req.pipe(x) - x.pipe(resp) - }) - - counter++ - fs.createReadStream(__filename).pipe(request.put('http://localhost:3453/pushjs')) - - counter++ - request.get('http://localhost:3453/cat').pipe(request.put('http://localhost:3453/cat')) - - counter++ - request.get('http://localhost:3453/catresp', function (e, resp, body) { - assert.equal(resp.headers['content-type'], 'text/plain-test'); - assert.equal(resp.headers['content-length'], 4) - check(); - }) - - var doodleWrite = fs.createWriteStream(path.join(__dirname, 'test.jpg')) - - counter++ - request.get('http://localhost:3453/doodle').pipe(doodleWrite) - - doodleWrite.on('close', function () { - assert.deepEqual(fs.readFileSync(path.join(__dirname, 'googledoodle.jpg')), fs.readFileSync(path.join(__dirname, 'test.jpg'))) - check() - }) - - process.on('exit', function () { - fs.unlinkSync(path.join(__dirname, 'test.jpg')) - }) - - counter++ - request.get({uri:'http://localhost:3453/onelineproxy', headers:{'x-oneline-proxy':'nope'}}, function (err, resp, body) { - assert.equal(resp.headers['x-oneline-proxy'], 'yup') - check() - }) - - s.on('/afterresponse', function (req, resp) { - resp.write('d') - resp.end() - }) - - counter++ - var afterresp = request.post('http://localhost:3453/afterresponse').on('response', function () { - var v = new ValidationStream('d') - afterresp.pipe(v) - v.on('end', check) - }) - - s.on('/forward1', function (req, resp) { - resp.writeHead(302, {location:'/forward2'}) - resp.end() - }) - s.on('/forward2', function (req, resp) { - resp.writeHead('200', {'content-type':'image/png'}) - resp.write('d') - resp.end() - }) - - counter++ - var validateForward = new ValidationStream('d') - validateForward.on('end', check) - request.get('http://localhost:3453/forward1').pipe(validateForward) - - // Test pipe options - s.once('/opts', server.createGetResponse('opts response')); - - var optsStream = new stream.Stream(); - optsStream.writable = true - - var optsData = ''; - optsStream.write = function (buf) { - optsData += buf; - if (optsData === 'opts response') { - setTimeout(check, 10); - } - } - - optsStream.end = function () { - assert.fail('end called') - }; - - counter++ - request({url:'http://localhost:3453/opts'}).pipe(optsStream, { end : false }) -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-pool.js b/src/extensibility/node/node_modules/request/tests/test-pool.js deleted file mode 100644 index 791ee8b9398..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-pool.js +++ /dev/null @@ -1,16 +0,0 @@ -var request = require('../index') - , http = require('http') - , assert = require('assert') - ; - -var s = http.createServer(function (req, resp) { - resp.statusCode = 200; - resp.end('asdf'); -}).listen(8080, function () { - request({'url': 'http://localhost:8080', 'pool': false}, function (e, resp) { - var agent = resp.request.agent; - assert.strictEqual(typeof agent, 'boolean'); - assert.strictEqual(agent, false); - s.close(); - }); -}); \ No newline at end of file diff --git a/src/extensibility/node/node_modules/request/tests/test-protocol-changing-redirect.js b/src/extensibility/node/node_modules/request/tests/test-protocol-changing-redirect.js deleted file mode 100644 index 7e83a41bd90..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-protocol-changing-redirect.js +++ /dev/null @@ -1,61 +0,0 @@ -var server = require('./server') - , assert = require('assert') - , request = require('../index') - - -var s = server.createServer() -var ss = server.createSSLServer() -var sUrl = 'http://localhost:' + s.port -var ssUrl = 'https://localhost:' + ss.port - -s.listen(s.port, bouncy(s, ssUrl)) -ss.listen(ss.port, bouncy(ss, sUrl)) - -var hits = {} -var expect = {} -var pending = 0 -function bouncy (s, server) { return function () { - - var redirs = { a: 'b' - , b: 'c' - , c: 'd' - , d: 'e' - , e: 'f' - , f: 'g' - , g: 'h' - , h: 'end' } - - var perm = true - Object.keys(redirs).forEach(function (p) { - var t = redirs[p] - - // switch type each time - var type = perm ? 301 : 302 - perm = !perm - s.on('/' + p, function (req, res) { - res.writeHead(type, { location: server + '/' + t }) - res.end() - }) - }) - - s.on('/end', function (req, res) { - var h = req.headers['x-test-key'] - hits[h] = true - pending -- - if (pending === 0) done() - }) -}} - -for (var i = 0; i < 5; i ++) { - pending ++ - var val = 'test_' + i - expect[val] = true - request({ url: (i % 2 ? sUrl : ssUrl) + '/a' - , headers: { 'x-test-key': val } - , rejectUnauthorized: false }) -} - -function done () { - assert.deepEqual(hits, expect) - process.exit(0) -} diff --git a/src/extensibility/node/node_modules/request/tests/test-proxy.js b/src/extensibility/node/node_modules/request/tests/test-proxy.js deleted file mode 100644 index e183d68d172..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-proxy.js +++ /dev/null @@ -1,39 +0,0 @@ -var server = require('./server') - , events = require('events') - , stream = require('stream') - , assert = require('assert') - , fs = require('fs') - , request = require('../index') - , path = require('path') - , util = require('util') - ; - -var port = 6768 - , called = false - , proxiedHost = 'google.com' - ; - -var s = server.createServer(port) -s.listen(port, function () { - s.on('http://google.com/', function (req, res) { - called = true - assert.equal(req.headers.host, proxiedHost) - res.writeHeader(200) - res.end() - }) - request ({ - url: 'http://'+proxiedHost, - proxy: 'http://localhost:'+port - /* - //should behave as if these arguments where passed: - url: 'http://localhost:'+port, - headers: {host: proxiedHost} - //*/ - }, function (err, res, body) { - s.close() - }) -}) - -process.on('exit', function () { - assert.ok(called, 'the request must be made to the proxy server') -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-qs.js b/src/extensibility/node/node_modules/request/tests/test-qs.js deleted file mode 100644 index 65958e6a322..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-qs.js +++ /dev/null @@ -1,42 +0,0 @@ -var request = request = require('../index') - , assert = require('assert') - ; - - -// Test adding a querystring -var req1 = request.get({ uri: 'http://www.google.com', qs: { q : 'search' }}) -setTimeout(function() { - assert.equal('/?q=search', req1.path) -}, 1) - -// Test replacing a querystring value -var req2 = request.get({ uri: 'http://www.google.com?q=abc', qs: { q : 'search' }}) -setTimeout(function() { - assert.equal('/?q=search', req2.path) -}, 1) - -// Test appending a querystring value to the ones present in the uri -var req3 = request.get({ uri: 'http://www.google.com?x=y', qs: { q : 'search' }}) -setTimeout(function() { - assert.equal('/?x=y&q=search', req3.path) -}, 1) - -// Test leaving a querystring alone -var req4 = request.get({ uri: 'http://www.google.com?x=y'}) -setTimeout(function() { - assert.equal('/?x=y', req4.path) -}, 1) - -// Test giving empty qs property -var req5 = request.get({ uri: 'http://www.google.com', qs: {}}) -setTimeout(function(){ - assert.equal('/', req5.path) -}, 1) - - -// Test modifying the qs after creating the request -var req6 = request.get({ uri: 'http://www.google.com', qs: {}}); -req6.qs({ q: "test" }); -process.nextTick(function() { - assert.equal('/?q=test', req6.path); -}); diff --git a/src/extensibility/node/node_modules/request/tests/test-redirect.js b/src/extensibility/node/node_modules/request/tests/test-redirect.js deleted file mode 100644 index cdd46066695..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-redirect.js +++ /dev/null @@ -1,155 +0,0 @@ -var server = require('./server') - , assert = require('assert') - , request = require('../index') - , Cookie = require('cookie-jar') - , Jar = Cookie.Jar - ; - -var s = server.createServer() - -s.listen(s.port, function () { - var server = 'http://localhost:' + s.port; - var hits = {} - var passed = 0; - - bouncer(301, 'temp') - bouncer(302, 'perm') - bouncer(302, 'nope') - - function bouncer(code, label) { - var landing = label+'_landing'; - - s.on('/'+label, function (req, res) { - hits[label] = true; - res.writeHead(code, { - 'location':server + '/'+landing, - 'set-cookie': 'ham=eggs' - }) - res.end() - }) - - s.on('/'+landing, function (req, res) { - if (req.method !== 'GET') { // We should only accept GET redirects - console.error("Got a non-GET request to the redirect destination URL"); - res.writeHead(400); - res.end(); - return; - } - // Make sure the cookie doesn't get included twice, see #139: - // Make sure cookies are set properly after redirect - assert.equal(req.headers.cookie, 'foo=bar; quux=baz; ham=eggs'); - hits[landing] = true; - res.writeHead(200) - res.end(landing) - }) - } - - // Permanent bounce - var jar = new Jar() - jar.add(new Cookie('quux=baz')) - request({uri: server+'/perm', jar: jar, headers: {cookie: 'foo=bar'}}, function (er, res, body) { - if (er) throw er - if (res.statusCode !== 200) throw new Error('Status is not 200: '+res.statusCode) - assert.ok(hits.perm, 'Original request is to /perm') - assert.ok(hits.perm_landing, 'Forward to permanent landing URL') - assert.equal(body, 'perm_landing', 'Got permanent landing content') - passed += 1 - done() - }) - - // Temporary bounce - request({uri: server+'/temp', jar: jar, headers: {cookie: 'foo=bar'}}, function (er, res, body) { - if (er) throw er - if (res.statusCode !== 200) throw new Error('Status is not 200: '+res.statusCode) - assert.ok(hits.temp, 'Original request is to /temp') - assert.ok(hits.temp_landing, 'Forward to temporary landing URL') - assert.equal(body, 'temp_landing', 'Got temporary landing content') - passed += 1 - done() - }) - - // Prevent bouncing. - request({uri:server+'/nope', jar: jar, headers: {cookie: 'foo=bar'}, followRedirect:false}, function (er, res, body) { - if (er) throw er - if (res.statusCode !== 302) throw new Error('Status is not 302: '+res.statusCode) - assert.ok(hits.nope, 'Original request to /nope') - assert.ok(!hits.nope_landing, 'No chasing the redirect') - assert.equal(res.statusCode, 302, 'Response is the bounce itself') - passed += 1 - done() - }) - - // Should not follow post redirects by default - request.post(server+'/temp', { jar: jar, headers: {cookie: 'foo=bar'}}, function (er, res, body) { - if (er) throw er - if (res.statusCode !== 301) throw new Error('Status is not 301: '+res.statusCode) - assert.ok(hits.temp, 'Original request is to /temp') - assert.ok(!hits.temp_landing, 'No chasing the redirect when post') - assert.equal(res.statusCode, 301, 'Response is the bounce itself') - passed += 1 - done() - }) - - // Should follow post redirects when followAllRedirects true - request.post({uri:server+'/temp', followAllRedirects:true, jar: jar, headers: {cookie: 'foo=bar'}}, function (er, res, body) { - if (er) throw er - if (res.statusCode !== 200) throw new Error('Status is not 200: '+res.statusCode) - assert.ok(hits.temp, 'Original request is to /temp') - assert.ok(hits.temp_landing, 'Forward to temporary landing URL') - assert.equal(body, 'temp_landing', 'Got temporary landing content') - passed += 1 - done() - }) - - request.post({uri:server+'/temp', followAllRedirects:false, jar: jar, headers: {cookie: 'foo=bar'}}, function (er, res, body) { - if (er) throw er - if (res.statusCode !== 301) throw new Error('Status is not 301: '+res.statusCode) - assert.ok(hits.temp, 'Original request is to /temp') - assert.ok(!hits.temp_landing, 'No chasing the redirect') - assert.equal(res.statusCode, 301, 'Response is the bounce itself') - passed += 1 - done() - }) - - // Should not follow delete redirects by default - request.del(server+'/temp', { jar: jar, headers: {cookie: 'foo=bar'}}, function (er, res, body) { - if (er) throw er - if (res.statusCode < 301) throw new Error('Status is not a redirect.') - assert.ok(hits.temp, 'Original request is to /temp') - assert.ok(!hits.temp_landing, 'No chasing the redirect when delete') - assert.equal(res.statusCode, 301, 'Response is the bounce itself') - passed += 1 - done() - }) - - // Should not follow delete redirects even if followRedirect is set to true - request.del(server+'/temp', { followRedirect: true, jar: jar, headers: {cookie: 'foo=bar'}}, function (er, res, body) { - if (er) throw er - if (res.statusCode !== 301) throw new Error('Status is not 301: '+res.statusCode) - assert.ok(hits.temp, 'Original request is to /temp') - assert.ok(!hits.temp_landing, 'No chasing the redirect when delete') - assert.equal(res.statusCode, 301, 'Response is the bounce itself') - passed += 1 - done() - }) - - // Should follow delete redirects when followAllRedirects true - request.del(server+'/temp', {followAllRedirects:true, jar: jar, headers: {cookie: 'foo=bar'}}, function (er, res, body) { - if (er) throw er - if (res.statusCode !== 200) throw new Error('Status is not 200: '+res.statusCode) - assert.ok(hits.temp, 'Original request is to /temp') - assert.ok(hits.temp_landing, 'Forward to temporary landing URL') - assert.equal(body, 'temp_landing', 'Got temporary landing content') - passed += 1 - done() - }) - - var reqs_done = 0; - function done() { - reqs_done += 1; - if(reqs_done == 9) { - console.log(passed + ' tests passed.') - s.close() - } - } -}) diff --git a/src/extensibility/node/node_modules/request/tests/test-s3.js b/src/extensibility/node/node_modules/request/tests/test-s3.js deleted file mode 100644 index 0f6a832b6da..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-s3.js +++ /dev/null @@ -1,13 +0,0 @@ -var request = require('../index') - -var r = request.get('https://log.curlybracecast.com.s3.amazonaws.com/', - { aws: - { key: 'AKIAI6KIQRRVMGK3WK5Q' - , secret: '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' - , bucket: 'log.curlybracecast.com' - } - }, function (e, resp, body) { - console.log(r.headers) - console.log(body) - } -) \ No newline at end of file diff --git a/src/extensibility/node/node_modules/request/tests/test-timeout.js b/src/extensibility/node/node_modules/request/tests/test-timeout.js deleted file mode 100644 index 70363670ff8..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-timeout.js +++ /dev/null @@ -1,87 +0,0 @@ -var server = require('./server') - , events = require('events') - , stream = require('stream') - , assert = require('assert') - , request = require('../index') - ; - -var s = server.createServer(); -var expectedBody = "waited"; -var remainingTests = 5; - -s.listen(s.port, function () { - // Request that waits for 200ms - s.on('/timeout', function (req, resp) { - setTimeout(function(){ - resp.writeHead(200, {'content-type':'text/plain'}) - resp.write(expectedBody) - resp.end() - }, 200); - }); - - // Scenario that should timeout - var shouldTimeout = { - url: s.url + "/timeout", - timeout:100 - } - - - request(shouldTimeout, function (err, resp, body) { - assert.equal(err.code, "ETIMEDOUT"); - checkDone(); - }) - - - // Scenario that shouldn't timeout - var shouldntTimeout = { - url: s.url + "/timeout", - timeout:300 - } - - request(shouldntTimeout, function (err, resp, body) { - assert.equal(err, null); - assert.equal(expectedBody, body) - checkDone(); - }) - - // Scenario with no timeout set, so shouldn't timeout - var noTimeout = { - url: s.url + "/timeout" - } - - request(noTimeout, function (err, resp, body) { - assert.equal(err); - assert.equal(expectedBody, body) - checkDone(); - }) - - // Scenario with a negative timeout value, should be treated a zero or the minimum delay - var negativeTimeout = { - url: s.url + "/timeout", - timeout:-1000 - } - - request(negativeTimeout, function (err, resp, body) { - assert.equal(err.code, "ETIMEDOUT"); - checkDone(); - }) - - // Scenario with a float timeout value, should be rounded by setTimeout anyway - var floatTimeout = { - url: s.url + "/timeout", - timeout: 100.76 - } - - request(floatTimeout, function (err, resp, body) { - assert.equal(err.code, "ETIMEDOUT"); - checkDone(); - }) - - function checkDone() { - if(--remainingTests == 0) { - s.close(); - console.log("All tests passed."); - } - } -}) - diff --git a/src/extensibility/node/node_modules/request/tests/test-toJSON.js b/src/extensibility/node/node_modules/request/tests/test-toJSON.js deleted file mode 100644 index 6d5f92aaa56..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-toJSON.js +++ /dev/null @@ -1,14 +0,0 @@ -var request = require('../index') - , http = require('http') - , assert = require('assert') - ; - -var s = http.createServer(function (req, resp) { - resp.statusCode = 200 - resp.end('asdf') -}).listen(8080, function () { - var r = request('http://localhost:8080', function (e, resp) { - assert.equal(JSON.parse(JSON.stringify(r)).response.statusCode, 200) - s.close() - }) -}) \ No newline at end of file diff --git a/src/extensibility/node/node_modules/request/tests/test-tunnel.js b/src/extensibility/node/node_modules/request/tests/test-tunnel.js deleted file mode 100644 index 2ee3f393ed7..00000000000 --- a/src/extensibility/node/node_modules/request/tests/test-tunnel.js +++ /dev/null @@ -1,75 +0,0 @@ -// test that we can tunnel a https request over an http proxy -// keeping all the CA and whatnot intact. -// -// Note: this requires that squid is installed. -// If the proxy fails to start, we'll just log a warning and assume success. - -var server = require('./server') - , assert = require('assert') - , request = require('../index') - , fs = require('fs') - , path = require('path') - , caFile = path.resolve(__dirname, 'ssl/npm-ca.crt') - , ca = fs.readFileSync(caFile) - , child_process = require('child_process') - , sqConf = path.resolve(__dirname, 'squid.conf') - , sqArgs = ['-f', sqConf, '-N', '-d', '5'] - , proxy = 'http://localhost:3128' - , hadError = null - -var squid = child_process.spawn('squid', sqArgs); -var ready = false - -squid.stderr.on('data', function (c) { - console.error('SQUIDERR ' + c.toString().trim().split('\n') - .join('\nSQUIDERR ')) - ready = c.toString().match(/ready to serve requests|Accepting HTTP Socket connections/i) -}) - -squid.stdout.on('data', function (c) { - console.error('SQUIDOUT ' + c.toString().trim().split('\n') - .join('\nSQUIDOUT ')) -}) - -squid.on('error', function (c) { - console.error('squid: error '+c) - if (c && !ready) { - notInstalled() - return - } -}) - -squid.on('exit', function (c) { - console.error('squid: exit '+c) - if (c && !ready) { - notInstalled() - return - } - - if (c) { - hadError = hadError || new Error('Squid exited with '+c) - } - if (hadError) throw hadError -}) - -setTimeout(function F () { - if (!ready) return setTimeout(F, 100) - request({ uri: 'https://registry.npmjs.org/' - , proxy: 'http://localhost:3128' - , strictSSL: true - , ca: ca - , json: true }, function (er, body) { - hadError = er - console.log(er || typeof body) - if (!er) console.log("ok") - squid.kill('SIGKILL') - }) -}, 100) - -function notInstalled() { - console.error('squid must be installed to run this test.') - console.error('skipping this test. please install squid and run again if you need to test tunneling.') - c = null - hadError = null - process.exit(0) -} diff --git a/src/extensibility/node/node_modules/request/tests/unicycle.jpg b/src/extensibility/node/node_modules/request/tests/unicycle.jpg deleted file mode 100644 index 7cea4dd71dc41cd51c84bfcec6b3e65c15a58507..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19806 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 From 191674d09ac21ff620612cec9899fd3b7fad65c3 Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Fri, 18 Oct 2013 08:17:33 -0400 Subject: [PATCH 0231/1140] Add Request tests to gitignore so that they're not automatically re-included on the next update. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 21e3cd82bb4..4a6d4ec304e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ test/results # PhpStorm .idea + +# Files that can be automatically downloaded that we don't want to ship with our builds +src/extensibility/node/node_modules/request/tests/ From d5c46c6d49e69d2994b8f1a959b9b946f32d1daa Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Fri, 18 Oct 2013 15:08:09 +0200 Subject: [PATCH 0232/1140] Add newline to end of file --- .../default/InlineBezierCurveEditor/EmbeddedStyles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css b/src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css index 29d37e8c744..47974261a8c 100644 --- a/src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css +++ b/src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css @@ -12,4 +12,4 @@ .bezier-curve-editor .coordinate-plane:hover:after { content: '{{INLINE_BEZIER_EDITOR_TIME}} (' attr(data-time) '%)'; -} \ No newline at end of file +} From 6edb92fec5c5772adbb6b0b10b61a4e5aec76d14 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Fri, 18 Oct 2013 15:10:00 +0200 Subject: [PATCH 0233/1140] Fix JSLint error --- src/extensions/default/InlineBezierCurveEditor/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/InlineBezierCurveEditor/main.js b/src/extensions/default/InlineBezierCurveEditor/main.js index 6db1894263a..f55a8b02bcd 100644 --- a/src/extensions/default/InlineBezierCurveEditor/main.js +++ b/src/extensions/default/InlineBezierCurveEditor/main.js @@ -41,7 +41,7 @@ */ /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */ -/*global define, brackets, $, window */ +/*global define, brackets, $, window, Mustache */ define(function (require, exports, module) { "use strict"; From bc73b2da9f5fe555cf76f8025caf31a895c56ca3 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Fri, 18 Oct 2013 15:22:40 +0200 Subject: [PATCH 0234/1140] Add german translation for creating a new css rule in inline editor --- src/nls/de/strings.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 8c0acd37b0d..b4cdccd3766 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -333,6 +333,9 @@ define({ "BASEURL_ERROR_INVALID_CHAR" : "Sonderzeichen wie \"{0}\" müssen %-kodiert werden.", "BASEURL_ERROR_UNKNOWN_ERROR" : "Unbekannter Fehler beim Verarbeiten der Basis-URL", + // CSS Quick Edit + "BUTTON_NEW_RULE" : "Neue Regel", + // Extension Management strings "INSTALL" : "Installieren", "UPDATE" : "Updaten", @@ -410,6 +413,10 @@ define({ "EXTENSIONS_AVAILABLE_TITLE" : "Verfügbar", "EXTENSIONS_UPDATES_TITLE" : "Updates", + "INLINE_EDITOR_NO_MATCHES" : "Keine Ergebnisse verfügbar.", + "CSS_QUICK_EDIT_NO_MATCHES" : "Es gibt keine CSS-Regeln, die zu Ihrer Auswahl passen.
    Klicken Sie auf \"Neue Regel\", um eine neue Regel zu erstellen.", + "CSS_QUICK_EDIT_NO_STYLESHEETS" : "Es gibt keine Stylesheets in Ihrem Projekt.
    Erstellen Sie eines, um CSS-Regeln hinzuzufügen.", + /** * Unit names */ From 931e8d3a086479f520985cdc0344cff2ec1282aa Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Thu, 17 Oct 2013 19:48:43 -0700 Subject: [PATCH 0235/1140] FileSystem singleton cleanup. Clear cached data on file system change notification. --- src/filesystem/Directory.js | 2 + src/filesystem/FileSystem.js | 4 +- src/filesystem/FileSystemEntry.js | 8 +- src/project/ProjectManager.js | 156 +++++++++++++----------------- 4 files changed, 74 insertions(+), 96 deletions(-) diff --git a/src/filesystem/Directory.js b/src/filesystem/Directory.js index 59e4e6fc5e4..4351b3e0b82 100644 --- a/src/filesystem/Directory.js +++ b/src/filesystem/Directory.js @@ -90,6 +90,8 @@ define(function (require, exports, module) { } else { entry = this._fileSystem.getDirectoryForPath(entryPath); } + entry._stat = stats[i]; + entry._contents = undefined; this._contents.push(entry); } diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js index 22fa1c3b6e1..2fa7963a10f 100644 --- a/src/filesystem/FileSystem.js +++ b/src/filesystem/FileSystem.js @@ -410,7 +410,7 @@ define(function (require, exports, module) { FileSystem.prototype._entryRenamed = function (oldName, newName, isDirectory) { // Update all affected entries in the index this._index.entryRenamed(oldName, newName, isDirectory); - $(this).trigger("rename", [oldName, newName]); + $(exports).trigger("rename", [oldName, newName]); console.log("rename: ", oldName, newName); }; @@ -471,7 +471,7 @@ define(function (require, exports, module) { var fireChangeEvent = function () { // Trigger a change event - $(this).trigger("change", entry); + $(exports).trigger("change", entry); console.log("change: ", entry); }.bind(this); diff --git a/src/filesystem/FileSystemEntry.js b/src/filesystem/FileSystemEntry.js index 73de7b1894d..acc13f4bbde 100644 --- a/src/filesystem/FileSystemEntry.js +++ b/src/filesystem/FileSystemEntry.js @@ -40,7 +40,6 @@ define(function (require, exports, module) { function FileSystemEntry(path, fileSystem) { this._path = path; this._fileSystem = fileSystem; -// this._impl = fileSystem._impl; this._id = nextId++; } @@ -67,7 +66,7 @@ define(function (require, exports, module) { }, "_impl": { get: function () { return this._fileSystem._impl; }, - set: function (val) { console.log("trying to set _impl"); } + set: function (val) { throw new Error("Cannot set _impl"); } } }); @@ -80,11 +79,6 @@ define(function (require, exports, module) { * Parent file system. */ FileSystemEntry.prototype._fileSystem = null; - - /** - * Low level file system implementation. - */ - FileSystemEntry.prototype._impl = null; /** * The path of this entry. diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 46fb92441f4..a36991bf8fa 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -907,22 +907,6 @@ define(function (require, exports, module) { _unwatchProjectRoot(); } - - function ensureFileSystem() { - var fsResult = new $.Deferred(); - if (FileSystem) { - fsResult.resolve(); - } /* else { - TODO: remove me - FileSystemManager.createFileSystem(filesystem, function (err, fs) { - // TODO: check err? - _fileSystem = fs; - fsResult.resolve(); - }); - } */ - - return fsResult.promise(); - } // Clear project path map _projectInitialLoad = { @@ -939,81 +923,79 @@ define(function (require, exports, module) { // Populate file tree as long as we aren't running in the browser if (!brackets.inBrowser) { - ensureFileSystem().done(function () { - if (!isUpdating) { - _watchProjectRoot(rootPath); - } - // Point at a real folder structure on local disk - var rootEntry = FileSystem.getDirectoryForPath(rootPath); - rootEntry.exists(function (exists) { - if (exists) { - var projectRootChanged = (!_projectRoot || !rootEntry) || - _projectRoot.fullPath !== rootEntry.fullPath; - var i; - - // Success! - var perfTimerName = PerfUtils.markStart("Load Project: " + rootPath), - canonPath = FileUtils.canonicalizeFolderPath(rootPath); - - _projectRoot = rootEntry; - _projectBaseUrl = _prefs.getValue(_getBaseUrlKey()) || ""; - - // If this is the current welcome project, record it. In future launches, we always - // want to substitute the welcome project for the current build instead of using an - // outdated one (when loading recent projects or the last opened project). - if (canonPath === _getWelcomeProjectPath()) { - var welcomeProjects = _prefs.getValue("welcomeProjects") || []; - if (welcomeProjects.indexOf(canonPath) === -1) { - welcomeProjects.push(canonPath); - _prefs.setValue("welcomeProjects", welcomeProjects); - } + if (!isUpdating) { + _watchProjectRoot(rootPath); + } + // Point at a real folder structure on local disk + var rootEntry = FileSystem.getDirectoryForPath(rootPath); + rootEntry.exists(function (exists) { + if (exists) { + var projectRootChanged = (!_projectRoot || !rootEntry) || + _projectRoot.fullPath !== rootEntry.fullPath; + var i; + + // Success! + var perfTimerName = PerfUtils.markStart("Load Project: " + rootPath), + canonPath = FileUtils.canonicalizeFolderPath(rootPath); + + _projectRoot = rootEntry; + _projectBaseUrl = _prefs.getValue(_getBaseUrlKey()) || ""; + + // If this is the current welcome project, record it. In future launches, we always + // want to substitute the welcome project for the current build instead of using an + // outdated one (when loading recent projects or the last opened project). + if (canonPath === _getWelcomeProjectPath()) { + var welcomeProjects = _prefs.getValue("welcomeProjects") || []; + if (welcomeProjects.indexOf(canonPath) === -1) { + welcomeProjects.push(canonPath); + _prefs.setValue("welcomeProjects", welcomeProjects); } - - // The tree will invoke our "data provider" function to populate the top-level items, then - // go idle until a node is expanded - at which time it'll call us again to fetch the node's - // immediate children, and so on. - resultRenderTree = _renderTree(_treeDataProvider); - - resultRenderTree.always(function () { - if (projectRootChanged) { - // Allow asynchronous event handlers to finish before resolving result by collecting promises from them - var promises = []; - $(exports).triggerHandler({ type: "projectOpen", promises: promises }, [_projectRoot]); - $.when.apply($, promises).then(result.resolve, result.reject); - } else { - result.resolve(); - } - }); - resultRenderTree.fail(function () { + } + + // The tree will invoke our "data provider" function to populate the top-level items, then + // go idle until a node is expanded - at which time it'll call us again to fetch the node's + // immediate children, and so on. + resultRenderTree = _renderTree(_treeDataProvider); + + resultRenderTree.always(function () { + if (projectRootChanged) { + // Allow asynchronous event handlers to finish before resolving result by collecting promises from them + var promises = []; + $(exports).triggerHandler({ type: "projectOpen", promises: promises }, [_projectRoot]); + $.when.apply($, promises).then(result.resolve, result.reject); + } else { + result.resolve(); + } + }); + resultRenderTree.fail(function () { // PerfUtils.terminateMeasurement(perfTimerName); + result.reject(); + }); + resultRenderTree.always(function () { + PerfUtils.addMeasurement(perfTimerName); + }); + } else { + Dialogs.showModalDialog( + DefaultDialogs.DIALOG_ID_ERROR, + Strings.ERROR_LOADING_PROJECT, + StringUtils.format( + Strings.REQUEST_NATIVE_FILE_SYSTEM_ERROR, + StringUtils.breakableUrl(rootPath), + Error.NOT_FOUND + ) + ).done(function () { + // The project folder stored in preference doesn't exist, so load the default + // project directory. + // TODO (issue #267): When Brackets supports having no project directory + // defined this code will need to change + _loadProject(_getWelcomeProjectPath()).always(function () { + // Make sure not to reject the original deferred until the fallback + // project is loaded, so we don't violate expectations that there is always + // a current project before continuing after _loadProject(). result.reject(); }); - resultRenderTree.always(function () { - PerfUtils.addMeasurement(perfTimerName); - }); - } else { - Dialogs.showModalDialog( - DefaultDialogs.DIALOG_ID_ERROR, - Strings.ERROR_LOADING_PROJECT, - StringUtils.format( - Strings.REQUEST_NATIVE_FILE_SYSTEM_ERROR, - StringUtils.breakableUrl(rootPath), - Error.NOT_FOUND - ) - ).done(function () { - // The project folder stored in preference doesn't exist, so load the default - // project directory. - // TODO (issue #267): When Brackets supports having no project directory - // defined this code will need to change - _loadProject(_getWelcomeProjectPath()).always(function () { - // Make sure not to reject the original deferred until the fallback - // project is loaded, so we don't violate expectations that there is always - // a current project before continuing after _loadProject(). - result.reject(); - }); - }); - } - }); + }); + } }); } return result.promise(); From e14229507004287e6c614cdf3162b65f1b7b9046 Mon Sep 17 00:00:00 2001 From: Ian Wehrman Date: Fri, 18 Oct 2013 10:18:09 -0700 Subject: [PATCH 0236/1140] Bump Tern submodule to include a patch for crashing bug caused by the filesystem code --- src/extensions/default/JavaScriptCodeHints/thirdparty/tern | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern index 5fa9000f6d7..91a696a04b8 160000 --- a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern +++ b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern @@ -1 +1 @@ -Subproject commit 5fa9000f6d7f7f1736824f7bc76c4e2da30c58ff +Subproject commit 91a696a04b8de5c04b7c9f288ab940bbda124d66 From 4c706dde8ec0511027d23bf3c2f8c80ed6153a3c Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Fri, 18 Oct 2013 19:57:03 +0200 Subject: [PATCH 0237/1140] Rename EmbeddedStyles.css to Localized.css --- .../{EmbeddedStyles.css => Localized.css} | 0 src/extensions/default/InlineBezierCurveEditor/main.js | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/extensions/default/InlineBezierCurveEditor/{EmbeddedStyles.css => Localized.css} (100%) diff --git a/src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css b/src/extensions/default/InlineBezierCurveEditor/Localized.css similarity index 100% rename from src/extensions/default/InlineBezierCurveEditor/EmbeddedStyles.css rename to src/extensions/default/InlineBezierCurveEditor/Localized.css diff --git a/src/extensions/default/InlineBezierCurveEditor/main.js b/src/extensions/default/InlineBezierCurveEditor/main.js index f55a8b02bcd..301750bf8b0 100644 --- a/src/extensions/default/InlineBezierCurveEditor/main.js +++ b/src/extensions/default/InlineBezierCurveEditor/main.js @@ -53,7 +53,7 @@ define(function (require, exports, module) { InlineBezierCurveEditor = require("InlineBezierCurveEditor").InlineBezierCurveEditor, BezierCurveUtils = require("BezierCurveUtils"), - EmbeddedStyles = require("text!EmbeddedStyles.css"); + Localized = require("text!Localized.css"); // Functions @@ -154,7 +154,7 @@ define(function (require, exports, module) { function init() { // Load our stylesheet ExtensionUtils.loadStyleSheet(module, "main.css"); - ExtensionUtils.addEmbeddedStyleSheet(Mustache.render(EmbeddedStyles, Strings)); + ExtensionUtils.addEmbeddedStyleSheet(Mustache.render(Localized, Strings)); EditorManager.registerInlineEditProvider(inlineBezierCurveEditorProvider); } From 1207256393c556dcb170fd4830e65d5e00520cfd Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Fri, 18 Oct 2013 11:53:50 -0700 Subject: [PATCH 0238/1140] Add menu item/keyboard shortcut for New Rule. Also properly enable/disable other inline-editor-specific commands in the menu. --- src/base-config/keyboard.json | 3 + src/command/Commands.js | 1 + src/command/DefaultMenus.js | 1 + src/editor/CSSInlineEditor.js | 83 ++++++++++++++++++++++------ src/editor/MultiRangeInlineEditor.js | 40 ++++++++++++-- src/nls/root/strings.js | 1 + 6 files changed, 105 insertions(+), 24 deletions(-) diff --git a/src/base-config/keyboard.json b/src/base-config/keyboard.json index db3da33c91b..38ebb24850e 100644 --- a/src/base-config/keyboard.json +++ b/src/base-config/keyboard.json @@ -270,6 +270,9 @@ "displayKey": "Alt-↓" } ], + "navigate.newRule": [ + "Cmd-Alt-N" + ], "file.rename": [ "F2" ] diff --git a/src/command/Commands.js b/src/command/Commands.js index 89061d93e01..428bfb4bdb2 100644 --- a/src/command/Commands.js +++ b/src/command/Commands.js @@ -116,6 +116,7 @@ define(function (require, exports, module) { exports.TOGGLE_QUICK_DOCS = "navigate.toggleQuickDocs"; // EditorManager.js _toggleInlineWidget() exports.QUICK_EDIT_NEXT_MATCH = "navigate.nextMatch"; // MultiRangeInlineEditor.js _nextRange() exports.QUICK_EDIT_PREV_MATCH = "navigate.previousMatch"; // MultiRangeInlineEditor.js _previousRange() + exports.CSS_QUICK_EDIT_NEW_RULE = "navigate.newRule"; // CSSInlineEditor.js _handleNewRule() // HELP exports.HELP_CHECK_FOR_UPDATE = "help.checkForUpdate"; // HelpCommandHandlers.js _handleCheckForUpdates() diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js index 284e647d697..8b8b6517bfc 100644 --- a/src/command/DefaultMenus.js +++ b/src/command/DefaultMenus.js @@ -137,6 +137,7 @@ define(function (require, exports, module) { menu.addMenuItem(Commands.TOGGLE_QUICK_EDIT); menu.addMenuItem(Commands.QUICK_EDIT_PREV_MATCH); menu.addMenuItem(Commands.QUICK_EDIT_NEXT_MATCH); + menu.addMenuItem(Commands.CSS_QUICK_EDIT_NEW_RULE); menu.addMenuDivider(); menu.addMenuItem(Commands.TOGGLE_QUICK_DOCS); diff --git a/src/editor/CSSInlineEditor.js b/src/editor/CSSInlineEditor.js index ae0ac004daf..cf20ec81dbc 100644 --- a/src/editor/CSSInlineEditor.js +++ b/src/editor/CSSInlineEditor.js @@ -30,6 +30,8 @@ define(function (require, exports, module) { // Load dependent modules var CSSUtils = require("language/CSSUtils"), + CommandManager = require("command/CommandManager"), + Commands = require("command/Commands"), DocumentManager = require("document/DocumentManager"), DropdownEventHandler = require("utils/DropdownEventHandler").DropdownEventHandler, EditorManager = require("editor/EditorManager"), @@ -37,11 +39,15 @@ define(function (require, exports, module) { FileIndexManager = require("project/FileIndexManager"), HTMLUtils = require("language/HTMLUtils"), Menus = require("command/Menus"), - MultiRangeInlineEditor = require("editor/MultiRangeInlineEditor").MultiRangeInlineEditor, + MultiRangeInlineEditor = require("editor/MultiRangeInlineEditor"), PopUpManager = require("widgets/PopUpManager"), - Strings = require("strings"); + Strings = require("strings"), + _ = require("lodash"); var StylesheetsMenuTemplate = require("text!htmlContent/stylesheets-menu.html"); + + var _newRuleCmd, + _newRuleHandlers = []; /** * Given a position in an HTML editor, returns the relevant selector for the attribute/tag @@ -115,7 +121,23 @@ define(function (require, exports, module) { inlineEditor.editor.setCursorPos(newRuleInfo.pos.line, newRuleInfo.pos.ch); }); } - + + /** + * @private + * Handle the "new rule" menu item by dispatching it to the handler for the focused inline editor. + */ + function _handleNewRule() { + var inlineEditor = MultiRangeInlineEditor.getFocusedMultiRangeInlineEditor(); + if (inlineEditor) { + var handlerInfo = _.find(_newRuleHandlers, function (entry) { + return entry.inlineEditor === inlineEditor; + }); + if (handlerInfo) { + handlerInfo.handler(); + } + } + } + /** * This function is registered with EditManager as an inline editor provider. It creates a CSSInlineEditor * when cursor is on an HTML tag name, class attribute, or id attribute, find associated @@ -230,28 +252,49 @@ define(function (require, exports, module) { return result; } + /** + * @private + * Update the enablement of associated menu commands. + */ + function _updateCommands() { + _newRuleCmd.setEnabled(cssInlineEditor.hasFocus() && !$newRuleButton.hasClass("disabled")); + } + + /** + * @private + * Create a new rule on click. + */ + function _handleNewRuleClick(e) { + if (!$newRuleButton.hasClass("disabled")) { + if (cssFileInfos.length === 1) { + // Just go ahead and create the rule. + _addRule(selectorName, cssInlineEditor, cssFileInfos[0].fullPath); + } else if ($dropdown) { + _closeDropdown(); + } else { + _showDropdown(); + } + } + if (e) { + e.stopPropagation(); + } + } + CSSUtils.findMatchingRules(selectorName, hostEditor.document) .done(function (rules) { - cssInlineEditor = new MultiRangeInlineEditor(CSSUtils.consolidateRules(rules) || [], _getNoRulesMsg, CSSUtils.getRangeSelectors); + cssInlineEditor = new MultiRangeInlineEditor.MultiRangeInlineEditor(CSSUtils.consolidateRules(rules) || [], + _getNoRulesMsg, CSSUtils.getRangeSelectors); cssInlineEditor.load(hostEditor); + cssInlineEditor.$htmlContent + .on("focusin", _updateCommands) + .on("focusout", _updateCommands); var $header = $(".inline-editor-header", cssInlineEditor.$htmlContent); $newRuleButton = $("
    {{/isCompatible}} + {{#isCompatible}} + {{^isCompatibleLatest}} +
    + {{#requiresNewer}}{{Strings.EXTENSION_LATEST_INCOMPATIBLE_NEWER}}{{/requiresNewer}} + {{^requiresNewer}}{{Strings.EXTENSION_LATEST_INCOMPATIBLE_OLDER}}{{/requiresNewer}} +
    + {{/isCompatibleLatest}} + {{/isCompatible}} {{metadata.description}} {{^metadata.description}}

    {{Strings.EXTENSION_NO_DESCRIPTION}}

    diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 14f17a3d999..d68894b9dba 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -385,6 +385,9 @@ define({ "EXTENSION_DATE" : "Date", "EXTENSION_INCOMPATIBLE_NEWER" : "This extension requires a newer version of {APP_NAME}.", "EXTENSION_INCOMPATIBLE_OLDER" : "This extension currently only works with older versions of {APP_NAME}.", + "EXTENSION_LATEST_INCOMPATIBLE_NEWER" : "This is an older version of the extension. The latest version requires a newer version of {APP_NAME}.", + "EXTENSION_LATEST_INCOMPATIBLE_OLDER" : "This is an older version of the extension. The latest version only works with older versions of {APP_NAME}.", + "EXTENSION_UPDATE_INCOMPATIBLE" : "Updated versions of this extension require a newer version of {APP_NAME}.", "EXTENSION_NO_DESCRIPTION" : "No description", "EXTENSION_MORE_INFO" : "More info...", "EXTENSION_ERROR" : "Extension error", From 3f9b657d2d18528b7fa6cc72a37ccc5ebdbdde98 Mon Sep 17 00:00:00 2001 From: Peter Flynn Date: Wed, 23 Oct 2013 01:42:52 -0700 Subject: [PATCH 0308/1140] - Disable Update button when latest update available isn't compatible with Brackets (previously was erroneously left enabled in Installed tab). - Clarify in _renderItem() when button is disabled (making it more obvious that its tooltip string is always correct). - Make it more clear that flags like 'context.isCompatible' are specifically referring to the latest version available, not the currently installed version. --- src/extensibility/ExtensionManager.js | 1 + src/extensibility/ExtensionManagerView.js | 16 ++++++----- .../extension-manager-view-item.html | 27 ++++++++++--------- src/nls/root/strings.js | 1 - 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js index 323fd1b65e4..2be508abe76 100644 --- a/src/extensibility/ExtensionManager.js +++ b/src/extensibility/ExtensionManager.js @@ -106,6 +106,7 @@ define(function (require, exports, module) { entry.installInfo.owner = entry.registryInfo.owner; if (entry.installInfo.metadata && entry.installInfo.metadata.version && semver.lt(entry.installInfo.metadata.version, entry.registryInfo.metadata.version)) { + // Note: available update may still be incompatible; we check for this when rendering the Update button in ExtensionManagerView._renderItem() entry.registryInfo.updateAvailable = true; entry.installInfo.updateAvailable = true; } else { diff --git a/src/extensibility/ExtensionManagerView.js b/src/extensibility/ExtensionManagerView.js index 897d71971ab..1f71143a0c3 100644 --- a/src/extensibility/ExtensionManagerView.js +++ b/src/extensibility/ExtensionManagerView.js @@ -193,10 +193,15 @@ define(function (require, exports, module) { context.failedToStart = (entry.installInfo && entry.installInfo.status === ExtensionManager.START_FAILED); context.hasVersionInfo = !!info.versions; - var compatInfo = ExtensionManager.getCompatibilityInfo(info, brackets.metadata.apiVersion); - context.isCompatible = compatInfo.isCompatible; - context.requiresNewer = compatInfo.requiresNewer; - context.isCompatibleLatest = compatInfo.isLatestVersion; + if (entry.registryInfo) { + var latestVerCompatInfo = ExtensionManager.getCompatibilityInfo(entry.registryInfo, brackets.metadata.apiVersion); + context.isCompatible = latestVerCompatInfo.isCompatible; + context.requiresNewer = latestVerCompatInfo.requiresNewer; + context.isCompatibleLatest = latestVerCompatInfo.isLatestVersion; + } else { + context.isCompatible = context.isCompatibleLatest = true; + } + context.isMarkedForRemoval = ExtensionManager.isMarkedForRemoval(info.metadata.name); context.isMarkedForUpdate = ExtensionManager.isMarkedForUpdate(info.metadata.name); @@ -205,8 +210,7 @@ define(function (require, exports, module) { context.allowInstall = context.isCompatible && !context.isInstalled; context.allowRemove = (entry.installInfo && entry.installInfo.locationType === ExtensionManager.LOCATION_USER); - context.allowUpdate = context.isCompatible && context.isInstalled && - !context.isMarkedForUpdate && !context.isMarkedForRemoval; + context.allowUpdate = context.showUpdateButton && context.isCompatible && context.isCompatibleLatest; context.removalAllowed = this.model.source === "installed" && !context.failedToStart && !context.isMarkedForUpdate && !context.isMarkedForRemoval; diff --git a/src/htmlContent/extension-manager-view-item.html b/src/htmlContent/extension-manager-view-item.html index c21dc234427..a2073d990d4 100644 --- a/src/htmlContent/extension-manager-view-item.html +++ b/src/htmlContent/extension-manager-view-item.html @@ -10,20 +10,23 @@ {{/hasVersionInfo}} - {{^isCompatible}} -
    - {{#requiresNewer}}{{Strings.EXTENSION_INCOMPATIBLE_NEWER}}{{/requiresNewer}} - {{^requiresNewer}}{{Strings.EXTENSION_INCOMPATIBLE_OLDER}}{{/requiresNewer}} -
    - {{/isCompatible}} - {{#isCompatible}} - {{^isCompatibleLatest}} + {{#showInstallButton}} + + {{^isCompatible}}
    - {{#requiresNewer}}{{Strings.EXTENSION_LATEST_INCOMPATIBLE_NEWER}}{{/requiresNewer}} - {{^requiresNewer}}{{Strings.EXTENSION_LATEST_INCOMPATIBLE_OLDER}}{{/requiresNewer}} + {{#requiresNewer}}{{Strings.EXTENSION_INCOMPATIBLE_NEWER}}{{/requiresNewer}} + {{^requiresNewer}}{{Strings.EXTENSION_INCOMPATIBLE_OLDER}}{{/requiresNewer}}
    - {{/isCompatibleLatest}} - {{/isCompatible}} + {{/isCompatible}} + {{#isCompatible}} + {{^isCompatibleLatest}} +
    + {{#requiresNewer}}{{Strings.EXTENSION_LATEST_INCOMPATIBLE_NEWER}}{{/requiresNewer}} + {{^requiresNewer}}{{Strings.EXTENSION_LATEST_INCOMPATIBLE_OLDER}}{{/requiresNewer}} +
    + {{/isCompatibleLatest}} + {{/isCompatible}} + {{/showInstallButton}} {{metadata.description}} {{^metadata.description}}

    {{Strings.EXTENSION_NO_DESCRIPTION}}

    diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index d68894b9dba..a102dd061b4 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -387,7 +387,6 @@ define({ "EXTENSION_INCOMPATIBLE_OLDER" : "This extension currently only works with older versions of {APP_NAME}.", "EXTENSION_LATEST_INCOMPATIBLE_NEWER" : "This is an older version of the extension. The latest version requires a newer version of {APP_NAME}.", "EXTENSION_LATEST_INCOMPATIBLE_OLDER" : "This is an older version of the extension. The latest version only works with older versions of {APP_NAME}.", - "EXTENSION_UPDATE_INCOMPATIBLE" : "Updated versions of this extension require a newer version of {APP_NAME}.", "EXTENSION_NO_DESCRIPTION" : "No description", "EXTENSION_MORE_INFO" : "More info...", "EXTENSION_ERROR" : "Extension error", From e2a3a157a8f18a53e8e726ec898ace11e38bdfb0 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Wed, 23 Oct 2013 06:38:31 -0700 Subject: [PATCH 0309/1140] Fix error handling with rename and new file/folder --- src/project/ProjectManager.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index b647a7abd00..6010211716b 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -966,7 +966,7 @@ define(function (require, exports, module) { } }); resultRenderTree.fail(function () { -// PerfUtils.terminateMeasurement(perfTimerName); + PerfUtils.finalizeMeasurement(perfTimerName); result.reject(); }); resultRenderTree.always(function () { @@ -1294,25 +1294,18 @@ define(function (require, exports, module) { result.resolve(entry); }; - var errorCallback = function (error) { + var errorCallback = function (error, entry) { var entryType = isFolder ? Strings.DIRECTORY : Strings.FILE, oppositeEntryType = isFolder ? Strings.FILE : Strings.DIRECTORY; if (error === FileSystemError.ALREADY_EXISTS) { + var useOppositeType = (isFolder === entry.isFile()); Dialogs.showModalDialog( DefaultDialogs.DIALOG_ID_ERROR, StringUtils.format(Strings.INVALID_FILENAME_TITLE, entryType), - StringUtils.format(Strings.FILE_ALREADY_EXISTS, entryType, + StringUtils.format(Strings.FILE_ALREADY_EXISTS, + useOppositeType ? oppositeEntryType : entryType, StringUtils.breakableUrl(data.rslt.name)) ); - /* TODO: FileSystem error? - } else if (error === NativeFileError.TYPE_MISMATCH_ERR) { - Dialogs.showModalDialog( - DefaultDialogs.DIALOG_ID_ERROR, - StringUtils.format(Strings.INVALID_FILENAME_TITLE, entryType), - StringUtils.format(Strings.FILE_ALREADY_EXISTS, oppositeEntryType, - StringUtils.breakableUrl(data.rslt.name)) - ); - */ } else { var errString = error === FileSystemError.NOT_WRITABLE ? Strings.NO_MODIFICATION_ALLOWED_ERR : @@ -1334,7 +1327,7 @@ define(function (require, exports, module) { FileSystem.resolve(newItemPath, function (err, item) { if (!err) { // Item already exists, fail with error - errorCallback(FileSystemError.ALREADY_EXISTS); + errorCallback(FileSystemError.ALREADY_EXISTS, item); } else { if (isFolder) { var directory = FileSystem.getDirectoryForPath(newItemPath); @@ -1434,6 +1427,7 @@ define(function (require, exports, module) { } _redraw(true); + result.resolve(); } else { // Show an error alert Dialogs.showModalDialog( @@ -1447,6 +1441,7 @@ define(function (require, exports, module) { FileUtils.getFileErrorString(err) ) ); + result.reject(err); } }); From b541ea382567d95aa34815585ced964c7631ff9a Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Wed, 23 Oct 2013 07:41:57 -0700 Subject: [PATCH 0310/1140] don't allow prev/next buttons to take focus --- src/search/FindReplace.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js index 69855b12cb7..8357f644a4c 100644 --- a/src/search/FindReplace.js +++ b/src/search/FindReplace.js @@ -193,8 +193,8 @@ define(function (require, exports, module) { var queryDialog = Strings.CMD_FIND + ": " + "
    " + - "" + - "" + + "" + + "" + "
    " + "
    " + " " + From 706850605956d50775abc5e700a558a0f375f0d9 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 23 Oct 2013 17:22:00 +0200 Subject: [PATCH 0311/1140] Rule list removed when there is only one CSS rule left --- src/editor/MultiRangeInlineEditor.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/editor/MultiRangeInlineEditor.js b/src/editor/MultiRangeInlineEditor.js index 0de41328eaa..f1da0b05396 100644 --- a/src/editor/MultiRangeInlineEditor.js +++ b/src/editor/MultiRangeInlineEditor.js @@ -381,6 +381,10 @@ define(function (require, exports, module) { this._updateSelectedMarker(); } + if (this._ranges.length === 1) { + this.$relatedContainer.remove(); + } + this._updateCommands(); }; From d339ddab2df36fcfa56465f4b66a9981504f02ad Mon Sep 17 00:00:00 2001 From: micole Date: Wed, 23 Oct 2013 12:00:44 -0400 Subject: [PATCH 0312/1140] Changes sv Node translation --- src/nls/sv/strings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nls/sv/strings.js b/src/nls/sv/strings.js index a9c23ef00af..bb5c2c5ed28 100644 --- a/src/nls/sv/strings.js +++ b/src/nls/sv/strings.js @@ -410,9 +410,9 @@ define({ "CMD_SWITCH_LANGUAGE" : "Byt språk", "CMD_RUN_UNIT_TESTS" : "Kör tester", "CMD_SHOW_PERF_DATA" : "Visa prestandadata", - "CMD_ENABLE_NODE_DEBUGGER" : "Aktivera noddebugger", - "CMD_LOG_NODE_STATE" : "Skriv ut nodstatus till konsollen", - "CMD_RESTART_NODE" : "Starta om nod", + "CMD_ENABLE_NODE_DEBUGGER" : "Aktivera Node debugger", + "CMD_LOG_NODE_STATE" : "Skriv ut Node status till konsollen", + "CMD_RESTART_NODE" : "Omstarta Node", "LANGUAGE_TITLE" : "Byt språk", "LANGUAGE_MESSAGE" : "Välj önskat språk i listan nedan:", From aa4d67932ddcbdb3b65a2971a61526a6f5a63c51 Mon Sep 17 00:00:00 2001 From: Ian Wehrman Date: Wed, 23 Oct 2013 09:28:40 -0700 Subject: [PATCH 0313/1140] Bump Tern SHA to fix a doc parsing bug --- src/extensions/default/JavaScriptCodeHints/thirdparty/tern | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern index 5a6b52e7174..91a696a04b8 160000 --- a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern +++ b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern @@ -1 +1 @@ -Subproject commit 5a6b52e7174616ce641d475516c0b38c908b57dc +Subproject commit 91a696a04b8de5c04b7c9f288ab940bbda124d66 From ff786ed0a641eada863b21e7bbb9796577f689fe Mon Sep 17 00:00:00 2001 From: RaymondLim Date: Wed, 23 Oct 2013 09:42:09 -0700 Subject: [PATCH 0314/1140] Make some changes based on review comments. --- src/document/DocumentCommandHandlers.js | 7 +++---- src/document/DocumentManager.js | 2 ++ src/editor/EditorManager.js | 8 +++++--- src/editor/ImageViewer.js | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index aee727b2621..08d92f0cb1b 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -36,7 +36,6 @@ define(function (require, exports, module) { ProjectManager = require("project/ProjectManager"), DocumentManager = require("document/DocumentManager"), EditorManager = require("editor/EditorManager"), - ImageViewer = require("editor/ImageViewer"), FileUtils = require("file/FileUtils"), FileViewController = require("project/FileViewController"), StringUtils = require("utils/StringUtils"), @@ -187,9 +186,9 @@ define(function (require, exports, module) { PerfUtils.addMeasurement(perfTimerName); }); - if (EditorManager.getCustomViewerForPath(fullPath)) { - var $imageHolder = ImageViewer.getImageHolder(fullPath); - EditorManager.showCustomViewer($imageHolder, fullPath); + var viewProvider = EditorManager.getCustomViewerForPath(fullPath); + if (viewProvider) { + EditorManager.showCustomViewer(viewProvider, fullPath); result.resolve(); } else { // Load the file if it was never open before, and then switch to it in the UI diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js index 0874e5c33e5..6208f8e97dd 100644 --- a/src/document/DocumentManager.js +++ b/src/document/DocumentManager.js @@ -283,6 +283,8 @@ define(function (require, exports, module) { /** * Adds the given file list to the end of the working set list. + * If a file in the list has its own custom viewer, then it + * is not added into the working set. * Does not change which document is currently open in the editor. * More efficient than calling addToWorkingSet() (in a loop) for * a list of files because there's only 1 redraw at the end diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js index 1656c822bda..9a6beba4717 100644 --- a/src/editor/EditorManager.js +++ b/src/editor/EditorManager.js @@ -615,10 +615,12 @@ define(function (require, exports, module) { /** * Append custom view to editor-holder - * @param {!JQuery} $customView DOM node representing UI of custom view + * @param {!Object} provider custom view provider * @param {!string} fullPath path to the file displayed in the custom view */ - function showCustomViewer($customView, fullPath) { + function showCustomViewer(provider, fullPath) { + var $customView = provider.getCustomViewHolder(fullPath); + DocumentManager._clearCurrentDocument(); // Hide the not-editor @@ -632,7 +634,7 @@ define(function (require, exports, module) { $("#editor-holder").append(_$currentCustomViewer); // add path, dimensions and file size to the view after loading image - ImageViewer.render(fullPath); + provider.render(fullPath); _setCurrentlyViewedPath(fullPath); } diff --git a/src/editor/ImageViewer.js b/src/editor/ImageViewer.js index f17c8af9ef7..0f14fe912c6 100644 --- a/src/editor/ImageViewer.js +++ b/src/editor/ImageViewer.js @@ -62,7 +62,7 @@ define(function (require, exports, module) { * @return {JQuery} * */ - function getImageHolder(fullPath) { + function getCustomViewHolder(fullPath) { return $(Mustache.render(ImageHolderTemplate, {fullPath: fullPath})); } @@ -107,6 +107,6 @@ define(function (require, exports, module) { _updateScale($(this).width()); }); } - exports.getImageHolder = getImageHolder; + exports.getCustomViewHolder = getCustomViewHolder; exports.render = render; }); From 276c403483c24d3ee9f30d815b8cf86808f78078 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Wed, 23 Oct 2013 10:28:28 -0700 Subject: [PATCH 0315/1140] JSDoc additions and cleanup. --- src/filesystem/Directory.js | 21 +++++++++++-- src/filesystem/File.js | 18 ++++++++++-- src/filesystem/FileIndex.js | 7 ++++- src/filesystem/FileSystem.js | 49 +++++++++++++++++++++++++++++-- src/filesystem/FileSystemEntry.js | 27 +++++++++-------- src/filesystem/FileSystemError.js | 6 ++++ 6 files changed, 109 insertions(+), 19 deletions(-) diff --git a/src/filesystem/Directory.js b/src/filesystem/Directory.js index dc0f85618f1..f2dd7bb89ab 100644 --- a/src/filesystem/Directory.js +++ b/src/filesystem/Directory.js @@ -30,6 +30,18 @@ define(function (require, exports, module) { var FileSystemEntry = require("filesystem/FileSystemEntry"); + /* + * @constructor + * Model for a file system Directory. + * + * This class should *not* be instantiated directly. Use FileSystem.getDirectoryForPath, + * FileSystem.resolve, or Directory.getContents to create an instance of this class. + * + * See the FileSystem class for more details. + * + * @param {!string} fullPath The full path for this Directory. + * @param {!FileSystem} fileSystem The file system associated with this Directory. + */ function Directory(fullPath, fileSystem) { FileSystemEntry.call(this, fullPath, fileSystem); } @@ -44,6 +56,11 @@ define(function (require, exports, module) { */ Directory.prototype._contents = null; + /** + * Override to return true. + * + * @return {boolean} True -- this is a Directory. + */ Directory.prototype.isDirectory = function () { return true; }; @@ -52,7 +69,7 @@ define(function (require, exports, module) { * Read the contents of a Directory. * * @param {Directory} directory Directory whose contents you want to get - * @param {function (number, array)} callback Callback that is passed + * @param {function (string, array)} callback Callback that is passed * and error code and the contents of the directory. */ Directory.prototype.getContents = function (callback) { @@ -107,7 +124,7 @@ define(function (require, exports, module) { /** * Create a directory * - * @param {function (number, object)=} callback + * @param {function (string, object)=} callback */ Directory.prototype.create = function (callback) { this._impl.mkdir(this._path, function (err, stat) { diff --git a/src/filesystem/File.js b/src/filesystem/File.js index da3156abdda..a961624ad16 100644 --- a/src/filesystem/File.js +++ b/src/filesystem/File.js @@ -30,6 +30,19 @@ define(function (require, exports, module) { var FileSystemEntry = require("filesystem/FileSystemEntry"); + + /* + * @constructor + * Model for a File. + * + * This class should *not* be instantiated directly. Use FileSystem.getFileForPath, + * FileSystem.resolve, or Directory.getContents to create an instance of this class. + * + * See the FileSystem class for more details. + * + * @param {!string} fullPath The full path for this File. + * @param {!FileSystem} fileSystem The file system associated with this File. + */ function File(fullPath, fileSystem) { FileSystemEntry.call(this, fullPath, fileSystem); } @@ -56,7 +69,8 @@ define(function (require, exports, module) { * Read a file as text. * * @param {string=} encoding Encoding for reading. Defaults to UTF-8. - * @param {function (number, string, object)} callback + * @param {function (string, string, object)} callback Callback that is passed the + * error code, the file's contents, and the file's new stats. */ File.prototype.readAsText = function (encoding, callback) { if (typeof (encoding) === "function") { @@ -78,7 +92,7 @@ define(function (require, exports, module) { * * @param {string} data Data to write. * @param {string=} encoding Encoding for data. Defaults to UTF-8. - * @param {!function (err, object)} callback Callback that is passed the + * @param {!function (string, object)} callback Callback that is passed the * error code and the file's new stats if the write is sucessful. */ File.prototype.write = function (data, encoding, callback) { diff --git a/src/filesystem/FileIndex.js b/src/filesystem/FileIndex.js index 8bc3f159aee..05a3054c77e 100644 --- a/src/filesystem/FileIndex.js +++ b/src/filesystem/FileIndex.js @@ -25,11 +25,16 @@ /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50, forin: true */ /*global define */ +/** + * FileIndex is an internal module used by FileSystem to maintain an index of all files and directories. + * + * This module is *only* used by FileSystem, and should not be called directly. + */ define(function (require, exports, module) { "use strict"; /** - * Constructor + * @constructor */ function FileIndex() { this._index = {}; diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js index 37a5ba3d21b..c479abb6d0f 100644 --- a/src/filesystem/FileSystem.js +++ b/src/filesystem/FileSystem.js @@ -21,10 +21,41 @@ * */ - /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */ /*global define, $, setTimeout */ +/** + * FileSystem is a model object representing a complete file system. This object creates + * and manages File and Directory instances, dispatches events when the file system changes, + * and provides methods for showing 'open' and 'save' dialogs. + * + * The FileSystem must be initialized very early during application startup. + * + * There are three ways to get File or Directory instances: + * * Use FileSystem.resolve() to convert a path to a File/Directory object. This will only + * succeed if the file/directory already exists. + * * Use FileSystem.getFileForPath()/FileSystem.getDirectoryForPath() if you know the + * file/directory already exists, or if you want to create a new entry. + * * Use Directory.getContents() to return all entries for the specified Directory. + * + * FileSystem dispatches the following events: + * change - Sent whenever there is a change in the file system. The handler + * is passed one argument -- entry. The entry can be a File, Directory, or null. + * * When entry is a File, the contents of the file have changed, and should + * be reloaded. + * * When entry is a Directory, the contents of the directory have changed. This + * could be from items being added, removed, or renamed. + * * When entry is null, a 'wholesale' change happened, and you should assume + * that everything may have changed. + * rename - Sent whenever a File or Directory is renamed. All affected File and Directory + * objects have been updated by the time this event is dispatched. This event + * should be used to trigger an UI updates that may need to occur when a path + * has changed. + * + * The FileSystem doesn't directly read or write contents--this work is done by a low-level + * implementation object. This allows client code to use the FileSystem API without having to + * worry about the underlying storage, which could be a local filesystem or a remote server. + */ define(function (require, exports, module) { "use strict"; @@ -33,7 +64,7 @@ define(function (require, exports, module) { FileIndex = require("filesystem/FileIndex"); /** - * Constructor. FileSystem objects should not be constructed directly. + * @constructor * The FileSystem is not usable until init() signals its callback. */ function FileSystem() { @@ -693,9 +724,23 @@ define(function (require, exports, module) { exports.unwatch = _wrap(FileSystem.prototype.unwatch); // Export "on" and "off" methods + + /** + * Add an event listener for a FileSystem event. + * + * @param {string} event The name of the event + * @param {function} handler The handler for the event + */ exports.on = function (event, handler) { $(_instance).on(event, handler); }; + + /** + * Remove an event listener for a FileSystem event. + * + * @param {string} event The name of the event + * @param {function} handler The handler for the event + */ exports.off = function (event, handler) { $(_instance).off(event, handler); }; diff --git a/src/filesystem/FileSystemEntry.js b/src/filesystem/FileSystemEntry.js index 153ba71c9ac..0ac89ddbf60 100644 --- a/src/filesystem/FileSystemEntry.js +++ b/src/filesystem/FileSystemEntry.js @@ -25,8 +25,6 @@ /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */ /*global define, $ */ -/* TODO: Document this class/module. */ - define(function (require, exports, module) { "use strict"; @@ -34,8 +32,14 @@ define(function (require, exports, module) { var nextId = 0; /** - * Constructor - * @param {string} path The path for this entry + * @constructor + * Model for a file system entry. This is the base class for File and Directory, + * and is never used directly. + * + * See the File, Directory, and FileSystem classes for more details. + * + * @param {string} path The path for this entry. + * @param {FileSystem} fileSystem The file system associated with this entry. */ function FileSystemEntry(path, fileSystem) { this._path = path; @@ -121,8 +125,8 @@ define(function (require, exports, module) { /** * Returns the stats for the entry. * - * @param {function (err, object)} callback Callback that is resolved with the entry's - * stats. + * @param {function (string, object)} callback Callback with "error" and "stat" + * parameters. */ FileSystemEntry.prototype.stat = function (callback) { this._impl.stat(this._path, function (err, stat) { @@ -137,8 +141,7 @@ define(function (require, exports, module) { * Changes the mode of the entry. * * @param {number} mode The desired mode of the entry as a number (e.g., 0777) - * @param {function (err)} callback Callback that is resolved with the entry's - * stats. + * @param {function (number)} callback Callback with a single "error" parameter. */ FileSystemEntry.prototype.chmod = function (mode, callback) { this._impl.chmod(this._path, mode, callback || function () {}); @@ -148,7 +151,7 @@ define(function (require, exports, module) { * Rename this entry. * * @param {string} newFullPath New path & name for this entry. - * @param {function (number)} callback + * @param {function (string)} callback Callback with a single "error" parameter. */ FileSystemEntry.prototype.rename = function (newFullPath, callback) { this._fileSystem._beginWrite(); @@ -168,7 +171,7 @@ define(function (require, exports, module) { /** * Unlink (delete) this entry. * - * @param {function (number)} callback + * @param {function (string)} callback Callback with a single "error" parameter. */ FileSystemEntry.prototype.unlink = function (callback) { this._stat = null; @@ -187,7 +190,7 @@ define(function (require, exports, module) { * Move this entry to the trash. If the underlying file system doesn't support move * to trash, the item is permanently deleted. * - * @param {function (number)} callback + * @param {function (string)} callback Callback with a single "error" parameter. */ FileSystemEntry.prototype.moveToTrash = function (callback) { if (!this._impl.moveToTrash) { @@ -214,7 +217,7 @@ define(function (require, exports, module) { * applied to descendent FileSystemEntry objects. If the function returns false for * a particular Directory entry, that directory's descendents will not be visited. * @param {{failFast: boolean=, maxDepth: number=}=} options - An optional set of options. - * @param {function(string)} callback + * @param {function(string)} callback Callback with single "error" parameter. */ FileSystemEntry.prototype.visit = function (visitor, options, callback) { var DEFAULT_MAX_DEPTH = 100; diff --git a/src/filesystem/FileSystemError.js b/src/filesystem/FileSystemError.js index 5121e9e36b7..ed896ef5761 100644 --- a/src/filesystem/FileSystemError.js +++ b/src/filesystem/FileSystemError.js @@ -25,6 +25,12 @@ /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */ /*global define */ +/** + * FileSystemError describes the errors that can occur when using the FileSystem, File, + * and Directory modules. + * + * Error values are strings. Any "falsy" value: null, undefined or "" means "no error". + */ define(function (require, exports, module) { "use strict"; From d79cc5e862a6315fad73881719a3ebc01cd453d3 Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Wed, 23 Oct 2013 20:10:18 +0200 Subject: [PATCH 0316/1140] Fix review issues --- src/widgets/Dialogs.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/widgets/Dialogs.js b/src/widgets/Dialogs.js index 41731166505..3adcaa54842 100644 --- a/src/widgets/Dialogs.js +++ b/src/widgets/Dialogs.js @@ -133,17 +133,11 @@ define(function (require, exports, module) { } else if (e.which === KeyEvent.DOM_VK_ESCAPE) { buttonId = DIALOG_BTN_CANCEL; } else if (e.which === KeyEvent.DOM_VK_RETURN && !inTextArea) { // enter key in single-line text input still dismisses - // Click focused button or primary if no focus - if ($focusedElement.length !== 0) { - $focusedElement.click(); - } else { - $primaryBtn.click(); - } + // Click primary + $primaryBtn.click(); } else if (e.which === KeyEvent.DOM_VK_SPACE) { // Space bar on focused button or link - if ($focusedElement.length !== 0) { - $focusedElement.click(); - } + $focusedElement.click(); } else if (brackets.platform === "mac") { // CMD+D Don't Save if (e.metaKey && (which === "D")) { From 192e67766fae279002ad59f6cfae7cecf505286d Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 23 Oct 2013 20:10:44 +0200 Subject: [PATCH 0317/1140] Fix translation name: InlineBezierCurveEditor -> InlineTimingFunctionEditor --- .../default/InlineTimingFunctionEditor/Localized.css | 8 ++++---- src/nls/de/strings.js | 6 +++--- src/nls/root/strings.js | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/extensions/default/InlineTimingFunctionEditor/Localized.css b/src/extensions/default/InlineTimingFunctionEditor/Localized.css index 92197f72910..803ebdb7a80 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/Localized.css +++ b/src/extensions/default/InlineTimingFunctionEditor/Localized.css @@ -1,15 +1,15 @@ .timing-function-editor .coordinate-plane:after { - content: '{{INLINE_BEZIER_EDITOR_TIME}}'; + content: '{{INLINE_TIMING_EDITOR_TIME}}'; } .timing-function-editor .coordinate-plane:hover:before { - content: '{{INLINE_BEZIER_EDITOR_PROGRESSION}} (' attr(data-progression) '%)'; + content: '{{INLINE_TIMING_EDITOR_PROGRESSION}} (' attr(data-progression) '%)'; } .timing-function-editor .coordinate-plane:before { - content: '{{INLINE_BEZIER_EDITOR_PROGRESSION}}'; + content: '{{INLINE_TIMING_EDITOR_PROGRESSION}}'; } .timing-function-editor .coordinate-plane:hover:after { - content: '{{INLINE_BEZIER_EDITOR_TIME}} (' attr(data-time) '%)'; + content: '{{INLINE_TIMING_EDITOR_TIME}} (' attr(data-time) '%)'; } diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 28afe44c699..cbe606efb86 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -461,9 +461,9 @@ define({ "LOCALE_ZH_CN" : "Chinesisch, vereinfacht", "LOCALE_HU" : "Ungarisch", - // extensions/default/InlineBezierCurveEditor - "INLINE_BEZIER_EDITOR_TIME" : "Zeit", - "INLINE_BEZIER_EDITOR_PROGRESSION" : "Verlauf", + // extensions/default/InlineTimingFunctionEditor + "INLINE_TIMING_EDITOR_TIME" : "Zeit", + "INLINE_TIMING_EDITOR_PROGRESSION" : "Verlauf", // 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 14f17a3d999..5bae88213e3 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -463,9 +463,9 @@ define({ "LOCALE_ZH_CN" : "Chinese, simplified", "LOCALE_HU" : "Hungarian", - // extensions/default/InlineBezierCurveEditor - "INLINE_BEZIER_EDITOR_TIME" : "Time", - "INLINE_BEZIER_EDITOR_PROGRESSION" : "Progression", + // extensions/default/InlineTimingFunctionEditor + "INLINE_TIMING_EDITOR_TIME" : "Time", + "INLINE_TIMING_EDITOR_PROGRESSION" : "Progression", // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "Current Color", From 395442e6637be070b5db3183dc844fa0ab69b93d Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Wed, 23 Oct 2013 11:28:24 -0700 Subject: [PATCH 0318/1140] code review changes --- src/editor/CSSInlineEditor.js | 2 +- src/styles/brackets_colors.less | 1 + src/styles/brackets_patterns_override.less | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/editor/CSSInlineEditor.js b/src/editor/CSSInlineEditor.js index 53e190d85ca..4bbbb2db822 100644 --- a/src/editor/CSSInlineEditor.js +++ b/src/editor/CSSInlineEditor.js @@ -328,7 +328,7 @@ define(function (require, exports, module) { var dirSplit = fileInfo.fullPath.split("/"), index = dirSplit.length - fileInfo.subDirCount - 2; - fileInfo.subDirStr = dirSplit[index] + "/" + fileInfo.subDirStr; + fileInfo.subDirStr = dirSplit.slice(index, dirSplit.length - 1).join("/"); fileInfo.subDirCount++; } diff --git a/src/styles/brackets_colors.less b/src/styles/brackets_colors.less index 0784d756400..194c4a7c8f4 100644 --- a/src/styles/brackets_colors.less +++ b/src/styles/brackets_colors.less @@ -98,6 +98,7 @@ @tc-hover-highlight: rgba(255, 255, 255, 0.6); @tc-text: #454545; @tc-emphasized-text: #333; +@tc-quiet-text: #aaa; @tc-text-shadow: 0 1px 0 #fff; @tc-call-to-action: #288edf; @tc-call-to-action-border: #0055ad; diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less index d2305b5a5b0..fde1e624880 100644 --- a/src/styles/brackets_patterns_override.less +++ b/src/styles/brackets_patterns_override.less @@ -457,7 +457,7 @@ a:focus { } .stylesheet-dir { - color: @tc-light-weight-quiet-text; + color: @tc-quiet-text; } &.dropdown-menu a.selected { From 89cda23615a388788bc2b953b429b666c26c27ff Mon Sep 17 00:00:00 2001 From: Ian Wehrman Date: Wed, 23 Oct 2013 11:41:32 -0700 Subject: [PATCH 0319/1140] Fix LanguageManager tests --- src/brackets.js | 1 + test/spec/LanguageManager-test.js | 130 +++++++++++++++++++++++------- 2 files changed, 101 insertions(+), 30 deletions(-) diff --git a/src/brackets.js b/src/brackets.js index eaa21f7244e..47eb45e48ea 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -164,6 +164,7 @@ define(function (require, exports, module) { RemoteAgent : require("LiveDevelopment/Agents/RemoteAgent"), HTMLInstrumentation : require("language/HTMLInstrumentation"), MultiRangeInlineEditor : require("editor/MultiRangeInlineEditor").MultiRangeInlineEditor, + LanguageManager : LanguageManager, doneLoading : false }; diff --git a/test/spec/LanguageManager-test.js b/test/spec/LanguageManager-test.js index 04025591b2a..9bde071a5cd 100644 --- a/test/spec/LanguageManager-test.js +++ b/test/spec/LanguageManager-test.js @@ -33,9 +33,10 @@ define(function (require, exports, module) { DocumentManager = require("document/DocumentManager"), PathUtils = require("thirdparty/path-utils/path-utils.min"), SpecRunnerUtils = require("spec/SpecRunnerUtils"), - FileUtils = require("file/FileUtils"); + FileSystem = require("filesystem/FileSystem"); describe("LanguageManager", function () { + this.category = "integration"; beforeEach(function () { waitsForDone(LanguageManager.ready, "LanguageManager ready", 10000); @@ -402,38 +403,107 @@ define(function (require, exports, module) { }); describe("rename file extension", function () { - - // TODO: FileSystem rename - xit("should update the document's language when a file is renamed", function () { - var javascript = LanguageManager.getLanguage("javascript"), - html = LanguageManager.getLanguage("html"), - doc = SpecRunnerUtils.createMockActiveDocument({ filename: "foo.js", language: "javascript" }), - spy = jasmine.createSpy("languageChanged event handler"); - - // sanity check language - expect(doc.getLanguage()).toBe(javascript); - - // Documents are only 'active' while referenced; they won't be maintained by DocumentManager - // for global updates like rename otherwise. - doc.addRef(); + + it("should update the document's language when a file is renamed", function () { + var tempDir = SpecRunnerUtils.getTempDirectory(), + oldFilename = tempDir + "/foo.js", + newFilename = tempDir + "/dummy.html", + spy = jasmine.createSpy("languageChanged event handler"), + javascript, + html, + oldFile, + doc; + + var DocumentManager, + FileSystem, + LanguageManager, + _$; + + SpecRunnerUtils.createTempDirectory(); + + SpecRunnerUtils.createTestWindowAndRun(this, function (w) { + // Load module instances from brackets.test + FileSystem = w.brackets.test.FileSystem; + LanguageManager = w.brackets.test.LanguageManager; + DocumentManager = w.brackets.test.DocumentManager; + _$ = w.$; + }); - // listen for event - $(doc).on("languageChanged", spy); + var writeDeferred = $.Deferred(); + runs(function () { + oldFile = FileSystem.getFileForPath(oldFilename); + oldFile.write("", function (err) { + if (err) { + writeDeferred.reject(err); + } else { + writeDeferred.resolve(); + } + }); + }); + waitsForDone(writeDeferred.promise(), "old file creation"); + + SpecRunnerUtils.loadProjectInTestWindow(tempDir); - // trigger a rename - DocumentManager.notifyPathNameChanged(doc.file.name, "dummy.html", false); + runs(function () { + waitsForDone(DocumentManager.getDocumentForPath(oldFilename).done(function (_doc) { + doc = _doc; + }), "get document"); + }); + + var renameDeferred = $.Deferred(); + runs(function () { + javascript = LanguageManager.getLanguage("javascript"); + + // sanity check language + expect(doc.getLanguage()).toBe(javascript); + + // Documents are only 'active' while referenced; they won't be maintained by DocumentManager + // for global updates like rename otherwise. + doc.addRef(); + + // listen for event + _$(doc).on("languageChanged", spy); + + // trigger a rename + oldFile.rename(newFilename, function (err) { + if (err) { + renameDeferred.reject(err); + } else { + renameDeferred.resolve(); + } + }); + }); + waitsForDone(renameDeferred.promise(), "old file rename"); - // language should change - expect(doc.getLanguage()).toBe(html); - expect(spy).toHaveBeenCalled(); - expect(spy.callCount).toEqual(1); + var unlinkDeferred = $.Deferred(); + runs(function () { + html = LanguageManager.getLanguage("html"); + + // language should change + expect(doc.getLanguage()).toBe(html); + expect(spy).toHaveBeenCalled(); + expect(spy.callCount).toEqual(1); + + // check callback args (arg 0 is a jQuery event) + expect(spy.mostRecentCall.args[1]).toBe(javascript); + expect(spy.mostRecentCall.args[2]).toBe(html); + + // cleanup + doc.releaseRef(); + + oldFile.unlink(function (err) { + if (err) { + unlinkDeferred.reject(err); + } else { + unlinkDeferred.resolve(); + } + }); + }); + waitsForDone(unlinkDeferred.promise(), "new file unlink"); - // check callback args (arg 0 is a jQuery event) - expect(spy.mostRecentCall.args[1]).toBe(javascript); - expect(spy.mostRecentCall.args[2]).toBe(html); + SpecRunnerUtils.closeTestWindow(); - // cleanup - doc.releaseRef(); + SpecRunnerUtils.removeTempDirectory(); }); it("should update the document's language when a language is added", function () { @@ -445,7 +515,7 @@ define(function (require, exports, module) { runs(function () { // Create a scheme script file - doc = SpecRunnerUtils.createMockActiveDocument({ filename: "file.scheme" }); + doc = SpecRunnerUtils.createMockActiveDocument({ filename: SpecRunnerUtils.getTempDirectory() + "/file.scheme" }); // Initial language will be unknown (scheme is not a default language) unknown = LanguageManager.getLanguage("unknown"); @@ -495,7 +565,7 @@ define(function (require, exports, module) { promise; // Create a foo script file - doc = SpecRunnerUtils.createMockActiveDocument({ filename: "test.foo" }); + doc = SpecRunnerUtils.createMockActiveDocument({ filename: SpecRunnerUtils.getTempDirectory() + "/test.foo" }); // Initial language will be unknown (foo is not a default language) unknown = LanguageManager.getLanguage("unknown"); From 97cc8ec6dc724bd42e5eab70a6e2a0bcb86a98da Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 23 Oct 2013 20:59:28 +0200 Subject: [PATCH 0320/1140] Provide german translation of #5635 --- samples/de/Erste Schritte/index.html | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/samples/de/Erste Schritte/index.html b/samples/de/Erste Schritte/index.html index fda750a7896..a85f6c13fdf 100644 --- a/samples/de/Erste Schritte/index.html +++ b/samples/de/Erste Schritte/index.html @@ -138,6 +138,17 @@

    Schnellansicht bei Hover

    weiter oben in diesem Dokument finden. +

    Sie benötigen etwas anderes? Probieren Sie es mit einer Erweiterung!

    +

    + Zusätzlich zu allem, was in Brackets eingebaut ist, hat unsere große und wachsende Community der + Erweiterungs-Entwickler über hundert Erweiterungen erstellt, die nützliche Funktionen bringen. Wenn + Sie etwas brauchen, das es nicht in Brackets gibt, ist es sehr wahrscheinlich, dass bereits jemand + eine Erweiterung dafür geschrieben hat. Um die Liste der verfügbaren Erweiterungen zu durchstöbern + oder zu durchsuchen nutzen Sie Datei > Erweiterungs-Verwaltung und klicken auf + den Tab "Verfügbar". Wenn Sie eine Erweiterung finden, die Sie nutzen wollen, klicken Sie einfach + auf den "Installieren"-Button daneben. +

    + @@ -150,12 +161,13 @@

    Machen Sie mit

    From 72a4cd751f770874676c9a9e65f078132b3b1430 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 23 Oct 2013 21:03:37 +0200 Subject: [PATCH 0321/1140] Little improvement --- samples/de/Erste Schritte/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/de/Erste Schritte/index.html b/samples/de/Erste Schritte/index.html index a85f6c13fdf..a6444cb08a5 100644 --- a/samples/de/Erste Schritte/index.html +++ b/samples/de/Erste Schritte/index.html @@ -140,7 +140,7 @@

    Schnellansicht bei Hover

    Sie benötigen etwas anderes? Probieren Sie es mit einer Erweiterung!

    - Zusätzlich zu allem, was in Brackets eingebaut ist, hat unsere große und wachsende Community der + Zusätzlich zu all dem, was in Brackets eingebaut ist, hat unsere große und wachsende Community der Erweiterungs-Entwickler über hundert Erweiterungen erstellt, die nützliche Funktionen bringen. Wenn Sie etwas brauchen, das es nicht in Brackets gibt, ist es sehr wahrscheinlich, dass bereits jemand eine Erweiterung dafür geschrieben hat. Um die Liste der verfügbaren Erweiterungen zu durchstöbern From 7c123ffe28c245448b4abd649a0277f7229ffaa8 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 23 Oct 2013 21:21:50 +0200 Subject: [PATCH 0322/1140] Quick changes --- samples/de/Erste Schritte/index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samples/de/Erste Schritte/index.html b/samples/de/Erste Schritte/index.html index a6444cb08a5..27d90ff8869 100644 --- a/samples/de/Erste Schritte/index.html +++ b/samples/de/Erste Schritte/index.html @@ -161,10 +161,9 @@

    Machen Sie mit