Mercurial > wikked

changeset 179:825d05a9ee67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bundle `pagedown` scripts with the rest.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 01 Feb 2014 14:01:02 -0800
parents 1e67c488240a
children ca1a810a4811
files Gruntfile.js wikked/assets/js/wikked.js
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Gruntfile.js	Wed Jan 29 08:19:32 2014 -0800
+++ b/Gruntfile.js	Sat Feb 01 14:01:02 2014 -0800
@@ -75,7 +75,6 @@
       production: {
         files: [
           {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['js/require.js']},
-          {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['js/pagedown/**']},
           {expand: true, cwd: 'wikked/assets/', dest: 'wikked/static/', src: ['bootstrap/fonts/**']}
         ]
       }
--- a/wikked/assets/js/wikked.js	Wed Jan 29 08:19:32 2014 -0800
+++ b/wikked/assets/js/wikked.js	Sat Feb 01 14:01:02 2014 -0800
@@ -15,7 +15,10 @@
         bootstrap_modal: 'bootstrap/js/modal',
         bootstrap_tooltip: 'bootstrap/js/tooltip',
         bootstrap_alert: 'bootstrap/js/alert',
-        bootstrap_collapse: 'bootstrap/js/collapse'
+        bootstrap_collapse: 'bootstrap/js/collapse',
+        pagedown_converter: 'js/pagedown/Markdown.Converter',
+        pagedown_editor: 'js/pagedown/Markdown.Editor',
+        pagedown_sanitizer: 'js/pagedown/Markdown.Sanitizer'
     },
     shim: {
         'jquery': {
@@ -39,6 +42,15 @@
         },
         'bootstrap_collapse': {
             deps: ['jquery']
+        },
+        'pagedown_converter': {
+            exports: 'Markdown'
+        },
+        'pagedown_editor': {
+            deps: ['pagedown_converter']
+        },
+        'pagedown_sanitizer': {
+            deps: ['pagedown_editor']
         }
     }
 });