diff --git a/.gitignore b/.gitignore index 7da12c3..86fceae 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ # dependencies /node_modules -/bower_components/* +/bower_components # misc /.sass-cache diff --git a/.jshintrc b/.jshintrc index 7547475..fbcc848 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,9 +1,9 @@ { - "predef": { - "document": true, - "window": true, - "-Promise": true - }, + "predef": [ + "document", + "window", + "-Promise" + ], "browser" : true, "boss" : true, "curly": true, diff --git a/app/index.html b/app/index.html index 445648c..1628015 100644 --- a/app/index.html +++ b/app/index.html @@ -13,6 +13,8 @@ + {{content-for 'body'}} + diff --git a/package.json b/package.json index 7f939d6..1989816 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,13 @@ "license": "MIT", "devDependencies": { "body-parser": "^1.2.0", - "broccoli-asset-rev": "0.3.0", + "broccoli-asset-rev": "0.3.1", "broccoli-ember-hbs-template-compiler": "^1.6.1", - "ember-cli": "0.1.1", - "ember-cli-content-security-policy": "0.2.0", + "ember-cli": "0.1.2", + "ember-cli-content-security-policy": "0.3.0", + "ember-export-application-global": "^1.0.0", "ember-cli-ic-ajax": "0.1.1", - "ember-cli-inject-live-reload": "^1.2.2", + "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "0.1.0", "ember-data": "1.0.0-beta.10", "express": "^4.8.5", diff --git a/tests/index.html b/tests/index.html index 2ac5be4..a025d87 100644 --- a/tests/index.html +++ b/tests/index.html @@ -8,6 +8,7 @@ {{content-for 'head'}} + {{content-for 'test-head'}} @@ -33,6 +34,8 @@
+ {{content-for 'body'}} + {{content-for 'test-body'}}