Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/file/inner.js

@@ -120,7 +120,6 @@ define([
                             decrypted.callback();
                         }
 
-                        console.log(decrypted);
                         $dlview.show();
                         $dlform.hide();
                         var $dlButton = $dlview.find('media-tag button');
@@ -174,7 +173,6 @@ define([
                         var progress = e.originalEvent;
                         var p = progress.percent +'%';
                         $progress.width(p);
-                        console.log(progress.percent);
                     });
 
                     /**

www/file/main.js

@@ -2,15 +2,15 @@
 define([
     '/bower_components/nthen/index.js',
     '/api/config',
-    'jquery',
+    '/common/dom-ready.js',
     '/common/requireconfig.js',
     '/common/sframe-common-outer.js'
-], function (nThen, ApiConfig, $, RequireConfig, SFCommonO) {
+], function (nThen, ApiConfig, DomReady, RequireConfig, SFCommonO) {
     var requireConfig = RequireConfig();
 
     // Loaded in load #2
     nThen(function (waitFor) {
-        $(waitFor());
+        DomReady.onReady(waitFor());
     }).nThen(function (waitFor) {
         var req = {
             cfg: requireConfig,
@@ -19,7 +19,7 @@ define([
         };
         window.rc = requireConfig;
         window.apiconf = ApiConfig;
-        $('#sbox-iframe').attr('src',
+        document.getElementById('sbox-iframe').setAttribute('src',
             ApiConfig.httpSafeOrigin + '/file/inner.html?' + requireConfig.urlArgs +
                 '#' + encodeURIComponent(JSON.stringify(req)));