|
|
@ -415,7 +415,7 @@ define([
|
|
|
|
clearTimeout(pendingChanges[key]);
|
|
|
|
clearTimeout(pendingChanges[key]);
|
|
|
|
delete pendingChanges[key];
|
|
|
|
delete pendingChanges[key];
|
|
|
|
});
|
|
|
|
});
|
|
|
|
if (APP.stopHistory) { APP.history = false; }
|
|
|
|
if (APP.stopHistory || APP.template) { APP.history = false; }
|
|
|
|
startOO(blob, type, true);
|
|
|
|
startOO(blob, type, true);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
@ -425,14 +425,15 @@ define([
|
|
|
|
var file = getFileType();
|
|
|
|
var file = getFileType();
|
|
|
|
blob.name = (metadataMgr.getMetadataLazy().title || file.doc) + '.' + file.type;
|
|
|
|
blob.name = (metadataMgr.getMetadataLazy().title || file.doc) + '.' + file.type;
|
|
|
|
var data = {
|
|
|
|
var data = {
|
|
|
|
hash: APP.history ? ooChannel.historyLastHash : ooChannel.lastHash,
|
|
|
|
hash: (APP.history || APP.template) ? ooChannel.historyLastHash : ooChannel.lastHash,
|
|
|
|
index: APP.history ? ooChannel.currentIndex : ooChannel.cpIndex
|
|
|
|
index: (APP.history || APP.template) ? ooChannel.currentIndex : ooChannel.cpIndex
|
|
|
|
};
|
|
|
|
};
|
|
|
|
fixSheets();
|
|
|
|
fixSheets();
|
|
|
|
|
|
|
|
|
|
|
|
ooChannel.ready = false;
|
|
|
|
ooChannel.ready = false;
|
|
|
|
ooChannel.queue = [];
|
|
|
|
ooChannel.queue = [];
|
|
|
|
data.callback = function () {
|
|
|
|
data.callback = function () {
|
|
|
|
|
|
|
|
if (APP.template) { APP.template = false; }
|
|
|
|
resetData(blob, file);
|
|
|
|
resetData(blob, file);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
@ -1295,6 +1296,13 @@ define([
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (APP.template) {
|
|
|
|
|
|
|
|
getEditor().setViewModeDisconnect();
|
|
|
|
|
|
|
|
UI.removeLoadingScreen();
|
|
|
|
|
|
|
|
makeCheckpoint(true);
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (APP.history) {
|
|
|
|
if (APP.history) {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
getEditor().asc_setRestriction(true);
|
|
|
|
getEditor().asc_setRestriction(true);
|
|
|
@ -1828,6 +1836,108 @@ define([
|
|
|
|
pinImages();
|
|
|
|
pinImages();
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var loadCp = function (cp, keepQueue) {
|
|
|
|
|
|
|
|
loadLastDocument(cp, function () {
|
|
|
|
|
|
|
|
var file = getFileType();
|
|
|
|
|
|
|
|
var type = common.getMetadataMgr().getPrivateData().ooType;
|
|
|
|
|
|
|
|
var blob = loadInitDocument(type, true);
|
|
|
|
|
|
|
|
if (!keepQueue) { ooChannel.queue = []; }
|
|
|
|
|
|
|
|
resetData(blob, file);
|
|
|
|
|
|
|
|
}, function (blob, file) {
|
|
|
|
|
|
|
|
if (!keepQueue) { ooChannel.queue = []; }
|
|
|
|
|
|
|
|
resetData(blob, file);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var loadTemplate = function (href, pw, parsed) {
|
|
|
|
|
|
|
|
APP.history = true;
|
|
|
|
|
|
|
|
APP.template = true;
|
|
|
|
|
|
|
|
getEditor().setViewModeDisconnect();
|
|
|
|
|
|
|
|
var content = parsed.content;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Get checkpoint
|
|
|
|
|
|
|
|
var hashes = content.hashes || {};
|
|
|
|
|
|
|
|
var idx = sortCpIndex(hashes);
|
|
|
|
|
|
|
|
var lastIndex = idx[idx.length - 1];
|
|
|
|
|
|
|
|
var lastCp = hashes[lastIndex];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Current cp or initial hash (invalid hash ==> initial hash)
|
|
|
|
|
|
|
|
var toHash = lastCp.hash || 'NONE';
|
|
|
|
|
|
|
|
// Last hash
|
|
|
|
|
|
|
|
var fromHash = 'NONE';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sframeChan.query('Q_GET_HISTORY_RANGE', {
|
|
|
|
|
|
|
|
href: href,
|
|
|
|
|
|
|
|
password: pw,
|
|
|
|
|
|
|
|
channel: content.channel,
|
|
|
|
|
|
|
|
lastKnownHash: fromHash,
|
|
|
|
|
|
|
|
toHash: toHash,
|
|
|
|
|
|
|
|
}, function (err, data) {
|
|
|
|
|
|
|
|
if (err) { return void console.error(err); }
|
|
|
|
|
|
|
|
if (!Array.isArray(data.messages)) { return void console.error('Not an array!'); }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// The first "cp" in history is the empty doc. It doesn't include the first patch
|
|
|
|
|
|
|
|
// of the history
|
|
|
|
|
|
|
|
var initialCp = !lastCp.hash;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var messages = (data.messages || []).slice(initialCp ? 0 : 1);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ooChannel.queue = messages.map(function (obj) {
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
|
|
|
hash: obj.serverHash,
|
|
|
|
|
|
|
|
msg: JSON.parse(obj.msg)
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
ooChannel.historyLastHash = ooChannel.lastHash;
|
|
|
|
|
|
|
|
ooChannel.currentIndex = ooChannel.cpIndex;
|
|
|
|
|
|
|
|
console.error(ooChannel.historyLastHash);
|
|
|
|
|
|
|
|
loadCp(lastCp, true);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var openTemplatePicker = function () {
|
|
|
|
|
|
|
|
var metadataMgr = common.getMetadataMgr();
|
|
|
|
|
|
|
|
var type = metadataMgr.getPrivateData().app;
|
|
|
|
|
|
|
|
var sframeChan = common.getSframeChannel();
|
|
|
|
|
|
|
|
var pickerCfgInit = {
|
|
|
|
|
|
|
|
types: [type],
|
|
|
|
|
|
|
|
where: ['template'],
|
|
|
|
|
|
|
|
hidden: true
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
var pickerCfg = {
|
|
|
|
|
|
|
|
types: [type],
|
|
|
|
|
|
|
|
where: ['template'],
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
var onConfirm = function () {
|
|
|
|
|
|
|
|
common.openFilePicker(pickerCfg, function (data) {
|
|
|
|
|
|
|
|
if (data.type !== type) { return; }
|
|
|
|
|
|
|
|
UI.addLoadingScreen({hideTips: true});
|
|
|
|
|
|
|
|
sframeChan.query('Q_OO_TEMPLATE_USE', {
|
|
|
|
|
|
|
|
href: data.href,
|
|
|
|
|
|
|
|
}, function (err, val) {
|
|
|
|
|
|
|
|
var parsed;
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
parsed = JSON.parse(val);
|
|
|
|
|
|
|
|
} catch (e) {
|
|
|
|
|
|
|
|
console.error(e, val);
|
|
|
|
|
|
|
|
UI.removeLoadingScreen();
|
|
|
|
|
|
|
|
return void UI.warn(Messages.error);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
console.error(data);
|
|
|
|
|
|
|
|
loadTemplate(data.href, data.password, parsed);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
sframeChan.query("Q_TEMPLATE_EXIST", type, function (err, data) {
|
|
|
|
|
|
|
|
if (data) {
|
|
|
|
|
|
|
|
common.openFilePicker(pickerCfgInit);
|
|
|
|
|
|
|
|
onConfirm();
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
UI.alert(Messages.template_empty);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
config.onInit = function (info) {
|
|
|
|
config.onInit = function (info) {
|
|
|
|
var privateData = metadataMgr.getPrivateData();
|
|
|
|
var privateData = metadataMgr.getPrivateData();
|
|
|
|
|
|
|
|
|
|
|
@ -1849,6 +1959,7 @@ define([
|
|
|
|
Title.setToolbar(toolbar);
|
|
|
|
Title.setToolbar(toolbar);
|
|
|
|
|
|
|
|
|
|
|
|
if (window.CP_DEV_MODE) {
|
|
|
|
if (window.CP_DEV_MODE) {
|
|
|
|
|
|
|
|
|
|
|
|
var $save = common.createButton('save', true, {}, function () {
|
|
|
|
var $save = common.createButton('save', true, {}, function () {
|
|
|
|
makeCheckpoint(true);
|
|
|
|
makeCheckpoint(true);
|
|
|
|
});
|
|
|
|
});
|
|
|
@ -1865,18 +1976,6 @@ define([
|
|
|
|
APP.stopHistory = true;
|
|
|
|
APP.stopHistory = true;
|
|
|
|
makeCheckpoint(true);
|
|
|
|
makeCheckpoint(true);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
var loadCp = function (cp, keepQueue) {
|
|
|
|
|
|
|
|
loadLastDocument(cp, function () {
|
|
|
|
|
|
|
|
var file = getFileType();
|
|
|
|
|
|
|
|
var type = common.getMetadataMgr().getPrivateData().ooType;
|
|
|
|
|
|
|
|
var blob = loadInitDocument(type, true);
|
|
|
|
|
|
|
|
if (!keepQueue) { ooChannel.queue = []; }
|
|
|
|
|
|
|
|
resetData(blob, file);
|
|
|
|
|
|
|
|
}, function (blob, file) {
|
|
|
|
|
|
|
|
if (!keepQueue) { ooChannel.queue = []; }
|
|
|
|
|
|
|
|
resetData(blob, file);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
var onPatch = function (patch) {
|
|
|
|
var onPatch = function (patch) {
|
|
|
|
// Patch on the current cp
|
|
|
|
// Patch on the current cp
|
|
|
|
ooChannel.send(JSON.parse(patch.msg));
|
|
|
|
ooChannel.send(JSON.parse(patch.msg));
|
|
|
@ -1970,6 +2069,10 @@ define([
|
|
|
|
load: loadSnapshot
|
|
|
|
load: loadSnapshot
|
|
|
|
});
|
|
|
|
});
|
|
|
|
toolbar.$drawer.append($snapshot);
|
|
|
|
toolbar.$drawer.append($snapshot);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Import template
|
|
|
|
|
|
|
|
var $template = common.createButton('importtemplate', true, {}, openTemplatePicker);
|
|
|
|
|
|
|
|
$template.appendTo(toolbar.$drawer);
|
|
|
|
})();
|
|
|
|
})();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|