aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/core/promise-queue.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-17 14:01:38 -0700
committerArmen Kesablyan2012-05-17 14:01:38 -0700
commit6c8f3525b839e82cf43df43700a0160ee2c5458f (patch)
tree3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/montage/core/promise-queue.js
parente8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff)
parent342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff)
downloadninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
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);