Mercurial Mercurial > corpus_parole / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add popcorn-js in dependencies
authorChloe Laisne <chloe.laisne@gmail.com>
Mon, 04 Jul 2016 17:56:05 +0200
changeset 221 0bee030d7411
parent 220 2145b80776a3
child 222 0eba8101b129
Add popcorn-js in dependencies Run [bower install]
cms/app-client/.jshintrc file | annotate | diff | comparison | revisions
cms/app-client/app/index.html file | annotate | diff | comparison | revisions
cms/app-client/bower.json file | annotate | diff | comparison | revisions
cms/app-client/ember-cli-build.js file | annotate | diff | comparison | revisions 
--- 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,
--- 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 @@
         <link rel="stylesheet" href="assets/vendor.css">
         <link rel="stylesheet" href="assets/app-client.css">
 
-        <script src="http://popcornjs.org/code/dist/popcorn-complete.js"></script>
-
         {{content-for "head-footer"}}
     </head>
     <body>
--- 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"
   }
 }
--- 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');
corpus_parole