[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 2 commits - loleaflet/dist loleaflet/src

Andras Timar andras.timar at collabora.com
Mon Oct 10 08:02:09 UTC 2016


 loleaflet/dist/toolbar/toolbar.js        |    4 +---
 loleaflet/src/control/Control.Menubar.js |    8 +++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit b7c4ae87276bc0f311e331fc594acbcceed8a663
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Oct 4 11:21:10 2016 +0200

    loleaflet: add Insert Footnote, Endnote, Page and Column break to Writer menu
    
    (cherry picked from commit b5f95c2aed1c8af9577ac90e0a8a89de049f6852)

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index e2113b7..dd8b867 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -25,7 +25,13 @@ L.Control.Menubar = L.Control.extend({
 												{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'}]
 			},
 			{name: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'},
-												  {name: _('Comment'), type: 'unocommand', uno: '.uno:InsertAnnotation'}]
+												{name: _('Comment'), type: 'unocommand', uno: '.uno:InsertAnnotation'},
+												{type: 'separator'},
+												{name: _('Footnote'), type: 'unocommand', uno: '.uno:InsertFootnote'},
+												{name: _('Endnote'), type: 'unocommand', uno: '.uno:InsertEndnote'},
+												{type: 'separator'},
+												{name: _('Page break'), type: 'unocommand', uno: '.uno:InsertPageBreak'},
+												{name: _('Column break'), type: 'unocommand', uno: '.uno:InsertColumnBreak'}]
 			},
 			{name: _('View'), type: 'menu', menu: [{name: _('Full screen'), id: 'fullscreen', type: 'action'},
 												{type: 'separator'},
commit 6252c25969461a10ff8035d656f54ffb11d0c30d
Author: Henry Castro <hcastro at collabora.com>
Date:   Thu Oct 6 10:03:21 2016 -0400

    loleaflet: add .uno:AutoSum
    
    (cherry picked from commit 0f86fde3e0792dce5808d6448845a5a9cfa330b0)

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 83334ff..816bf3d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -185,9 +185,7 @@ function onClick(id, item, subItem) {
 		setTimeout(function () {$('#backColorPicker').colorpicker('showPalette');}, 0);
 	}
 	else if (id === 'sum') {
-		L.DomUtil.get('formulaInput').value = '=SUM()';
-		L.DomUtil.get('formulaInput').focus();
-		map.cellEnterString(L.DomUtil.get('formulaInput').value);
+		map.sendUnoCommand('.uno:AutoSum');
 	}
 	else if (id === 'function') {
 		L.DomUtil.get('formulaInput').value = '=';


More information about the Libreoffice-commits mailing list