Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
define([
|
||||
'jquery',
|
||||
'/customize/application_config.js',
|
||||
'/common/cryptpad-common.js',
|
||||
'/bower_components/jquery/dist/jquery.min.js',
|
||||
], function (Config, Cryptpad) {
|
||||
var $ = window.$;
|
||||
'/common/cryptpad-common.js'
|
||||
], function ($, Config, Cryptpad) {
|
||||
|
||||
var APP = window.APP = {
|
||||
Cryptpad: Cryptpad,
|
||||
@@ -191,4 +190,3 @@ define([
|
||||
console.log("ready");
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user