Update Ember.js to 1.10

This commit is contained in:
Piotr Sarnacki 2015-02-17 13:35:58 +01:00
parent 99801ee6ab
commit 84010f63c4
3 changed files with 8 additions and 3 deletions

View File

@ -21,7 +21,12 @@ if (process.env.DISABLE_FINGERPRINTS) {
}
var app = new EmberApp({
fingerprint: fingerprint
fingerprint: fingerprint,
vendorFiles: {
// next line is needed to prevent ember-cli to load
// handlebars (it happens automatically in 0.1.x)
'handlebars.js': null
}
});
app.import('bower_components/pusher/dist/pusher.js');

View File

@ -3,7 +3,7 @@
"dependencies": {
"handlebars": "2.0.0",
"jquery": "^1.11.1",
"ember": "1.9.1",
"ember": "1.10.0",
"ember-data": "1.0.0-beta.14",
"ember-resolver": "~0.1.11",
"loader.js": "ember-cli/loader.js#1.0.1",

View File

@ -28,7 +28,7 @@
"ember-cli-content-security-policy": "0.3.0",
"ember-cli-dependency-checker": "0.0.7",
"ember-cli-document-title": "0.0.1",
"ember-cli-htmlbars": "^0.6.0",
"ember-cli-htmlbars": "^0.7.0",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-inline-images": "^0.0.4",