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

save pending tags when clicking OK on tagPrompt

Browse Source
This commit is contained in:
ansuz
2017-12-15 19:11:53 +01:00
parent 39d8e2dd81
commit 3c2d6af4f0
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
www/common/common-interface.js
View File

@@ -1,4 +1,4 @@
define([ /efine([
'jquery', 'jquery',
'/customize/messages.js', '/customize/messages.js',
'/common/common-util.js', '/common/common-util.js',
@@ -130,10 +130,19 @@ define([
element: target || h('input'), element: target || h('input'),
}; };
var $t = t.tokenfield = $(t.element).tokenfield(); var $t = t.tokenfield = $(t.element).tokenfield();
t.getTokens = function () {
return $t.tokenfield('getTokens').map(function (token) { t.getTokens = function (ignorePending) {
var tokens = $t.tokenfield('getTokens').map(function (token) {
return token.value.toLowerCase(); return token.value.toLowerCase();
}); });
if (ignorePending) { return tokens; }
var $pendingEl = $($t.parent().find('.token-input')[0]);
var val = ($pendingEl.val() || "").trim();
if (val && tokens.indexOf(val) === -1) {
return tokens.concat(val);
}
return tokens;
}; };
var $root = $t.parent(); var $root = $t.parent();
@@ -145,7 +154,7 @@ define([
$t.on('tokenfield:createtoken', function (ev) { $t.on('tokenfield:createtoken', function (ev) {
var val; var val;
ev.attrs.value = ev.attrs.value.toLowerCase(); ev.attrs.value = ev.attrs.value.toLowerCase();
if (t.getTokens().some(function (t) { if (t.getTokens(true).some(function (t) {
if (t === ev.attrs.value) { return ((val = t)); } if (t === ev.attrs.value) { return ((val = t)); }
})) { })) {
ev.preventDefault(); ev.preventDefault();