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:
Caleb James DeLisle
2017-04-18 12:14:32 +02:00
parent 107e75b287
commit c341fa8e94
48 changed files with 121 additions and 183 deletions

View File

@@ -1,4 +1,5 @@
define([
'jquery',
'/api/config',
'/customize/messages.js',
'/common/fsStore.js',
@@ -8,17 +9,15 @@ define([
'/common/clipboard.js',
'/common/pinpad.js',
'/customize/application_config.js',
'/customize/application_config.js'
], function ($, Config, Messages, Store, Util, Hash, UI, Clipboard, Pinpad, AppConfig) {
'/bower_components/jquery/dist/jquery.min.js',
], function (Config, Messages, Store, Util, Hash, UI, Clipboard, Pinpad, AppConfig) {
/* This file exposes functionality which is specific to Cryptpad, but not to
any particular pad type. This includes functions for committing metadata
about pads to your local storage for future use and improved usability.
Additionally, there is some basic functionality for import/export.
*/
var $ = window.jQuery;
var common = window.Cryptpad = {
Messages: Messages,