web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use chainpad-crypto from bower and pass it into the listmap api

Browse Source
This commit is contained in:
ansuz 2016-06-03 18:51:31 +02:00
parent 85dbd5cb6e
commit f76dc615c0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -33,6 +33,7 @@
"textpatcher": "^1.2.0", "textpatcher": "^1.2.0",
"proxy-polyfill": "^0.1.5", "proxy-polyfill": "^0.1.5",
"chainpad": "^0.2.2", "chainpad": "^0.2.2",
"chainpad-json-validator": "^0.1.1" "chainpad-json-validator": "^0.1.1",
"chainpad-crypto": "^0.1.1"
} }
} }

3
www/json/main.js
View File

@ -1,7 +1,7 @@
define([ define([
'/api/config?cb=' + Math.random().toString(16).substring(2), '/api/config?cb=' + Math.random().toString(16).substring(2),
'/common/chainpad-listmap.js', '/common/chainpad-listmap.js',
'/common/crypto.js', '/bower_components/chainpad-crypto/crypto.js',
'/common/cryptpad-common.js', '/common/cryptpad-common.js',
//'/customize/pad.js' //'/customize/pad.js'
], function (Config, RtListMap, Crypto, Common) { ], function (Config, RtListMap, Crypto, Common) {
@ -14,6 +14,7 @@ define([
channel: secret.channel, channel: secret.channel,
cryptKey: secret.key, cryptKey: secret.key,
data: {}, data: {},
crypto: Crypto
}; };
var module = window.APP = {}; var module = window.APP = {};