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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |    5 +++--
 loleaflet/src/control/Control.Menubar.js         |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c99f5334fda4ff5b5b4a2ace8c97b6999d5d314d
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Oct 17 14:02:26 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Oct 17 14:02:26 2019 +0200

    jsdialogs: insert table default values and close menu
    
    Change-Id: I255f50121b67d72df70a54c690c9d4d8cbbbe872

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index e542cd98a..a4ed49168 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -717,8 +717,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
 		var content = L.DomUtil.create('div', 'inserttablecontrols');
 
-		var rowsData = { min: 0, id: 'rows', label: _('Rows') };
-		var colsData = { min: 0, id: 'cols', label: _('Columns') };
+		var rowsData = { min: 0, id: 'rows', text: '2', label: _('Rows') };
+		var colsData = { min: 0, id: 'cols', text: '2', label: _('Columns') };
 		builder._spinfieldControl(content, rowsData, builder, function() { });
 		builder._spinfieldControl(content, colsData, builder, function() { });
 
@@ -727,6 +727,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 			var rowsCount = parseInt($('#rows > input.spinfield').get(0).value);
 			var colsCount = parseInt($('#cols > input.spinfield').get(0).value);
 			builder.map.sendUnoCommand('.uno:InsertTable?Columns=' + colsCount + '&Rows=' + rowsCount);
+			builder.map.fire('closemobilewizard');
 		});
 
 		builder._explorableMenu(parentContainer, title, data.children, builder, content);
commit 5a9326bc8a3939eccb5a85caaa19fc1e7a502181
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Oct 17 13:59:40 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Oct 17 13:59:40 2019 +0200

    jsdialogs: insert table also in impress
    
    Change-Id: Ic54d289ca4fcd0f9b5e5183e9b64786fce2d88c3

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 6375fed20..a5fd375db 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -284,6 +284,7 @@ L.Control.Menubar = L.Control.extend({
 				{name: _UNO('.uno:InsertGraphic', 'presentation'), id: 'insertgraphicremote', type: 'action'},
 				{name: _UNO('.uno:InsertAnnotation', 'presentation'), id: 'insertcomment', type: 'action'},
 				{uno: '.uno:InsertObjectChart', mobile: false},
+				{id: 'inserttable', type: 'action', name: _('Insert table'), desktop: false, tablet: false},
 				{type: 'separator'},
 				{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
 				{type: 'separator'},