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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0e290aa52df9f9e12d3f848ce136bbdd9dc07661
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Oct 8 17:22:10 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Oct 8 18:10:00 2019 +0200

    jsdialogs: use name of tab instead of panel id
    
    Change-Id: I29ba84a746db38d1605ca4462edb720b62f12502
    Reviewed-on: https://gerrit.libreoffice.org/80482
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 89d50efb0..aa13f30e3 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -191,7 +191,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		var tabsContainer = L.DomUtil.create('div', 'ui-tabs mobile-wizard ui-widget');
 		var contentsContainer = L.DomUtil.create('div', 'ui-tabs-content mobile-wizard ui-widget', parentContainer);
 
-		var title1 = builder._cleanText(data.children[1].children[0].id);
+		var title1 = builder._cleanText(data.children[1].text);
 		var icon1 = builder._createIconPath(title1);
 
 		var tab1 = L.DomUtil.create('div', 'ui-tab mobile-wizard', tabsContainer);
@@ -216,7 +216,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
 		var tab2 = L.DomUtil.create('div', 'ui-tab mobile-wizard', tabsContainer);
 
-		var title2 = builder._cleanText(data.children[3].children[0].id);
+		var title2 = builder._cleanText(data.children[3].text);
 		var icon2 = builder._createIconPath(title2);
 
 		var button2 = L.DomUtil.create('img', 'ui-tab-content mobile-wizard unobutton', tab2);
commit e9fdbfe07aca366a9098c4938dfa3bb050487ab9
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Oct 8 17:12:51 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Oct 8 18:09:37 2019 +0200

    mobile: Use the 'text' property for the names of the panels.
    
    Depends on a core patch.
    
    Change-Id: Ic5711c8c19bf9cb6ded12b3a704248a7e27360f8
    Reviewed-on: https://gerrit.libreoffice.org/80480
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index c575d3627..89d50efb0 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -179,7 +179,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 	},
 
 	_panelHandler: function(parentContainer, data, builder) {
-		var title = data.children[0].id;
+		var title = data.text;
 		var contentNode = data.children[0];
 
 		builder._explorableEntry(parentContainer, title, contentNode, builder);