mirror of https://github.com/xwiki-labs/cryptpad
fix json.sortify in browser contexts. lint compliance
This commit is contained in:
parent
4269cb1ec7
commit
7230ee71a8
|
@ -400,7 +400,7 @@ nThen(function (w) {
|
||||||
if (err) { return void console.log(err); }
|
if (err) { return void console.log(err); }
|
||||||
console.log("STATE =", JSON.stringify(oscar.roster.getState(), null, 2));
|
console.log("STATE =", JSON.stringify(oscar.roster.getState(), null, 2));
|
||||||
}));
|
}));
|
||||||
}).nThen(function (w) {
|
}).nThen(function () {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -493,7 +493,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
|
||||||
// commands
|
// commands
|
||||||
roster.checkpoint = function (_cb) {
|
roster.checkpoint = function (_cb) {
|
||||||
var cb = Util.once(Util.mkAsync(_cb));
|
var cb = Util.once(Util.mkAsync(_cb));
|
||||||
var state = ref.state;
|
//var state = ref.state;
|
||||||
//if (!state) { return cb("UNINITIALIZED"); }
|
//if (!state) { return cb("UNINITIALIZED"); }
|
||||||
send([ 'CHECKPOINT', ref.state], cb);
|
send([ 'CHECKPOINT', ref.state], cb);
|
||||||
};
|
};
|
||||||
|
@ -626,11 +626,12 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
|
||||||
require("../../bower_components/chainpad-crypto/crypto")
|
require("../../bower_components/chainpad-crypto/crypto")
|
||||||
);
|
);
|
||||||
} else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
|
} else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
|
||||||
|
require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
|
||||||
define([
|
define([
|
||||||
'/common/common-util.js',
|
'/common/common-util.js',
|
||||||
'/common/common-hash.js',
|
'/common/common-hash.js',
|
||||||
'/bower_components/chainpad-netflux/chainpad-netflux.js',
|
'/bower_components/chainpad-netflux/chainpad-netflux.js',
|
||||||
'/bower_compoents/json.sortify/dist/JSON.sortify.js',
|
'json.sortify',
|
||||||
'/bower_components/nthen/index.js',
|
'/bower_components/nthen/index.js',
|
||||||
'/bower_components/chainpad-crypto/crypto.js'
|
'/bower_components/chainpad-crypto/crypto.js'
|
||||||
//'/bower_components/tweetnacl/nacl-fast.min.js',
|
//'/bower_components/tweetnacl/nacl-fast.min.js',
|
||||||
|
|
Loading…
Reference in New Issue