').append($div).html());
$content[0].normalize();
- $content.find('pre.mermaid[data-processed="true"]').remove();
+
+ var mermaid_source = [];
+ var mermaid_cache = {};
+
+ // iterate over the unrendered mermaid inputs, caching their source as you go
+ $(newDomFixed).find('pre.mermaid').each(function (index, el) {
+ if (el.childNodes.length === 1 && el.childNodes[0].nodeType === 3) {
+ var src = el.childNodes[0].wholeText;
+ el.setAttribute('mermaid-source', src);
+ mermaid_source[index] = src;
+ }
+ });
+
+ // iterate over rendered mermaid charts
+ $content.find('pre.mermaid:not([processed="true"])').each(function (index, el) {
+ // retrieve the attached source code which it was drawn
+ var src = el.getAttribute('mermaid-source');
+
+ // check if that source exists in the set of charts which are about to be rendered
+ if (mermaid_source.indexOf(src) === -1) {
+ // if it's not, then you can remove it
+ if (el.parentNode && el.parentNode.children.length) {
+ el.parentNode.removeChild(el);
+ }
+ } else if (el.childNodes.length === 1 && el.childNodes[0].nodeType !== 3) {
+ // otherwise, confirm that the content of the rendered chart is not a text node
+ // and keep a copy of it
+ mermaid_cache[src] = el.childNodes[0];
+ }
+ });
+
var oldDom = domFromHTML($content[0].outerHTML);
+
var patch = makeDiff(oldDom, Dom, id);
if (typeof(patch) === 'string') {
throw new Error(patch);
@@ -348,8 +378,32 @@ define([
var target = document.getElementById($a.attr('data-href'));
if (target) { target.scrollIntoView(); }
});
+
+ // loop over mermaid elements in the rendered content
+ $content.find('pre.mermaid').each(function (index, el) {
+ // since you've simply drawn the content that was supplied via markdown
+ // you can assume that the index of your rendered charts matches that
+ // of those in the markdown source.
+ var src = mermaid_source[index];
+ el.setAttribute('mermaid-source', src);
+ var cached = mermaid_cache[src];
+
+ // check if you had cached a pre-rendered instance of the supplied source
+ if (typeof(cached) !== 'object') { return; }
+
+ // if there's a cached rendering, empty out the contained source code
+ // which would otherwise be drawn again.
+ // apparently this is the fastest way to empty out an element
+ while (el.firstChild) { el.removeChild(el.firstChild); } //el.innerHTML = '';
+ // insert the cached graph
+ el.appendChild(cached);
+ // and set a flag indicating that this graph need not be reprocessed
+ el.setAttribute('data-processed', true);
+ });
+
try {
- Mermaid.init();
+ // finally, draw any graphs which have changed and were thus not cached
+ Mermaid.init(undefined, $content.find('pre.mermaid:not([data-processed="true"])'));
} catch (e) { console.error(e); }
}
};
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 4c73a95a8..3fa850b51 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -79,7 +79,7 @@ define([
var faColor = 'cptools-palette';
var faTrash = 'fa-trash';
var faDelete = 'fa-eraser';
- var faProperties = 'fa-database';
+ var faProperties = 'fa-info-circle';
var faTags = 'fa-hashtag';
var faUploadFiles = 'cptools-file-upload';
var faUploadFolder = 'cptools-folder-upload';
@@ -4187,7 +4187,7 @@ define([
}
getProperties(el, function (e, $prop) {
if (e) { return void logError(e); }
- UI.alert($prop[0], undefined, true);
+ UI.openCustomModal($prop[0]);
});
}
else if ($this.hasClass("cp-app-drive-context-hashtag")) {
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 4cbeaf56e..1979bae66 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -43,7 +43,7 @@ define([
MessengerUI.create = function ($container, common, toolbar) {
var metadataMgr = common.getMetadataMgr();
var origin = metadataMgr.getPrivateData().origin;
- var readOnly = metadataMgr.getPrivateData().readOnly || toolbar.readOnly;
+ var readOnly = metadataMgr.getPrivateData().readOnly || (toolbar && toolbar.readOnly);
var isApp = typeof(toolbar) !== "undefined";
diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js
index 384ab99c2..5a2693fd9 100644
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@@ -769,18 +769,18 @@ define([
continue;
}
- var href;
+ var decryptedHref;
try {
- href = el.href && ((el.href.indexOf('#') !== -1) ? el.href : exp.cryptor.decrypt(el.href));
+ decryptedHref = el.href && ((el.href.indexOf('#') !== -1) ? el.href : exp.cryptor.decrypt(el.href));
} catch (e) {}
- if (href && href.indexOf('#') === -1) {
+ if (decryptedHref && decryptedHref.indexOf('#') === -1) {
// If we can't decrypt the href, it means we don't have the correct secondaryKey and we're in readOnly mode:
// abort now, we won't be able to fix anything anyway
continue;
}
- var parsed = Hash.parsePadUrl(href || el.roHref);
+ var parsed = Hash.parsePadUrl(decryptedHref || el.roHref);
var secret;
// Clean invalid hash
@@ -797,9 +797,9 @@ define([
}
// If we have an edit link, check the view link
- if (href && parsed.hashData.type === "pad" && parsed.hashData.version) {
+ if (decryptedHref && parsed.hashData.type === "pad" && parsed.hashData.version) {
if (parsed.hashData.mode === "view") {
- el.roHref = href;
+ el.roHref = decryptedHref;
delete el.href;
} else if (!el.roHref) {
secret = Hash.getSecrets(parsed.type, parsed.hash, el.password);
@@ -818,7 +818,9 @@ define([
}
// Fix href
- if (href && href.slice(0,1) !== '/') { el.href = exp.cryptor.encrypt(Hash.getRelativeHref(el.href)); }
+ if (decryptedHref && decryptedHref.slice(0,1) !== '/') {
+ el.href = exp.cryptor.encrypt(Hash.getRelativeHref(decryptedHref));
+ }
// Fix creation time
if (!el.ctime) { el.ctime = el.atime; }
// Fix title
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index f397f96ea..f8f1bdf9f 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -488,6 +488,20 @@ define([
Cryptpad.storeInTeam(data, cb);
});
+ sframeChan.on('EV_GOTO_URL', function (url) {
+ if (url) {
+ window.location.href = url;
+ } else {
+ window.location.reload();
+ }
+ });
+
+ sframeChan.on('EV_OPEN_URL', function (url) {
+ if (url) {
+ window.open(url);
+ }
+ });
+
};
addCommonRpc(sframeChan);
@@ -956,20 +970,6 @@ define([
});
});
- sframeChan.on('EV_GOTO_URL', function (url) {
- if (url) {
- window.location.href = url;
- } else {
- window.location.reload();
- }
- });
-
- sframeChan.on('EV_OPEN_URL', function (url) {
- if (url) {
- window.open(url);
- }
- });
-
sframeChan.on('Q_PIN_GET_USAGE', function (teamId, cb) {
Cryptpad.isOverPinLimit(teamId, function (err, overLimit, data) {
cb({
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 224f7eeb6..b6cb3c125 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -533,7 +533,7 @@ MessengerUI, Messages) {
Common.getSframeChannel().event('EV_SHARE_OPEN', {
hidden: true
});
- $shareBlock.click(function () {
+ $shareBlock.click(function () {
var title = (config.title && config.title.getTitle && config.title.getTitle())
|| (config.title && config.title.defaultName)
|| "";
diff --git a/www/common/translations/messages.fi.json b/www/common/translations/messages.fi.json
new file mode 100644
index 000000000..2c63c0851
--- /dev/null
+++ b/www/common/translations/messages.fi.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 0827e4530..76efd749c 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -54,6 +54,7 @@
.kanban-item-text {
cursor: text;
overflow-wrap: anywhere;
+ flex: 1;
}
}
@@ -67,7 +68,7 @@
margin-right: 10px;
min-width: 0;
overflow: hidden;
- white-space: nowrap;
+ //white-space: nowrap;
text-overflow: ellipsis;
}
#kanban-edit {
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index c2d845557..035794b2a 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -286,7 +286,7 @@ define([
kanban.inEditMode = true;
// create a form to enter element
var boardId = $(el.parentNode.parentNode).attr("data-id");
- var $item = $('
', {'class': 'kanban-item'});
+ var $item = $('
', {'class': 'kanban-item new-item'});
var $input = getInput().val(name).appendTo($item);
kanban.addForm(boardId, $item[0]);
$input.focus();
diff --git a/www/kanban/jkanban.js b/www/kanban/jkanban.js
index 422884bc7..f1f70955a 100644
--- a/www/kanban/jkanban.js
+++ b/www/kanban/jkanban.js
@@ -147,9 +147,13 @@
self.drake = self.dragula(self.boardContainer, {
moves: function (el, source, handle, sibling) {
if (self.options.readOnly) { return false; }
+ if (el.classList.contains('new-item')) { return false; }
return handle.classList.contains('kanban-item');
},
accepts: function (el, target, source, sibling) {
+ if (sibling === null) {
+ return false;
+ }
if (self.options.readOnly) { return false; }
return true;
},
@@ -349,7 +353,7 @@
titleBoard = document.createElement('div');
titleBoard.classList.add('kanban-title-board');
titleBoard.innerHTML = board.title;
- titleBoard.setAttribute('title', board.title);
+ //titleBoard.setAttribute('title', board.title);
titleBoard.clickfn = board.boardTitleClick;
__onboardTitleClickHandler(titleBoard);
headerBoard.appendChild(titleBoard);
diff --git a/www/settings/inner.js b/www/settings/inner.js
index d67f62818..7c9dd0630 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -51,6 +51,7 @@ define([
'cp-settings-info-block',
'cp-settings-displayname',
'cp-settings-language-selector',
+ 'cp-settings-resettips',
'cp-settings-logout-everywhere',
'cp-settings-autostore',
'cp-settings-userfeedback',
@@ -67,7 +68,6 @@ define([
],
'drive': [
'cp-settings-drive-duplicate',
- 'cp-settings-resettips',
'cp-settings-thumbnails',
'cp-settings-drive-backup',
'cp-settings-drive-import-local',
@@ -835,7 +835,7 @@ define([
var localStore = window.cryptpadStore;
$button.click(function () {
Object.keys(localStore.store).forEach(function (k) {
- if(k.slice(0, 9) === "hide-info") {
+ if(/^(hide-(info|alert))/.test(k)) {
localStore.put(k, null);
}
});