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

Fix template importer

Browse Source
This commit is contained in:
yflory 2018-03-23 10:53:31 +01:00
parent 0c2987a6d1
commit f1c1d87d3f
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/common-ui-elements.js
View File

@ -559,6 +559,7 @@ define([
button button
.click(common.prepareFeedback(type)) .click(common.prepareFeedback(type))
.click(function () { .click(function () {
UIElements.openTemplatePicker(common, true);
}); });
break; break;
case 'template': case 'template':

4
www/common/metadata-manager.js
View File

@ -34,6 +34,10 @@ define(['json.sortify'], function (Sortify) {
} }
if (!metadataObj.users) { metadataObj.users = {}; } if (!metadataObj.users) { metadataObj.users = {}; }
if (!metadataLazyObj.users) { metadataLazyObj.users = {}; } if (!metadataLazyObj.users) { metadataLazyObj.users = {}; }
if (!metadataObj.type) { metadataObj.type = meta.doc.type; }
if (!metadataLazyObj.type) { metadataLazyObj.type = meta.doc.type; }
var mdo = {}; var mdo = {};
// We don't want to add our user data to the object multiple times. // We don't want to add our user data to the object multiple times.
//var containsYou = false; //var containsYou = false;

2
www/common/sframe-app-framework.js
View File

@ -572,7 +572,7 @@ define([
toolbar.$rightside.append($templateButton); toolbar.$rightside.append($templateButton);
} }
var $importTemplateButton = common.createButton('importtemplate', true, templateObj); var $importTemplateButton = common.createButton('importtemplate', true);
toolbar.$drawer.append($importTemplateButton); toolbar.$drawer.append($importTemplateButton);
/* add a forget button */ /* add a forget button */