[Pkg-javascript-commits] [node-bluebird] 01/04: Imported Upstream version 2.9.14+dfsg

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository node-bluebird.

commit 4bd78ac3971b001910908047cf24095a84e1ccc4
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Mon Mar 16 17:41:22 2015 +0100

    Imported Upstream version 2.9.14+dfsg
---
 .jshintrc                   |  2 +-
 bower.json                  |  2 +-
 changelog.md                |  6 ++++++
 js/browser/bluebird.js      | 15 +++++----------
 package.json                |  2 +-
 src/schedule.js             | 13 ++++---------
 tools/jshintrc_generator.js |  1 +
 7 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 9de53a4..ebcbc4f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -46,6 +46,7 @@
     "-W097": true,
     "globals": {
         "Error": true,
+        "JSON": false,
         "args": true,
         "INLINE_SLICE": false,
         "global": true,
@@ -94,7 +95,6 @@
         "IS_CARRYING_STACK_TRACE": false,
         "IS_UNHANDLED_REJECTION_NOTIFIED": false,
         "IS_DISPOSABLE": false,
-        "IS_BOUND": false,
         "LENGTH_MASK": false,
         "LENGTH_CLEAR_MASK": false,
         "MAX_LENGTH": false,
diff --git a/bower.json b/bower.json
index f969e85..4313024 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bluebird",
-  "version": "2.9.13",
+  "version": "2.9.14",
   "homepage": "https://github.com/petkaantonov/bluebird",
   "authors": [
     "Petka Antonov <petka_antonov at hotmail.com>"
diff --git a/changelog.md b/changelog.md
index e72fd00..59e7165 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+## 2.9.13 (2015-02-27)
+
+Bugfixes:
+
+ - Fix .each, .filter, .reduce and .map callbacks being called synchornously if the input is immediate. ([#513](.))
+
 ## 2.9.12 (2015-02-19)
 
 Bugfixes:
diff --git a/js/browser/bluebird.js b/js/browser/bluebird.js
index 650b3f0..48bf2b3 100644
--- a/js/browser/bluebird.js
+++ b/js/browser/bluebird.js
@@ -23,7 +23,7 @@
  * 
  */
 /**
- * bluebird build version 2.9.13
+ * bluebird build version 2.9.14
  * Features enabled: core, race, call_get, generators, map, nodeify, promisify, props, reduce, settle, some, progress, cancel, using, filter, any, each, timers
 */
 !function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.Promise=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof _dereq_=="function"&&_dereq_;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot fi [...]
@@ -3743,11 +3743,8 @@ Promise.reduce = function (promises, fn, initialValue, _each) {
 "use strict";
 var schedule;
 if (_dereq_("./util.js").isNode) {
-    var version = process.versions.node.split(".").map(Number);
-    schedule = (version[0] === 0 && version[1] > 10) || (version[0] > 0)
-        ? global.setImmediate : process.nextTick;
-}
-else if (typeof MutationObserver !== "undefined") {
+    schedule = process.nextTick;
+} else if (typeof MutationObserver !== "undefined") {
     schedule = function(fn) {
         var div = document.createElement("div");
         var observer = new MutationObserver(fn);
@@ -3755,13 +3752,11 @@ else if (typeof MutationObserver !== "undefined") {
         return function() { div.classList.toggle("foo"); };
     };
     schedule.isStatic = true;
-}
-else if (typeof setTimeout !== "undefined") {
+} else if (typeof setTimeout !== "undefined") {
     schedule = function (fn) {
         setTimeout(fn, 0);
     };
-}
-else {
+} else {
     schedule = function() {
         throw new Error("No async scheduler available\u000a\u000a    See http://goo.gl/m3OTXk\u000a");
     };
diff --git a/package.json b/package.json
index 7711006..f1c0a7f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bluebird",
   "description": "Full featured Promises/A+ implementation with exceptionally good performance",
-  "version": "2.9.13",
+  "version": "2.9.14",
   "keywords": [
     "promise",
     "performance",
diff --git a/src/schedule.js b/src/schedule.js
index 13279e2..9aeeabd 100644
--- a/src/schedule.js
+++ b/src/schedule.js
@@ -1,11 +1,8 @@
 "use strict";
 var schedule;
 if (require("./util.js").isNode) {
-    var version = process.versions.node.split(".").map(Number);
-    schedule = (version[0] === 0 && version[1] > 10) || (version[0] > 0)
-        ? global.setImmediate : process.nextTick;
-}
-else if (typeof MutationObserver !== "undefined") {
+    schedule = process.nextTick;
+} else if (typeof MutationObserver !== "undefined") {
     schedule = function(fn) {
         var div = document.createElement("div");
         var observer = new MutationObserver(fn);
@@ -13,13 +10,11 @@ else if (typeof MutationObserver !== "undefined") {
         return function() { div.classList.toggle("foo"); };
     };
     schedule.isStatic = true;
-}
-else if (typeof setTimeout !== "undefined") {
+} else if (typeof setTimeout !== "undefined") {
     schedule = function (fn) {
         setTimeout(fn, 0);
     };
-}
-else {
+} else {
     schedule = function() {
         throw new Error(NO_ASYNC_SCHEDULER);
     };
diff --git a/tools/jshintrc_generator.js b/tools/jshintrc_generator.js
index 2be7963..7a47f40 100644
--- a/tools/jshintrc_generator.js
+++ b/tools/jshintrc_generator.js
@@ -12,6 +12,7 @@ var globals = fs.readFileAsync(constantsFile, "utf8").then(function(contents) {
     var m;
     var globals = {
         Error: true,
+        JSON: false,
         args: true,
         INLINE_SLICE: false,
         global: true,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-bluebird.git