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/mergeDrive.js
+++ b/www/common/mergeDrive.js
@@ -1,4 +1,3 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
    '/common/cryptpad-common.js',
    '/common/cryptget.js',