From 56e4798dcff15569a9127a923745dd2f365365df Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswilli@gmail.com>
Date: Wed, 10 Dec 2014 05:48:43 +0000
Subject: [PATCH] Update to Ember 1.9.0.

No Issue
- Ember@1.9.0
- Handlebars@2.0.0
- grunt-ember-templates@0.5.0-alpha
---
 bower.json                                 | 4 ++--
 core/client/controllers/signin.js          | 5 ++++-
 core/test/functional/client/editor_test.js | 4 ++++
 package.json                               | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bower.json b/bower.json
index 4805b98192..6ce2607901 100644
--- a/bower.json
+++ b/bower.json
@@ -4,13 +4,13 @@
     "codemirror": "4.0.1",
     "Countable": "2.0.2",
     "device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d",
-    "ember": "1.8.1",
+    "ember": "1.9.0",
     "ember-data": "1.0.0-beta.11",
     "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
     "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",
     "ember-simple-auth": "0.7.2",
     "fastclick": "1.0.0",
-    "handlebars": "1.3.0",
+    "handlebars": "2.0.0",
     "ic-ajax": "1.0.1",
     "jquery": "1.11.0",
     "jquery-file-upload": "9.5.6",
diff --git a/core/client/controllers/signin.js b/core/client/controllers/signin.js
index 2be6f1fb00..4e685f02a4 100644
--- a/core/client/controllers/signin.js
+++ b/core/client/controllers/signin.js
@@ -9,7 +9,10 @@ var SigninController = Ember.Controller.extend(SimpleAuth.AuthenticationControll
         authenticate: function () {
             var data = this.getProperties('identification', 'password');
 
-            return this._super(data);
+            this._super(data).catch(function () {
+                // If simple-auth's authenticate rejects we need to catch it
+                // to avoid an unhandled rejection exception.
+            });
         },
 
         validateAndAuthenticate: function () {
diff --git a/core/test/functional/client/editor_test.js b/core/test/functional/client/editor_test.js
index 3ee8d28df7..e4841f56b2 100644
--- a/core/test/functional/client/editor_test.js
+++ b/core/test/functional/client/editor_test.js
@@ -285,6 +285,10 @@ CasperTest.begin('Tag editor', 7, function suite(test) {
         test.assertExists('#entry-tags', 'should have tag label area');
         test.assertExists('#entry-tags .tag-label', 'should have tag label icon');
         test.assertExists('#entry-tags input.tag-input', 'should have tag input area');
+    });
+
+    casper.thenClick('#entry-tags input.tag-input');
+    casper.then(function () {
         casper.sendKeys('#entry-tags input.tag-input', tagName);
         casper.sendKeys('#entry-tags input.tag-input', casper.page.event.key.Enter);
     });
diff --git a/package.json b/package.json
index b6575d55b5..f97fd3e4f4 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "grunt-contrib-uglify": "~0.6.0",
         "grunt-contrib-watch": "~0.6.1",
         "grunt-docker": "~0.0.8",
-        "grunt-ember-templates": "~0.4.23",
+        "grunt-ember-templates": "~0.5.0-alpha",
         "grunt-es6-module-transpiler": "~0.6.0",
         "grunt-express-server": "~0.4.19",
         "grunt-jscs": "~0.8.1",