Merge branch 'staging' into slide2

2017-09-08 18:21:38 +02:00
parent 514bff7065 0ed6846e07
commit 5bf966633c
6 changed files with 134 additions and 104 deletions
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -75,9 +75,7 @@ define([
            var userHref = Cryptpad.getUserHrefFromKeys(accountName, publicKey);
            var $pubLabel = $('<span>', {'class': 'label'})
                .text(Messages.settings_publicSigningKey);
-            var $pubKey = $('<input>', {type: 'text', readonly: true})
-                .val(userHref);
-            $key.append($pubLabel).append($pubKey);
+            $key.append($pubLabel).append(Cryptpad.dialog.selectable(userHref));
        }

        return $div;