From eec51a1e83b5018576b96a09ee07915cedab9313 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 15 Jun 2014 10:38:27 +0200
Subject: [PATCH] js: Upgrade to when.js 3

---
 docs/changelog.rst | 7 +++++++
 js/README.md       | 8 ++++++++
 js/package.json    | 4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b10575ed..e0baee0f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -78,6 +78,13 @@ Feature release.
   Mopidy's HTTP server among other Zeroconf-published HTTP servers on the
   local network.
 
+- Update Mopidy.js to use when.js 3. If you maintain a Mopidy client, you
+  should review the `differences between when.js 2 and 3
+  <https://github.com/cujojs/when/blob/master/docs/api.md#upgrading-to-30-from-2x>`_
+  and the `when.js debugging guide
+  <https://github.com/cujojs/when/blob/master/docs/api.md#debugging-promises>`_.
+  This version has been released to npm as Mopidy.js v0.3.0.
+
 **MPD frontend**
 
 - Proper command tokenization for MPD requests. This replaces the old regex
diff --git a/js/README.md b/js/README.md
index 31d030d1..9f5bf9e6 100644
--- a/js/README.md
+++ b/js/README.md
@@ -80,6 +80,14 @@ To run other [grunt](http://gruntjs.com/) targets which isn't predefined in
 Changelog
 ---------
 
+### 0.3.0 (UNRELEASED)
+
+- Upgrade to when.js 3, which brings great performance improvements and better
+  debugging facilities. If you maintain a Mopidy client, you should review the
+  [differences between when.js 2 and 3](https://github.com/cujojs/when/blob/master/docs/api.md#upgrading-to-30-from-2x)
+  and the
+  [when.js debugging guide](https://github.com/cujojs/when/blob/master/docs/api.md#debugging-promises).
+
 ### 0.2.0 (2014-01-04)
 
 - **Backwards incompatible change for Node.js users:**
diff --git a/js/package.json b/js/package.json
index 4bf9fcb0..4082afb9 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mopidy",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Client lib for controlling a Mopidy music server over a WebSocket",
   "homepage": "http://www.mopidy.com/",
   "author": {
@@ -16,7 +16,7 @@
   "dependencies": {
     "bane": "~1.1.0",
     "faye-websocket": "~0.7.2",
-    "when": "~2.7.1"
+    "when": "~3.2.3"
   },
   "devDependencies": {
     "buster": "~0.7.13",