From 3a03dbe92f75fd066065d222ce7927edfefa9700 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 24 Aug 2015 12:28:03 -0700 Subject: [PATCH 1/6] Upgrade ember-cli-flash --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 595092f..073e7aa 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", "ember-cli-divshot": "^0.1.7", - "ember-cli-flash": "1.1.4", + "ember-cli-flash": "1.3.3", "ember-cli-htmlbars": "0.7.9", "ember-cli-htmlbars-inline-precompile": "^0.1.1", "ember-cli-ic-ajax": "0.2.1", From f1a1b1f63a31735fa48f3480e6eb6c9565f56aef Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 24 Aug 2015 12:28:14 -0700 Subject: [PATCH 2/6] Fix transition deprecation --- app/pods/login/controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js index 2b2a42a..fed3485 100644 --- a/app/pods/login/controller.js +++ b/app/pods/login/controller.js @@ -9,7 +9,7 @@ export default Ember.Controller.extend({ // Manually clean up because there might not be a transition this.get('flashMessages').clearMessages(); - this.transitionTo('loading').then(() => { + this.transitionToRoute('loading').then(() => { session.authenticate(authenticator, credentials).then(null, (error)=> { this.get('flashMessages').error(error.error); }); From 2599d13b44c4f891d6529d37813f7396ea698c77 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 24 Aug 2015 13:28:19 -0700 Subject: [PATCH 3/6] ember-cli 1.13.8 --- bower.json | 10 +++++----- package.json | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/bower.json b/bower.json index 1910ae0..2edf255 100644 --- a/bower.json +++ b/bower.json @@ -2,16 +2,16 @@ "name": "hymenobacterdotinfo", "dependencies": { "jquery": "~2.1.1", - "ember": "1.13.3", + "ember": "1.13.7", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", - "ember-data": "1.13.5", + "ember-data": "1.13.8", "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", - "ember-qunit": "0.4.1", + "ember-qunit": "0.4.9", "ember-qunit-notifications": "0.0.7", "ember-resolver": "~0.1.18", - "loader.js": "ember-cli/loader.js#3.2.0", - "qunit": "~1.17.1", + "loader.js": "ember-cli/loader.js#3.2.1", + "qunit": "~1.18.0", "flakes": "~1.0.0", "ember-simple-auth": "~0.8.0", "moment": "~2.9.0", diff --git a/package.json b/package.json index 073e7aa..b08c892 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "test": "tests" }, "scripts": { - "start": "ember server", "build": "ember build", + "start": "ember server", "test": "ember test" }, "repository": "", @@ -19,26 +19,27 @@ "author": "", "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.0.2", - "ember-cli": "1.13.1", - "ember-cli-app-version": "0.4.0", - "ember-cli-babel": "^5.0.0", + "broccoli-asset-rev": "^2.1.2", + "ember-cli": "1.13.8", + "ember-cli-app-version": "0.5.0", + "ember-cli-babel": "^5.1.3", "ember-cli-content-security-policy": "0.4.0", - "ember-cli-dependency-checker": "^1.0.0", + "ember-cli-dependency-checker": "^1.0.1", "ember-cli-divshot": "^0.1.7", "ember-cli-flash": "1.3.3", "ember-cli-htmlbars": "0.7.9", - "ember-cli-htmlbars-inline-precompile": "^0.1.1", + "ember-cli-htmlbars-inline-precompile": "^0.2.0", "ember-cli-ic-ajax": "0.2.1", - "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.15", + "ember-cli-inject-live-reload": "^1.3.1", + "ember-cli-qunit": "^1.0.0", "ember-cli-simple-auth": "^0.8.0", "ember-cli-simple-auth-token": "^0.7.2", "ember-cli-release": "0.2.3", - "ember-cli-uglify": "^1.0.1", - "ember-data": "1.13.5", + "ember-cli-sri": "^1.0.3", + "ember-cli-uglify": "^1.2.0", + "ember-data": "1.13.8", "ember-disable-proxy-controllers": "^1.0.0", - "ember-export-application-global": "^1.0.2", + "ember-export-application-global": "^1.0.3", "ember-select-2": "1.3.0" } } From fb88f494b2e887f0c2651a31c7ccbf3d993a3022 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 24 Aug 2015 13:40:33 -0700 Subject: [PATCH 4/6] Drop brocfile --- Brocfile.js | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Brocfile.js diff --git a/Brocfile.js b/Brocfile.js deleted file mode 100644 index 2d61bbc..0000000 --- a/Brocfile.js +++ /dev/null @@ -1,21 +0,0 @@ -/* global require, module */ - -var EmberApp = require('ember-cli/lib/broccoli/ember-app'); - -var app = new EmberApp(); - -// STYLES ////////////////////////////////////////////////////////////////////// -// flakes (and deps) -app.import('bower_components/flakes/css/all.css'); -app.import('bower_components/gridforms/gridforms/gridforms.css'); - -// LIBS //////////////////////////////////////////////////////////////////////// -// flakes (and deps) -app.import('bower_components/snapjs/snap.js'); -app.import('bower_components/responsive-elements/responsive-elements.js'); -app.import('bower_components/gridforms/gridforms/gridforms.js'); -app.import('bower_components/flakes/js/base.js'); -// moment -app.import('bower_components/moment/moment.js'); - -module.exports = app.toTree(); From 56c0e92fe6eb51cbf726352d55edf632811f9a6a Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 24 Aug 2015 13:40:40 -0700 Subject: [PATCH 5/6] Fix up moment js --- app/helpers/null-time.js | 4 +++- bower.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/helpers/null-time.js b/app/helpers/null-time.js index 67fbe1c..8d87835 100644 --- a/app/helpers/null-time.js +++ b/app/helpers/null-time.js @@ -1,7 +1,9 @@ import Ember from 'ember'; import { formatDate } from '../utils/date-helpers'; -export default Ember.Handlebars.makeBoundHelper(function(value, format) { +export default Ember.Helper.helper(function(params) { + let value = params[0], + format = params[1]; if (value == null) { return 'N/A'; } diff --git a/bower.json b/bower.json index 2edf255..48e0366 100644 --- a/bower.json +++ b/bower.json @@ -14,7 +14,7 @@ "qunit": "~1.18.0", "flakes": "~1.0.0", "ember-simple-auth": "~0.8.0", - "moment": "~2.9.0", + "moment": "~2.10.6", "select2": "3.5.2", "antiscroll": "git://github.com/azirbel/antiscroll.git#90391fb371c7be769bc32e7287c5271981428356", "jquery-mousewheel": "~3.1.4", From 2ae0523a9f1a78a932b5c0444a856a88e976a2c4 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 24 Aug 2015 15:25:42 -0700 Subject: [PATCH 6/6] DS deprecation (rollback) --- app/pods/protected/species/edit/controller.js | 2 +- app/pods/protected/strains/edit/controller.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pods/protected/species/edit/controller.js b/app/pods/protected/species/edit/controller.js index f8edd94..429ff0b 100644 --- a/app/pods/protected/species/edit/controller.js +++ b/app/pods/protected/species/edit/controller.js @@ -20,7 +20,7 @@ export default Ember.Controller.extend({ let species = this.get('model'); species.get('errors').clear(); - species.rollback(); + species.rollbackAttributes(); this.transitionToRoute('protected.species.show', species); }, diff --git a/app/pods/protected/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js index 02e76a4..d799574 100644 --- a/app/pods/protected/strains/edit/controller.js +++ b/app/pods/protected/strains/edit/controller.js @@ -21,7 +21,7 @@ export default Ember.Controller.extend({ let strain = this.get('strain'); strain.get('errors').clear(); - strain.rollback(); + strain.rollbackAttributes(); this.transitionToRoute('protected.strains.show', strain); },