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

toolbar: show the "save revision" button only on the right toolbar.

Browse source 
Revision b480416375 fixed a bug, but introduced a regression, and the "save
revision" "star" button started to appear both on the left and the right
toolbar.

This change introduces a flag "whichMenu" in toolbar.menu(), that controls
whether the left, the right or the timeslider toolbar is being drawn.
This commit is contained in:
John McLear 2020-03-27 11:22:21 +00:00 • committed by muxator
parent 463d7fb163
commit 0d2854571d
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -251,7 +251,10 @@ module.exports = {
return new SelectButton(attributes);
},
menu: function (buttons, isReadOnly) {
/*
* Valid values for whichMenu: 'left' | 'right' | 'timeslider-right'
*/
menu: function (buttons, isReadOnly, whichMenu) {
if (isReadOnly) {
// The best way to detect if it's the left editbar is to check for a bold button
if (buttons[0].indexOf("bold") !== -1) {
@ -265,13 +268,14 @@ module.exports = {
/*
* This pad is not read only
*
* Add back the savedrevision button (the "star") if is not already there.
* Add back the savedrevision button (the "star") if is not already there,
* but only on the right toolbar.
*
* This is a quick fix for #3702: it was sufficient to visit a single read
* only pad to cause the disappearence of the star button from all the
* pads.
*/
if ((buttons[0].indexOf("savedrevision") === -1)) {
if ((buttons[0].indexOf("savedrevision") === -1) && (whichMenu === "right")) {
buttons[0].push("savedrevision");
}
}