mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-19 14:13:34 +01:00
toolbar: show the "save revision" button only on the right toolbar.
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:
parent
463d7fb163
commit
0d2854571d
3 changed files with 10 additions and 6 deletions
|
@ -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");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -64,12 +64,12 @@
|
|||
|
||||
<ul class="menu_left" role="toolbar">
|
||||
<% e.begin_block("editbarMenuLeft"); %>
|
||||
<%- toolbar.menu(settings.toolbar.left, isReadOnly) %>
|
||||
<%- toolbar.menu(settings.toolbar.left, isReadOnly, 'left') %>
|
||||
<% e.end_block(); %>
|
||||
</ul>
|
||||
<ul class="menu_right" role="toolbar">
|
||||
<% e.begin_block("editbarMenuRight"); %>
|
||||
<%- toolbar.menu(settings.toolbar.right, isReadOnly) %>
|
||||
<%- toolbar.menu(settings.toolbar.right, isReadOnly, 'right') %>
|
||||
<% e.end_block(); %>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -82,7 +82,7 @@
|
|||
<div class="editbarright toolbar" id="editbar">
|
||||
<% e.begin_block("timesliderEditbarRight"); %>
|
||||
<ul>
|
||||
<%- toolbar.menu(settings.toolbar.timeslider, true) %>
|
||||
<%- toolbar.menu(settings.toolbar.timeslider, true, 'timeslider-right') %>
|
||||
</ul>
|
||||
<% e.end_block(); %>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue