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 parent
107e75b287
commit
c341fa8e94
48 files changed
+121
-183
No files matched your search
@@ -1,10 +1,8 @@
|
||||
require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
|
||||
define([
|
||||
'jquery',
|
||||
'/common/cryptpad-common.js',
|
||||
'/common/pinpad.js',
|
||||
'/bower_components/jquery/dist/jquery.min.js',
|
||||
], function (Cryptpad, Pinpad) {
|
||||
var $ = window.jQuery;
|
||||
'/common/pinpad.js'
|
||||
], function ($, Cryptpad, Pinpad) {
|
||||
var APP = window.APP = {
|
||||
Cryptpad: Cryptpad,
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user