Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Replace deferred.pipe with deferred.then (jQuery 1.8 Deprecation) #4028

Merged
merged 1 commit into from
May 30, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/brackets.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/document/DocumentCommandHandlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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; });
};

Expand Down Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/extensibility/Package.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/language/CSSUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/project/ProjectManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -1070,15 +1070,15 @@ 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,
function (files) {
// 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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Async.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion test/spec/ExtensionUtils-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down
2 changes: 1 addition & 1 deletion test/spec/JSUtils-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()");
Expand Down
6 changes: 3 additions & 3 deletions test/spec/SpecRunnerUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -655,7 +655,7 @@ define(function (require, exports, module) {
true
);

copyChildrenPromise.pipe(deferred.resolve, deferred.reject);
copyChildrenPromise.then(deferred.resolve, deferred.reject);
});
});

Expand Down Expand Up @@ -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();
});
Expand Down