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

2017-07-05 18:42:51 +02:00
parent 95e2efab89 e353627204
commit 37d5b0afb9
5 changed files with 22 additions and 3 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -309,6 +309,12 @@ define([
            typeof(proxy.edPublic) === 'string';
    };

+    common.hasCurveKeys = function (proxy) {
+        return typeof(proxy) === 'object' &&
+            typeof(proxy.curvePrivate) === 'string' &&
+            typeof(proxy.curvePublic) === 'string';
+    };
+
    common.isArray = $.isArray;

    /*