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

8 years ago · 6cb331887e
parent 9abfadb32f 4b95a1da48
commit 6cb331887e
4 changed files with 11 additions and 12 deletions
--- a/www/assert/translations/index.html
+++ b/www/assert/translations/index.html
@ -3,7 +3,7 @@
 <head>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <script data-main="main" src="/bower_components/requirejs/require.js"></script>
+    <script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
 </head>
 <body>

--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@ -103,11 +103,13 @@ define([
        return;
    };

-    var feedback = common.feedback = function (action) {
+    var feedback = common.feedback = function (action, force) {
+        if (force !== true) {
            if (!action) { return; }
            try {
                if (!getStore().getProxy().proxy.allowUserFeedback) { return; }
            } catch (e) { return void console.error(e); }
+        }

        var href = '/common/feedback.html?' + action + '=' + (+new Date());
        console.log('[feedback] %s', href);
@ -304,12 +306,12 @@ define([
    // Get the pads from localStorage to migrate them to the object store
    var getLegacyPads = common.getLegacyPads = function (cb) {
        require(['/customize/store.js'], function(Legacy) { // TODO DEPRECATE_F
-            feedback('MIGRATE_LEGACY_STORE');
            Legacy.ready(function (err, legacy) {
                if (err) { cb(err, null); return; }
                legacy.get(storageKey, function (err2, recentPads) {
                    if (err2) { cb(err2, null); return; }
                    if (Array.isArray(recentPads)) {
+                        feedback('MIGRATE_LEGACY_STORE');
                        cb(void 0, migrateRecentPads(recentPads));
                        return;
                    }
--- a/www/login/main.js
+++ b/www/login/main.js
@ -81,6 +81,7 @@ define([
                            proxy.edPrivate = result.edPrivate;
                            proxy.edPublic = result.edPublic;

+                            Cryptpad.feedback('LOGIN', true);
                            Cryptpad.whenRealtimeSyncs(result.realtime, function() {
                                Cryptpad.login(result.userHash, result.userName, function () {
                                    if (sessionStorage.redirectTo) {
--- a/www/register/main.js
+++ b/www/register/main.js
@ -67,11 +67,7 @@ define([
            proxy.edPublic = result.edPublic;
            proxy.edPrivate = result.edPrivate;

-            // feedback API won't work because proxy wasn't loaded
-            $.ajax({
-                type: 'HEAD',
-                url: '/common/feedback.html?REGISTRATION=' + (+new Date()),
-            });
+            Cryptpad.feedback('REGISTRATION', true);

            Cryptpad.whenRealtimeSyncs(result.realtime, function () {
                Cryptpad.login(result.userHash, result.userName, function () {