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/www/login/main.js
+++ b/www/login/main.js
@@ -1,9 +1,8 @@
 define([
+    'jquery',
    '/common/cryptpad-common.js',
-    '/common/login.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (Cryptpad, Login) {
-    var $ = window.$;
+    '/common/login.js'
+], function ($, Cryptpad, Login) {

    var APP = window.APP = {
        Cryptpad: Cryptpad,
@@ -124,4 +123,3 @@ define([
        });
    });
 });
-