[Libreoffice-commits] online.git: loleaflet/src

[Jan Holesovsky]

 loleaflet/src/control/Control.Menubar.js |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 27fdb9b8645d28ce06b45709c6da64220d0af249
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Jun 7 17:36:40 2017 +0200

    loleaflet: Position the Find & replace consistently, and in line with desktop.
    
    Change-Id: I5d9d93339d74f5a9cda304fba876c76cb5391408
    Reviewed-on: https://gerrit.libreoffice.org/38519
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index a23d0fa7..e236c218 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -25,7 +25,6 @@ L.Control.Menubar = L.Control.extend({
 				{name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
 				{name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
 				{name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
-				{type: 'separator'},
 				{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'},
 				{type: 'separator'},
 				{name: _('Find & Replace'), id: 'findandreplace', type: 'action'},
@@ -190,10 +189,9 @@ L.Control.Menubar = L.Control.extend({
 				{name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
 				{name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
 				{name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
+				{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'},
 				{type: 'separator'},
-				{name: _('Find & Replace'), id: 'findandreplace', type: 'action'},
-				{type: 'separator'},
-				{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'}]
+				{name: _('Find & Replace'), id: 'findandreplace', type: 'action'}]
 			},
 			{name: _('View'), id: 'view', type: 'menu', menu: [
 				{name: _('Full screen'), id: 'fullscreen', type: 'action'},
@@ -252,10 +250,9 @@ L.Control.Menubar = L.Control.extend({
 				{name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
 				{name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
 				{name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
+				{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'},
 				{type: 'separator'},
-				{name: _('Find & Replace'), id: 'findandreplace', type: 'action'},
-				{type: 'separator'},
-				{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'}]
+				{name: _('Find & Replace'), id: 'findandreplace', type: 'action'}]
 			},
 			{name: _('View'), id: 'view', type: 'menu', menu: [
 				{name: _('Full screen'), id: 'fullscreen', type: 'action'}]