# HG changeset patch # User Chloe Laisne # Date 1467647765 -7200 # Node ID 0bee030d74113d11894a0327440b2925d8bbfb47 # Parent 2145b80776a3820c5b17790156deb2eabbcbf58e Add popcorn-js in dependencies Run [bower install] diff -r 2145b80776a3 -r 0bee030d7411 cms/app-client/.jshintrc --- a/cms/app-client/.jshintrc Mon Jul 04 16:18:19 2016 +0200 +++ b/cms/app-client/.jshintrc Mon Jul 04 17:56:05 2016 +0200 @@ -1,5 +1,6 @@ { "predef": [ + "Popcorn", "server", "document", "window", @@ -15,7 +16,6 @@ "forin": false, "immed": false, "laxbreak": false, - "newcap": true, "noarg": true, "noempty": false, "nonew": false, diff -r 2145b80776a3 -r 0bee030d7411 cms/app-client/app/index.html --- a/cms/app-client/app/index.html Mon Jul 04 16:18:19 2016 +0200 +++ b/cms/app-client/app/index.html Mon Jul 04 17:56:05 2016 +0200 @@ -14,8 +14,6 @@ - - {{content-for "head-footer"}} diff -r 2145b80776a3 -r 0bee030d7411 cms/app-client/bower.json --- a/cms/app-client/bower.json Mon Jul 04 16:18:19 2016 +0200 +++ b/cms/app-client/bower.json Mon Jul 04 17:56:05 2016 +0200 @@ -13,6 +13,7 @@ "pretender": "~1.1.0", "lodash": "~4.11.1", "Faker": "~3.1.0", - "store": "https://github.com/marcuswestin/store.js.git#v1.3.20" + "store": "https://github.com/marcuswestin/store.js.git#v1.3.20", + "popcorn-js": "popcornjs#^1.5.11" } } diff -r 2145b80776a3 -r 0bee030d7411 cms/app-client/ember-cli-build.js --- a/cms/app-client/ember-cli-build.js Mon Jul 04 16:18:19 2016 +0200 +++ b/cms/app-client/ember-cli-build.js Mon Jul 04 17:56:05 2016 +0200 @@ -27,6 +27,7 @@ // modules that you would like to import into your application // please specify an object with the list of modules as keys // along with the exports of each module as its value. + app.import('bower_components/popcorn-js/popcorn.js'); app.import('bower_components/ammap3/ammap/ammap.js'); app.import('bower_components/ammap3/ammap/maps/js/worldLow.js'); app.import('bower_components/ammap3/ammap/maps/js/continentsLow.js');