diff --git a/app/initializers/prerequisites.js b/app/initializers/prerequisites.js index 765de0a..f5b4026 100644 --- a/app/initializers/prerequisites.js +++ b/app/initializers/prerequisites.js @@ -1,9 +1,10 @@ +/* jshint -W030 */ import Ember from 'ember'; import config from 'share-drop/config/environment'; import FileSystem from '../services/file'; import Analytics from '../services/analytics'; -export function initialize(container, application) { +export function initialize(application) { application.deferReadiness(); checkWebRTCSupport() diff --git a/bower.json b/bower.json index f25918e..8cbc96a 100644 --- a/bower.json +++ b/bower.json @@ -1,20 +1,17 @@ { "name": "share-drop", "dependencies": { - "ember": "2.1.0-beta.4", + "ember": "2.2.0-beta.1", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.6", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7", "ember-qunit": "0.4.9", "ember-qunit-notifications": "0.0.7", - "jquery": "^1.11.3", + "jquery": "^2.1.4", "loader.js": "ember-cli/loader.js#3.2.1", "qunit": "~1.18.0" }, "devDependencies": { "bootstrap": "~3.3.1" - }, - "resolutions": { - "ember": "2.1.0-beta.4" } }