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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
yflory
2018-10-22 17:22:28 +02:00
parent 6924541080 a17235dd7e
commit 4e3c09f640
3 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/toolbar3.js
View File

@@ -1096,8 +1096,8 @@ Messenger, MessengerUI, Messages) {
tb['useradmin'] = createUserAdmin;
tb['unpinnedWarning'] = createUnpinnedWarning;
var addElement = toolbar.addElement = function (arr, additionnalCfg, init) {
if (typeof additionnalCfg === "object") { $.extend(true, config, additionnalCfg); }
var addElement = toolbar.addElement = function (arr, additionalCfg, init) {
if (typeof additionalCfg === "object") { $.extend(true, config, additionalCfg); }
arr.forEach(function (el) {
if (typeof el !== "string" || !el.trim()) { return; }
if (typeof tb[el] === "function") {