remember code and wysiwyg pads
This commit is contained in:
parent
0a8137e7eb
commit
1526c26f8e
@ -26,17 +26,6 @@ define([
|
|||||||
toolbar;
|
toolbar;
|
||||||
|
|
||||||
var secret = Cryptpad.getSecrets();
|
var secret = Cryptpad.getSecrets();
|
||||||
/*
|
|
||||||
var key;
|
|
||||||
var channel = '';
|
|
||||||
var hash = false;
|
|
||||||
if (!/#/.test(window.location.href)) {
|
|
||||||
key = Crypto.genKey();
|
|
||||||
} else {
|
|
||||||
hash = window.location.hash.slice(1);
|
|
||||||
channel = hash.slice(0, 32);
|
|
||||||
key = hash.slice(32);
|
|
||||||
}*/
|
|
||||||
|
|
||||||
var andThen = function (CMeditor) {
|
var andThen = function (CMeditor) {
|
||||||
var $pad = $('#pad-iframe');
|
var $pad = $('#pad-iframe');
|
||||||
@ -156,6 +145,7 @@ define([
|
|||||||
$bar.find('#cryptpad-saveContent').click(exportText);
|
$bar.find('#cryptpad-saveContent').click(exportText);
|
||||||
|
|
||||||
window.location.hash = info.channel + secret.key;
|
window.location.hash = info.channel + secret.key;
|
||||||
|
Cryptpad.rememberPad();
|
||||||
};
|
};
|
||||||
|
|
||||||
var updateUserList = function(shjson) {
|
var updateUserList = function(shjson) {
|
||||||
|
|||||||
@ -324,6 +324,7 @@ define([
|
|||||||
|
|
||||||
// set the hash
|
// set the hash
|
||||||
window.location.hash = info.channel + secret.key;
|
window.location.hash = info.channel + secret.key;
|
||||||
|
Cryptpad.rememberPad();
|
||||||
};
|
};
|
||||||
|
|
||||||
// this should only ever get called once, when the chain syncs
|
// this should only ever get called once, when the chain syncs
|
||||||
|
|||||||
@ -45,7 +45,6 @@ define([
|
|||||||
|
|
||||||
var patches = (DD).diff(inner, New);
|
var patches = (DD).diff(inner, New);
|
||||||
DD.apply(inner, patches);
|
DD.apply(inner, patches);
|
||||||
Previous = New;
|
|
||||||
return patches;
|
return patches;
|
||||||
};
|
};
|
||||||
}());
|
}());
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user