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

www/admin/app-admin.less

@@ -89,10 +89,6 @@
 
     .cp-support-list-actions {
         margin: 10px 0px 10px 2px;
-        .cp-support-close {
-            order: 20;
-            margin-left: auto !important;
-        }
     }
 
     .cp-support-list-ticket {
@@ -119,6 +115,12 @@
     }
 
     .cp-support-list-ticket:not(.cp-support-list-closed) {
+        .cp-support-list-actions {
+            .cp-button-confirm, .cp-support-close {
+                order: 20;
+                margin-left: auto !important;
+            }
+        }
         .cp-support-list-message {
             &:last-child:not(.cp-support-fromadmin)  {
                 color: @colortheme_cp-red;

www/admin/inner.js

@@ -767,6 +767,7 @@ define([
                     if (!$ticket.length) { return; }
                     $ticket.addClass('cp-support-list-closed');
                     $ticket.append(APP.support.makeCloseMessage(content, hash));
+                    reorder();
                     return;
                 }
                 if (msg.type !== 'TICKET') { return; }
@@ -787,7 +788,12 @@ define([
                                 }));
                             });
                         }).nThen(function () {
-                            if (!error) { return void $ticket.remove(); }
+                            if (!error) {
+                                $ticket.remove();
+                                delete hashesById[id];
+                                reorder();
+                                return;
+                            }
                             // if deletion failed then reactivate the button and warn
                             hideButton.removeAttribute('disabled');
                             // and show a generic error message

www/common/outer/roster.js

@@ -1,5 +1,5 @@
 (function () {
-var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
+var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto, Feedback) {
     var Roster = {};
 
     // this constant is somewhat arbitrary.
@@ -587,6 +587,11 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
         // deleted while you are open
         // emit an event
         var onChannelError = function (info) {
+            if (Feedback) { Feedback.send('ROSTER_CHANNEL_ERROR='+(info && info.type)); }
+            if (info && info.type === "EUNKNOWN") {
+                // chainpad-netflux should recover by itself
+                return;
+            }
             if (!ready) { return void cb(info); }
             console.error("CHANNEL_ERROR", info);
         };
@@ -870,7 +875,8 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
             require("../../bower_components/chainpad-netflux/chainpad-netflux.js"),
             require("../../bower_components/json.sortify"),
             require("nthen"),
-            require("../../bower_components/chainpad-crypto/crypto")
+            require("../../bower_components/chainpad-crypto/crypto"),
+            null // no feedback here
         );
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
         require.config({ paths:  { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
@@ -880,16 +886,18 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
             '/bower_components/chainpad-netflux/chainpad-netflux.js',
             'json.sortify',
             '/bower_components/nthen/index.js',
-            '/bower_components/chainpad-crypto/crypto.js'
+            '/bower_components/chainpad-crypto/crypto.js',
+            '/common/common-feedback.js',
             //'/bower_components/tweetnacl/nacl-fast.min.js',
-        ], function (Util, Hash, CPNF, Sortify, nThen, Crypto) {
+        ], function (Util, Hash, CPNF, Sortify, nThen, Crypto, Feedback) {
             return factory.apply(null, [
                 Util,
                 Hash,
                 CPNF,
                 Sortify,
                 nThen,
-                Crypto
+                Crypto,
+                Feedback
             ]);
         });
     } else {

www/common/outer/team.js

@@ -1796,7 +1796,11 @@ define([
                 teams[id].keys.mailbox = deriveMailbox(teams[id]);
             }
             openChannel(ctx, teams[id], id, waitFor(function (err) {
-                if (err) { return void console.error(err); }
+                if (err) {
+                    var txt = typeof(err) === "string" ? err : (err.type || err.message);
+                    Feedback.send("TEAM_LOADING_ERROR="+txt);
+                    return void console.error(err);
+                }
                 console.debug('Team '+id+' ready');
             }));
         });

www/support/ui.js

@@ -307,7 +307,7 @@ define([
             var form = makeForm(ctx, function () {
                 var sent = sendForm(ctx, content.id, form, content.sender);
                 if (sent) {
-                    $(actions).show();
+                    $(actions).css('display', '');
                     $(form).remove();
                 }
             }, content.title);