Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter

2017-04-18 12:14:32 +02:00
parent 107e75b287
commit c341fa8e94
48 changed files with 121 additions and 183 deletions
--- a/customize.dist/share/test.js
+++ b/customize.dist/share/test.js
@@ -1,8 +1,7 @@
 define([
-    '/customize/share/frame.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (Frame) {
-    var $ = window.jQuery;
+    'jquery',
+    '/customize/share/frame.js'
+], function ($, Frame) {

    var domain = 'https://beta.cryptpad.fr';

@@ -123,4 +122,3 @@ define([
        }].forEach(runTest);
    });
 });
-