From f76dc615c0627906eab08eb77ee01a6609b8c5d6 Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 3 Jun 2016 18:51:31 +0200 Subject: [PATCH] use chainpad-crypto from bower and pass it into the listmap api --- bower.json | 3 ++- www/json/main.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 56205905c..f80f20181 100644 --- a/bower.json +++ b/bower.json @@ -33,6 +33,7 @@ "textpatcher": "^1.2.0", "proxy-polyfill": "^0.1.5", "chainpad": "^0.2.2", - "chainpad-json-validator": "^0.1.1" + "chainpad-json-validator": "^0.1.1", + "chainpad-crypto": "^0.1.1" } } diff --git a/www/json/main.js b/www/json/main.js index 64f1ac552..e81295e99 100644 --- a/www/json/main.js +++ b/www/json/main.js @@ -1,7 +1,7 @@ define([ '/api/config?cb=' + Math.random().toString(16).substring(2), '/common/chainpad-listmap.js', - '/common/crypto.js', + '/bower_components/chainpad-crypto/crypto.js', '/common/cryptpad-common.js', //'/customize/pad.js' ], function (Config, RtListMap, Crypto, Common) { @@ -14,6 +14,7 @@ define([ channel: secret.channel, cryptKey: secret.key, data: {}, + crypto: Crypto }; var module = window.APP = {};