mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 00:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

fix

Browse source
This commit is contained in:
John McLear 2020-03-12 16:51:35 +00:00 • committed by muxator
parent bb868beb9c
commit 467fc11b72
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/node/utils/toolbar.js
View file

@ -68,7 +68,7 @@ ButtonsGroup.prototype.addButton = function (button) {
}; };
ButtonsGroup.prototype.render = function () { ButtonsGroup.prototype.render = function () {
if (this.buttons.length == 1) { if (this.buttons && this.buttons.length == 1) {
this.buttons[0].grouping = ""; this.buttons[0].grouping = "";
} }
else { else {
@ -80,7 +80,7 @@ ButtonsGroup.prototype.render = function () {
} }
return _.map(this.buttons, function (btn) { return _.map(this.buttons, function (btn) {
return btn.render(); if(btn) return btn.render();
}).join("\n"); }).join("\n");
}; };
@ -90,12 +90,17 @@ Button = function (attributes) {
Button.load = function (btnName) { Button.load = function (btnName) {
var button = module.exports.availableButtons[btnName]; var button = module.exports.availableButtons[btnName];
try{
if (button.constructor === Button || button.constructor === SelectButton) { if (button.constructor === Button || button.constructor === SelectButton) {
return button; return button;
} }
else { else {
return new Button(button); return new Button(button);
} }
}catch(e){
console.warn("Error loading button", btnName);
return false;
}
}; };
_.extend(Button.prototype, { _.extend(Button.prototype, {