aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/core/promise-queue.js
diff options
context:
space:
mode:
authorEric Guzman2012-05-17 17:43:05 -0700
committerEric Guzman2012-05-17 17:43:05 -0700
commit458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch)
treeee329e409fe28ae54c894b9e27e82e1f85aefc85 /node_modules/montage/core/promise-queue.js
parent82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff)
parent52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff)
downloadninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js
Diffstat (limited to 'node_modules/montage/core/promise-queue.js')
-rw-r--r--node_modules/montage/core/promise-queue.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/core/promise-queue.js b/node_modules/montage/core/promise-queue.js
index 11eeb788..87959c5c 100644
--- a/node_modules/montage/core/promise-queue.js
+++ b/node_modules/montage/core/promise-queue.js
@@ -42,7 +42,7 @@ exports.PromiseQueue = Montage.create(Montage, {
42 close: { 42 close: {
43 value: function (reason, error, rejection) { 43 value: function (reason, error, rejection) {
44 var end = { 44 var end = {
45 head: rejections || Promise.reject(reason, error) 45 head: rejection || Promise.reject(reason, error)
46 }; 46 };
47 end.tail = end; 47 end.tail = end;
48 this._ends.resolve(end); 48 this._ends.resolve(end);