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/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1,9 +1,8 @@
 define([
+    'jquery',
    '/customize/application_config.js',
-    '/api/config',
-    '/bower_components/jquery/dist/jquery.min.js'
-], function (Config, ApiConfig) {
-    var $ = window.jQuery;
+    '/api/config'
+], function ($, Config, ApiConfig) {

    var Messages = {};