Mercurial > wikked

changeset 415:67cda09b0524

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
web: Add cache-bust argument for development mode.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 20 Mar 2017 23:05:53 -0700
parents 8fe1e38f2917
children a11a7afb53a7
files Gruntfile.js wikked/assets/js/wikked-dev.js wikked/templates/index.html
diffstat 3 files changed, 28 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Gruntfile.js	Mon Mar 20 23:05:07 2017 -0700
+++ b/Gruntfile.js	Mon Mar 20 23:05:53 2017 -0700
@@ -30,7 +30,7 @@
         options: {
           optimize: "none",
           baseUrl: "wikked/assets/js",
-          mainConfigFile: "wikked/assets/js/wikked.js",
+          mainConfigFile: "wikked/assets/js/wikked-dev.js",
           dir: "wikked/static/js",
           modules: [
           {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wikked/assets/js/wikked-dev.js	Mon Mar 20 23:05:53 2017 -0700
@@ -0,0 +1,25 @@
+/**
+ * RequireJS configuration.
+ *
+ * We need to alias/shim some of the libraries.
+ */
+require.config({
+    urlArgs: 'bust=' + (new Date()).getTime(),
+    paths: {
+        jquery: 'jquery-1.8.3.min',
+        jquery_validate: 'jquery/jquery.validate.min',
+        underscore: 'underscore-min',
+    },
+    shim: {
+        'jquery': {
+            exports: '$'
+        },
+        'jquery_validate': {
+            deps: ['jquery']
+        },
+        'underscore': {
+            exports: '_'
+        }
+    }
+});
+
--- a/wikked/templates/index.html	Mon Mar 20 23:05:07 2017 -0700
+++ b/wikked/templates/index.html	Mon Mar 20 23:05:53 2017 -0700
@@ -22,9 +22,9 @@
         {% block scripts %}
         {% if is_dev %}
         {% if not no_js %}
-        <script data-main="/dev-assets/js/wikked.js" src="/dev-assets/js/require.js"></script>
+        <script data-main="/dev-assets/js/wikked-dev.js" src="/dev-assets/js/require.js"></script>
         <script>
-        require(['wikked.app'], function(edit) {});
+        require(['wikked.app'], function(app) {});
         </script>
         {% endif %}
         {% else %}