diff --git a/src/brackets.js b/src/brackets.js index 1d0a0768d86..8844b958acb 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -216,7 +216,7 @@ define(function (require, exports, module) { dirEntry.getFile("index.html", {}, function (fileEntry) { var promise = CommandManager.execute(Commands.FILE_ADD_TO_WORKING_SET, { fullPath: fileEntry.fullPath }); - promise.pipe(deferred.resolve, deferred.reject); + promise.then(deferred.resolve, deferred.reject); }, deferred.reject); } else { deferred.resolve(); diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js index a5431b2d413..27231fc0ba8 100644 --- a/src/document/DocumentCommandHandlers.js +++ b/src/document/DocumentCommandHandlers.js @@ -226,7 +226,7 @@ define(function (require, exports, module) { DocumentManager.addToWorkingSet(doc.file); }) // Send the resulting document that was opened - .pipe(result.resolve, result.reject); + .then(result.resolve, result.reject); } else { // Reject if the user canceled the dialog result.reject(); @@ -357,7 +357,7 @@ define(function (require, exports, module) { var deferred = _getUntitledFileSuggestion(baseDir, Strings.UNTITLED, isFolder ? "" : ".js", isFolder); var createWithSuggestedName = function (suggestedName) { ProjectManager.createNewItem(baseDir, suggestedName, false, isFolder) - .pipe(deferred.resolve, deferred.reject, deferred.notify) + .then(deferred.resolve, deferred.reject, deferred.notify) .always(function () { fileNewInProgress = false; }); }; @@ -627,7 +627,7 @@ define(function (require, exports, module) { // *and* if at least one other view still exists if (!promptOnly && DocumentManager.getOpenDocumentForPath(file.fullPath)) { doRevert(doc) - .pipe(result.resolve, result.reject); + .then(result.resolve, result.reject); } else { result.resolve(); } diff --git a/src/extensibility/Package.js b/src/extensibility/Package.js index 2a28cbeeccc..dc2b8fede32 100644 --- a/src/extensibility/Package.js +++ b/src/extensibility/Package.js @@ -383,7 +383,7 @@ define(function (require, exports, module) { .done(function (connection) { if (connection.connected()) { connection.domains.extensionManager.remove(path) - .pipe(d.resolve, d.reject); + .then(d.resolve, d.reject); } }) .fail(function (err) { diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js index 453031bb781..cef716f6361 100644 --- a/src/language/CSSUtils.js +++ b/src/language/CSSUtils.js @@ -938,7 +938,7 @@ define(function (require, exports, module) { Async.doInParallel(fileInfos, function (fileInfo, number) { return _loadFileAndScan(fileInfo.fullPath, selector); }) - .pipe(result.resolve, result.reject); + .then(result.resolve, result.reject); }); return result.promise(); diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js index 4ce83674885..c1f171ab6f1 100644 --- a/src/project/ProjectManager.js +++ b/src/project/ProjectManager.js @@ -906,7 +906,7 @@ define(function (require, exports, module) { // 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).pipe(result.resolve, result.reject); + $.when.apply($, promises).then(result.resolve, result.reject); } else { result.resolve(); } @@ -1070,7 +1070,7 @@ define(function (require, exports, module) { .done(function () { if (path) { // use specified path - _loadProject(path, false).pipe(result.resolve, result.reject); + _loadProject(path, false).then(result.resolve, result.reject); } else { // Pop up a folder browse dialog NativeFileSystem.showOpenDialog(false, true, Strings.CHOOSE_FOLDER, _projectRoot.fullPath, null, @@ -1078,7 +1078,7 @@ define(function (require, exports, module) { // If length == 0, user canceled the dialog; length should never be > 1 if (files.length > 0) { // Load the new project into the folder tree - _loadProject(files[0]).pipe(result.resolve, result.reject); + _loadProject(files[0]).then(result.resolve, result.reject); } else { result.reject(); } diff --git a/src/utils/Async.js b/src/utils/Async.js index 4057c570284..77b2f979696 100644 --- a/src/utils/Async.js +++ b/src/utils/Async.js @@ -310,7 +310,7 @@ define(function (require, exports, module) { // If the wrapper was already rejected due to timeout, the Promise's calls to resolve/reject // won't do anything - promise.pipe(wrapper.resolve, wrapper.reject); + promise.then(wrapper.resolve, wrapper.reject); return wrapper.promise(); } diff --git a/test/spec/ExtensionUtils-test.js b/test/spec/ExtensionUtils-test.js index f123b7b598e..23e510b37ee 100644 --- a/test/spec/ExtensionUtils-test.js +++ b/test/spec/ExtensionUtils-test.js @@ -59,7 +59,7 @@ define(function (require, exports, module) { // attach style sheet runs(function () { var promise = ExtensionUtils.loadStyleSheet(module, path); - promise.pipe(deferred.resolve, deferred.reject); + promise.then(deferred.resolve, deferred.reject); waitsForDone(promise, "loadStyleSheet: " + path); }); diff --git a/test/spec/JSUtils-test.js b/test/spec/JSUtils-test.js index 4b0e8eb82e2..3adc1079803 100644 --- a/test/spec/JSUtils-test.js +++ b/test/spec/JSUtils-test.js @@ -434,7 +434,7 @@ define(function (require, exports, module) { .done(function (fileInfos) { invokeFind(fileInfos) .done(function (functionsResult) { functions = functionsResult; }) - .pipe(result.resolve, result.reject); + .then(result.resolve, result.reject); }); waitsForDone(result, "Index and invoke JSUtils.findMatchingFunctions()"); diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index 29b26a716d8..10705bea269 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -80,7 +80,7 @@ define(function (require, exports, module) { deferred.resolve(nfs.root); } - resolveNativeFileSystemPath("/").pipe(deferred.resolve, deferred.reject); + resolveNativeFileSystemPath("/").then(deferred.resolve, deferred.reject); return deferred.promise(); } @@ -655,7 +655,7 @@ define(function (require, exports, module) { true ); - copyChildrenPromise.pipe(deferred.resolve, deferred.reject); + copyChildrenPromise.then(deferred.resolve, deferred.reject); }); }); @@ -702,7 +702,7 @@ define(function (require, exports, module) { promise = copyFileEntry(entry, destination, options); } - promise.pipe(deferred.resolve, deferred.reject); + promise.then(deferred.resolve, deferred.reject); }).fail(function () { deferred.reject(); });