Merge branch 'soon' into staging

customize.dist/about.html

@@ -8,7 +8,6 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
         <script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
 

customize.dist/contact.html

@@ -8,7 +8,6 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
         <script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
 

customize.dist/index.html

@@ -8,7 +8,6 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
         <script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
 

customize.dist/main.js

@@ -1,9 +1,8 @@
 define([
+    'jquery',
     '/customize/application_config.js',
-    '/common/cryptpad-common.js',
+    '/common/cryptpad-common.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Config, Cryptpad) {
-], function (Config, Cryptpad) {
-    var $ = window.$;
 
     var APP = window.APP = {
         Cryptpad: Cryptpad,
@@ -191,4 +190,3 @@ define([
         console.log("ready");
     });
 });
-

customize.dist/messages.js

@@ -23,12 +23,10 @@ var getLanguage = function () {
 };
 var language = getLanguage();
 
-var req = ['/customize/translations/messages.js'];
+var req = ['jquery', '/customize/translations/messages.js'];
 if (language && map[language]) { req.push('/customize/translations/messages.' + language + '.js'); }
-req.push('/bower_components/jquery/dist/jquery.min.js');
 
-define(req, function(Default, Language) {
+define(req, function($, Default, Language) {
-    var $ = window.jQuery;
 
     var externalMap = JSON.parse(JSON.stringify(map));
 

customize.dist/privacy.html

@@ -8,7 +8,6 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
         <script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
 

customize.dist/share/frame.js

@@ -163,12 +163,8 @@
 
     if (typeof(module) !== 'undefined' && module.exports) {
         module.exports = Frame;
-    }
+    } else if (typeof(define) === 'function' && define.amd) {
-    else if ((typeof(define) !== 'undefined' && define !== null) &&
+        define(['jquery'], function ($) {
-            (define.amd !== null)) {
-        define([
-            '/bower_components/jquery/dist/jquery.min.js',
-        ], function () {
             return Frame;
         });
     } else {

customize.dist/share/test.js

@@ -1,8 +1,7 @@
 define([
-    '/customize/share/frame.js',
+    'jquery',
-    '/bower_components/jquery/dist/jquery.min.js',
+    '/customize/share/frame.js'
-], function (Frame) {
+], function ($, Frame) {
-    var $ = window.jQuery;
 
     var domain = 'https://beta.cryptpad.fr';
 
@@ -123,4 +122,3 @@ define([
         }].forEach(runTest);
     });
 });
-

customize.dist/src/template.html

@@ -8,7 +8,6 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
     {{script}}
 </head>

customize.dist/terms.html

@@ -8,7 +8,6 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
         <script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
 

www/assert/main.js

@@ -1,12 +1,10 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
-    '/bower_components/jquery/dist/jquery.min.js',
+    'jquery',
     '/bower_components/hyperjson/hyperjson.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
     '/common/cryptpad-common.js',
-], function (jQuery, Hyperjson, TextPatcher, Sortify, Cryptpad) {
+], function ($, Hyperjson, TextPatcher, Sortify, Cryptpad) {
-    var $ = window.jQuery;
     window.Hyperjson = Hyperjson;
     window.TextPatcher = TextPatcher;
     window.Sortify = Sortify;

www/assert/media/main.js

@@ -1,8 +1,4 @@
-define([
+define(['jquery'], function ($) {
-    '/bower_components/jquery/dist/jquery.min.js',
-], function () {
-    var $ = window.jQuery;
-
     $('media').each(function () {
         window.alert("media tag selection works!");
     });

www/assert/pretty/main.js

@@ -1,8 +1,7 @@
 define([
-    '/bower_components/hyperjson/hyperjson.js',
+    'jquery',
-    '/bower_components/jquery/dist/jquery.min.js',
+    '/bower_components/hyperjson/hyperjson.js'
-], function (Hyperjson) {
+], function ($, Hyperjson) {
-    var $ = window.jQuery;
     var shjson = '["BODY",{"class":"cke_editable cke_editable_themed cke_contents_ltr cke_show_borders","spellcheck":"false"},[["P",{},["This is ",["STRONG",{},["CryptPad"]],", the zero knowledge realtime collaborative editor.",["BR",{},[]],"What you type here is encrypted so only people who have the link can access it.",["BR",{},[]],"Even the server cannot see what you type."]],["P",{},[["SMALL",{},[["I",{},["What you see here, what you hear here, when you leave here, let it stay here"]]]],["BR",{"type":"_moz"},[]]]]]]';
 
     var hjson = JSON.parse(shjson);

www/assert/translations/main.js

@@ -1,9 +1,8 @@
 define([
-    '/bower_components/jquery/dist/jquery.min.js',
+    'jquery',
     '/common/cryptpad-common.js',
     '/customize/translations/messages.js',
-], function (jQuery, Cryptpad, English) {
+], function ($, Cryptpad, English) {
-    var $ = window.jQuery;
 
     var $body = $('body');
 

www/code/main.js

@@ -1,5 +1,5 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
+    'jquery',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/textpatcher/TextPatcher.js',
@@ -12,10 +12,8 @@ define([
     '/common/themes.js',
     '/common/visible.js',
     '/common/notify.js',
-    '/bower_components/file-saver/FileSaver.min.js',
+    '/bower_components/file-saver/FileSaver.min.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT, Cryptpad, Cryptget, Modes, Themes, Visible, Notify) {
-], function (Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT, Cryptpad, Cryptget, Modes, Themes, Visible, Notify) {
-    var $ = window.jQuery;
     var saveAs = window.saveAs;
     var Messages = Cryptpad.Messages;
 

www/common/boot2.js

@@ -1,7 +1,14 @@
 // This is stage 1, it can be changed but you must bump the version of the project.
 define([], function () {
     // fix up locations so that relative urls work.
-    require.config({ baseUrl: window.location.pathname });
+    require.config({
+        baseUrl: window.location.pathname,
+        paths: {
+            // jquery declares itself as literally "jquery" so it cannot be pulled by path :(
+            "jquery": "/bower_components/jquery/dist/jquery.min",
+            // json.sortify same
+            "json.sortify": "/bower_components/json.sortify/dist/JSON.sortify"
+        }
+    });
     require([document.querySelector('script[data-bootload]').getAttribute('data-bootload')]);
 });
-

www/common/clipboard.js

@@ -1,7 +1,4 @@
-define([
+define(['jquery'], function ($) {
-    '/bower_components/jquery/dist/jquery.min.js',
-], function () {
-    var $ = window.jQuery;
     var Clipboard = {};
 
     // copy arbitrary text to the clipboard

www/common/common-interface.js

@@ -1,11 +1,10 @@
 define([
+    'jquery',
     '/customize/messages.js',
     '/common/common-util.js',
     '/customize/application_config.js',
-    '/bower_components/alertifyjs/dist/js/alertify.js',
+    '/bower_components/alertifyjs/dist/js/alertify.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Messages, Util, AppConfig, Alertify) {
-], function (Messages, Util, AppConfig, Alertify) {
-    var $ = window.jQuery;
 
     var UI = {};
 

www/common/cryptget.js

@@ -1,10 +1,10 @@
 define([
+    'jquery',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/common/cryptpad-common.js',
-    '/bower_components/textpatcher/TextPatcher.js',
+    '/bower_components/textpatcher/TextPatcher.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Crypto, Realtime, Cryptpad, TextPatcher) {
-], function (Crypto, Realtime, Cryptpad, TextPatcher) {
     var Messages = Cryptpad.Messages;
     var noop = function () {};
     var finish = function (S, err, doc) {

www/common/cryptpad-common.js

@@ -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,

www/common/fileObject.js

@@ -1,7 +1,6 @@
 define([
-    '/bower_components/jquery/dist/jquery.min.js',
+    'jquery',
-], function () {
+], function ($) {
-    var $ = window.jQuery;
     var module = {};
 
     var Messages = {};

www/common/fsStore.js

@@ -1,10 +1,10 @@
 define([
+    'jquery',
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js?v=0.1.5',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/common/userObject.js',
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Listmap, Crypto, TextPatcher, FO) {
-], function (Listmap, Crypto, TextPatcher, FO) {
     /*
         This module uses localStorage, which is synchronous, but exposes an
         asyncronous API. This is so that we can substitute other storage
@@ -13,7 +13,6 @@ define([
         To override these methods, create another file at:
         /customize/storage.js
     */
-    var $ = window.jQuery;
 
     var Store = {};
     var store;

www/common/login.js

@@ -1,12 +1,12 @@
 define([
+    'jquery',
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/cryptpad-common.js',
     '/common/credential.js',
     '/bower_components/tweetnacl/nacl-fast.min.js',
     '/bower_components/scrypt-async/scrypt-async.min.js', // better load speed
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Listmap, Crypto, Cryptpad, Cred) {
-], function (Listmap, Crypto, Cryptpad, Cred) {
     var Exports = {
         Cred: Cred,
     };

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',

www/common/toolbar.js

@@ -1,9 +1,8 @@
 define([
+    'jquery',
     '/customize/application_config.js',
-    '/api/config',
+    '/api/config'
-    '/bower_components/jquery/dist/jquery.min.js'
+], function ($, Config, ApiConfig) {
-], function (Config, ApiConfig) {
-    var $ = window.jQuery;
 
     var Messages = {};
 

www/common/userObject.js

@@ -1,7 +1,6 @@
 define([
-    '/bower_components/jquery/dist/jquery.min.js',
+    'jquery',
-], function () {
+], function ($) {
-    var $ = window.jQuery;
     var module = {};
 
     var ROOT = module.ROOT = "root";
@@ -897,4 +896,3 @@ define([
 
     return module;
 });
-

www/drive/main.js

@@ -1,5 +1,5 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
+    'jquery',
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
@@ -10,11 +10,10 @@ define([
     '/customize/application_config.js',
     '/common/cryptget.js',
     '/common/mergeDrive.js'
-], function (Listmap, Crypto, TextPatcher, JSONSortify, Cryptpad, FO, Toolbar, AppConfig, Get, Merge) {
+], function ($, Listmap, Crypto, TextPatcher, JSONSortify, Cryptpad, FO, Toolbar, AppConfig, Get, Merge) {
     var module = window.MODULE = {};
 
     var Messages = Cryptpad.Messages;
-    var $ = window.jQuery;
     var saveAs = window.saveAs;
 
     // Use `$(function () {});` to make sure the html is loaded before doing anything else

www/examples/board/board.js

@@ -1,7 +1,6 @@
 define([
-    '/bower_components/jquery/dist/jquery.min.js',
+    'jquery'
-],function () {
+],function ($) {
-    var $ = window.jQuery;
     var Board = {};
     var proxy;
 

www/examples/board/main.js

@@ -1,5 +1,6 @@
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    'jquery',
+    '/api/config',
     '/customize/messages.js',
     'board.js',
     '/bower_components/textpatcher/TextPatcher.js',
@@ -8,10 +9,9 @@ define([
     '/common/cryptpad-common.js',
     '/common/visible.js',
     '/common/notify.js',
-    '/bower_components/file-saver/FileSaver.min.js',
+    '/bower_components/file-saver/FileSaver.min.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Config, Messages, Board, TextPatcher, Listmap, Crypto, Cryptpad, Visible, Notify) {
-], function (Config, Messages, Board, TextPatcher, Listmap, Crypto, Cryptpad, Visible, Notify) {
+
-    var $ = window.jQuery;
     var saveAs = window.saveAs;
 
     Cryptpad.styleAlerts();

www/examples/form/main.js

@@ -1,16 +1,14 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    'jquery',
+    '/api/config',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
     'ula.js',
     '/bower_components/chainpad-json-validator/json-ot.js',
-    '/common/cryptpad-common.js',
+    '/common/cryptpad-common.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Config, Realtime, Crypto, TextPatcher, Sortify, Formula, JsonOT, Cryptpad) {
-], function (Config, Realtime, Crypto, TextPatcher, Sortify, Formula, JsonOT, Cryptpad) {
-    var $ = window.jQuery;
 
     var secret = Cryptpad.getSecrets();
 

www/examples/hack/main.js

@@ -1,12 +1,11 @@
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    'jquery',
+    '/api/config',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
-    '/common/cryptpad-common.js',
+    '/common/cryptpad-common.js'
-    '/bower_components/jquery/dist/jquery.min.js'
+], function ($, Config, Realtime, Crypto, TextPatcher, Cryptpad) {
-], function (Config, Realtime, Crypto, TextPatcher, Cryptpad) {
-    var $ = window.jQuery;
 
     var secret = Cryptpad.getSecrets();
 

www/examples/json/main.js

@@ -1,11 +1,10 @@
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    'jquery',
+    '/api/config',
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',
-    '/common/cryptpad-common.js',
+    '/common/cryptpad-common.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Config, RtListMap, Crypto, Common) {
-], function (Config, RtListMap, Crypto, Common) {
-    var $ = window.jQuery;
 
     var secret = Common.getSecrets();
 

www/examples/pin/main.js

@@ -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',
+    '/common/pinpad.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Cryptpad, Pinpad) {
-], function (Cryptpad, Pinpad) {
-    var $ = window.jQuery;
     var APP = window.APP = {
         Cryptpad: Cryptpad,
     };

www/examples/read/main.js

@@ -1,8 +1,7 @@
 define([
-    '/common/cryptget.js',
+    'jquery',
-    '/bower_components/jquery/dist/jquery.min.js',
+    '/common/cryptget.js'
-], function (Crypt) {
+], function ($, Crypt) {
-    var $ = window.jQuery;
 
     var $target = $('#target');
     var $dest = $('#dest');

www/examples/render/main.js

@@ -1,14 +1,13 @@
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    'jquery',
+    '/api/config',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/marked/marked.min.js',
     '/bower_components/hyperjson/hyperjson.js',
     '/common/cryptpad-common.js',
-    '/bower_components/jquery/dist/jquery.min.js',
     '/bower_components/diff-dom/diffDOM.js',
-], function (Config, Realtime, Crypto, Marked, Hyperjson, Cryptpad) {
+], function ($, Config, Realtime, Crypto, Marked, Hyperjson, Cryptpad) {
-    var $ = window.jQuery;
     var DiffDom = window.diffDOM;
 
     var secret = Cryptpad.getSecrets();

www/examples/style/main.js

@@ -1,13 +1,12 @@
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    'jquery',
+    '/api/config',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
-    '/common/cryptpad-common.js',
+    '/common/cryptpad-common.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Config, Realtime, Crypto, TextPatcher, Cryptpad) {
-], function (Config, Realtime, Crypto, TextPatcher, Cryptpad) {
     // TODO consider adding support for less.js
-    var $ = window.jQuery;
 
     var $style = $('style').first(),
         $edit = $('#edit');

www/examples/text/main.js

@@ -1,12 +1,11 @@
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    'jquery',
+    '/api/config',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
-    '/common/cryptpad-common.js',
+    '/common/cryptpad-common.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Config, Realtime, Crypto, TextPatcher, Cryptpad) {
-], function (Config, Realtime, Crypto, TextPatcher, Cryptpad) { 
-    var $ = window.jQuery;
 
     var secret = Cryptpad.getSecrets();
 

www/examples/upload/main.js

@@ -1,9 +1,8 @@
 define([
+    'jquery',
     '/common/cryptget.js',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/bower_components/chainpad-crypto/crypto.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Crypt, Crypto) {
-], function (Crypt, Crypto) {
-    var $ = window.jQuery;
     var Nacl = window.nacl;
 
     var key = Nacl.randomBytes(32);

www/login/index.html

@@ -7,7 +7,6 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
     <script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
 </head>

www/login/main.js

@@ -1,9 +1,8 @@
 define([
+    'jquery',
     '/common/cryptpad-common.js',
-    '/common/login.js',
+    '/common/login.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Cryptpad, Login) {
-], function (Cryptpad, Login) {
-    var $ = window.$;
 
     var APP = window.APP = {
         Cryptpad: Cryptpad,
@@ -124,4 +123,3 @@ define([
         });
     });
 });
-

www/pad/main.js

@@ -1,5 +1,5 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
+    'jquery',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/hyperjson/hyperjson.js',
@@ -15,12 +15,10 @@ define([
     '/common/notify.js',
     '/pad/links.js',
     '/bower_components/file-saver/FileSaver.min.js',
-    '/bower_components/diff-dom/diffDOM.js',
+    '/bower_components/diff-dom/diffDOM.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Crypto, realtimeInput, Hyperjson,
-], function (Crypto, realtimeInput, Hyperjson,
     Toolbar, Cursor, JsonOT, TypingTest, JSONSortify, TextPatcher, Cryptpad, Cryptget,
     Visible, Notify, Links) {
-    var $ = window.jQuery;
     var saveAs = window.saveAs;
     var Messages = Cryptpad.Messages;
 

www/poll/main.js

@@ -1,4 +1,5 @@
 define([
+    'jquery',
     '/bower_components/textpatcher/TextPatcher.js',
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',
@@ -9,10 +10,8 @@ define([
     '/common/toolbar.js',
     '/common/visible.js',
     '/common/notify.js',
-    '/bower_components/file-saver/FileSaver.min.js',
+    '/bower_components/file-saver/FileSaver.min.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, TextPatcher, Listmap, Crypto, Cryptpad, Cryptget, Hyperjson, Renderer, Toolbar, Visible, Notify) {
-], function (TextPatcher, Listmap, Crypto, Cryptpad, Cryptget, Hyperjson, Renderer, Toolbar, Visible, Notify) {
-    var $ = window.jQuery;
 
     var Messages = Cryptpad.Messages;
 
@@ -843,4 +842,3 @@ define([
 
     });
 });
-

www/register/main.js

@@ -1,11 +1,10 @@
 define([
+    'jquery',
     '/common/login.js',
     '/common/cryptpad-common.js',
     '/common/cryptget.js',
-    '/common/credential.js',
+    '/common/credential.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Login, Cryptpad, Crypt) {
-], function (Login, Cryptpad, Crypt) {
-    var $ = window.jQuery;
 
     var APP = window.APP = {
         Login: Login,

www/settings/index.html

@@ -8,7 +8,6 @@
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
         <link rel="stylesheet" type="text/css" href="main.css" />
     <script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>

www/settings/main.js

@@ -1,11 +1,10 @@
 define([
+    'jquery',
     '/common/cryptpad-common.js',
     '/common/cryptget.js',
     '/common/mergeDrive.js',
-    '/bower_components/file-saver/FileSaver.min.js',
+    '/bower_components/file-saver/FileSaver.min.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Cryptpad, Crypt, Merge) {
-], function (Cryptpad, Crypt, Merge) {
-    var $ = window.jQuery;
     var saveAs = window.saveAs;
 
     var USERNAME_KEY = 'cryptpad.username';
@@ -358,4 +357,3 @@ define([
         }
     });
 });
-

www/slide/main.js

@@ -1,5 +1,5 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
+    'jquery',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/textpatcher/TextPatcher.js',
@@ -13,10 +13,8 @@ define([
     '/common/visible.js',
     '/common/notify.js',
     '/slide/slide.js',
-    '/bower_components/file-saver/FileSaver.min.js',
+    '/bower_components/file-saver/FileSaver.min.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+], function ($, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT, Cryptpad, Cryptget, Modes, Themes, Visible, Notify, Slide) {
-], function (Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT, Cryptpad, Cryptget, Modes, Themes, Visible, Notify, Slide) {
-    var $ = window.jQuery;
     var saveAs = window.saveAs;
 
     var Messages = Cryptpad.Messages;

www/slide/slide.js

@@ -1,9 +1,8 @@
 define([
+    'jquery',
     '/bower_components/marked/marked.min.js',
-    '/bower_components/diff-dom/diffDOM.js',
+    '/bower_components/diff-dom/diffDOM.js'
-    '/bower_components/jquery/dist/jquery.min.js',
+],function ($, Marked) {
-],function (Marked) {
-    var $ = window.jQuery;
     var DiffDOM = window.diffDOM;
 
     var renderer = new Marked.Renderer();

www/whiteboard/main.js

@@ -1,9 +1,6 @@
-require.config({ paths: {
-    'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify'
-}});
-
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    'jquery',
+    '/api/config',
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/toolbar.js',
@@ -17,14 +14,12 @@ define([
     '/common/notify.js',
     '/customize/application_config.js',
     '/bower_components/secure-fabric.js/dist/fabric.min.js',
-    '/bower_components/jquery/dist/jquery.min.js',
     '/bower_components/file-saver/FileSaver.min.js',
-], function (Config, Realtime, Crypto, Toolbar, TextPatcher, JSONSortify, JsonOT, Cryptpad, Cryptget, Colors, Visible, Notify, AppConfig) {
+], function ($, Config, Realtime, Crypto, Toolbar, TextPatcher, JSONSortify, JsonOT, Cryptpad, Cryptget, Colors, Visible, Notify, AppConfig) {
     var saveAs = window.saveAs;
     var Messages = Cryptpad.Messages;
 
-    var module = window.APP = { };
+    var module = window.APP = { $:$ };
-    var $ = module.$ = window.jQuery;
     var Fabric = module.Fabric = window.fabric;
 
     $(function () {