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

Make sure we can't open a pad using the wrong app

Browse Source
This commit is contained in:
yflory
2017-09-19 11:31:45 +02:00
parent 35a313d6ee
commit 72f0952835
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/pad/inner.js
View File

@@ -563,7 +563,6 @@ define([
realtimeOptions.onInit = function (info) {
readOnly = metadataMgr.getPrivateData().readOnly;
console.log('onInit');
var titleCfg = { getHeadingText: getHeadingText };
Title = common.createTitle(titleCfg, realtimeOptions.onLocal);
var configTb = {
@@ -700,7 +699,6 @@ define([
// this should only ever get called once, when the chain syncs
realtimeOptions.onReady = function (info) {
console.log('onReady');
if (!module.isMaximized) {
module.isMaximized = true;
$('iframe.cke_wysiwyg_frame').css('width', '');
@@ -723,10 +721,13 @@ define([
if (shjson === '') { newPad = true; }
if (!newPad) {
if (shjson[0] !== '[') {
var errorText = Messages.typeError;
Cryptpad.errorLoadingScreen(errorText);
throw new Error(errorText);
}
applyHjson(shjson);
// Update the user list (metadata) from the hyperjson
// XXX Metadata.update(shjson);
var parsed = JSON.parse(shjson);
if (parsed[3] && parsed[3].metadata) {
metadataMgr.updateMetadata(parsed[3].metadata);