Merge branch 'sfPassword' into ro

2019-10-22 17:26:32 +02:00
parent e6267a89ff 126f10b782
commit 9477ae0895
14 changed files with 199 additions and 89 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -959,9 +959,7 @@ define([
                    href: href,
                    oldChannel: oldChannel,
                    password: newPassword
-                }, waitFor(function (obj) {
-                    console.error(obj);
-                }));
+                }, waitFor());
                return;
            }
            pad.leavePad({
@@ -998,8 +996,10 @@ define([
                }
            }));
            if (!isSharedFolder) {
-                common.unpinPads([oldChannel], waitFor(), teamId);
-                common.pinPads([newSecret.channel], waitFor(), teamId);
+                postMessage("CHANGE_PAD_PASSWORD_PIN", {
+                    oldChannel: oldChannel,
+                    channel: newSecret.channel
+                }, waitFor());
            }
        }).nThen(function () {
            cb({