From 023dd1dcff1ac83299e303e0422d1a95c7fade94 Mon Sep 17 00:00:00 2001 From: Mike North Date: Fri, 12 Jun 2015 11:26:17 -0700 Subject: [PATCH 1/2] Ember 1.8.x compatibility --- addon/services/resize.js | 2 +- app/acceptance-tests/injection-factories.js | 1 - bower.json | 5 +---- package.json | 14 +++++++------- 4 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 app/acceptance-tests/injection-factories.js diff --git a/addon/services/resize.js b/addon/services/resize.js index f36eccc8..38a894b2 100644 --- a/addon/services/resize.js +++ b/addon/services/resize.js @@ -3,7 +3,7 @@ import Ember from 'ember'; const { classify } = Ember.String; const { map } = Ember.EnumerableUtils; -export default Ember.Service.extend(Ember.Evented, { +export default Ember.Object.extend(Ember.Evented, { _oldWidth: null, _oldHeight: null, diff --git a/app/acceptance-tests/injection-factories.js b/app/acceptance-tests/injection-factories.js deleted file mode 100644 index a4677943..00000000 --- a/app/acceptance-tests/injection-factories.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'ember-resize/acceptance-tests/injection-factories'; \ No newline at end of file diff --git a/bower.json b/bower.json index fc71fc7b..aba57b8a 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ember-resize", "dependencies": { - "ember": "beta", + "ember": "~1.10.0", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", @@ -11,8 +11,5 @@ "jquery": "^1.11.1", "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1" - }, - "resolutions": { - "ember": "beta" } } diff --git a/package.json b/package.json index 4cc0ad06..b5a28c8b 100644 --- a/package.json +++ b/package.json @@ -27,19 +27,19 @@ "ember-cli-app-version": "0.3.3", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", - "ember-cli-github-pages": "0.0.4", - "ember-cli-htmlbars": "0.7.6", - "ember-cli-ic-ajax": "0.1.1", + "ember-cli-github-pages": "~0.0.6", + "ember-cli-htmlbars": "~0.7.7", + "ember-cli-ic-ajax": "~0.1.2", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.13", + "ember-cli-qunit": "~0.3.14", "ember-cli-sauce": "1.3.0", "ember-cli-uglify": "^1.0.1", "ember-disable-prototype-extensions": "^1.0.0", - "ember-disable-proxy-controllers": "^0.7.0", + "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", "ember-new-computed": "1.0.0", - "ember-suave": "0.1.9", - "ember-try": "0.0.5" + "ember-suave": "~0.1.9", + "ember-try": "~0.0.7" }, "keywords": [ "ember-addon", From eb8b202520e91cadfb0c20388da292fcc86a435f Mon Sep 17 00:00:00 2001 From: Mike North Date: Fri, 12 Jun 2015 11:50:17 -0700 Subject: [PATCH 2/2] Update dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5a28c8b..fc0409c4 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", "ember-cli-github-pages": "~0.0.6", - "ember-cli-htmlbars": "~0.7.7", + "ember-cli-htmlbars": "~0.7.8", "ember-cli-ic-ajax": "~0.1.2", "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "~0.3.14",