strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

jsdialogs: implement frame control

Browse source 
* fix vertical containers
* add frame support
* connect with MobileWizard

Change-Id: I27b59193c597e5af012d5b904e8516bf38c54c00
Reviewed-on: https://gerrit.libreoffice.org/79726
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
This commit is contained in:
Szymon Kłos 2019-09-23 22:46:44 +02:00
parent 4997b4705b
commit 65c990dd2c
3 changed files with 48 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
loleaflet/css/toolbar.css
View file

@ -766,3 +766,17 @@ tr.useritem > td > img {
background-color: #F6F6F6;
height: 30px;
}
.ui-content.mobile-wizard {
background-color: white !important;
border: none !important;
padding: 10px;
}
.ui-header.mobile-wizard {
height: 20px !important;
font-size: 11pt !important;
margin: 5px;
padding: 5px;
border: solid 1px lightgrey;
}

36
loleaflet/src/control/Control.JSDialogBuilder.js
View file

@ -7,6 +7,12 @@
/* global $ */
L.Control.JSDialogBuilder = L.Control.extend({
/* Handler is a function which takes two parameters:
* parentContainer - place where insert the content
* data - data of a control under process
* returns boolean: true if children should be processed
* and false otherwise
*/
_controlHandlers: {},
_setup: function() {
@ -18,6 +24,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._controlHandlers['combobox'] = this._comboboxControl;
this._controlHandlers['listbox'] = this._comboboxControl;
this._controlHandlers['fixedtext'] = this._fixedtextControl;
this._controlHandlers['frame'] = this._frameHandler;
this._controlHandlers['container'] = this._containerHandler;
this._controlHandlers['window'] = this._containerHandler;
this._controlHandlers['borderwindow'] = this._containerHandler;
@ -34,6 +41,28 @@ L.Control.JSDialogBuilder = L.Control.extend({
return false;
},
_frameHandler: function(parentContainer, data, builder) {
var titleNode = data.children[0];
var sectionTitle = L.DomUtil.create('div', 'ui-header mobile-wizard ui-widget', parentContainer);
sectionTitle.innerHTML = titleNode.text;
var contentNode = data.children[1];
var contentDiv = L.DomUtil.create('div', 'ui-content mobile-wizard', parentContainer);
builder.build(contentDiv, [contentNode]);
$(contentDiv).hide();
$(sectionTitle).click(function() {
$('.ui-header.mobile-wizard').hide('slide', { direction: 'left' }, 'fast', function() {
$(contentDiv).show('slide', { direction: 'right' }, 'fast');
});
builder.wizard._setTitle(titleNode.text);
builder.wizard._inMainMenu = false;
});
return false;
},
_radiobuttonControl: function(parentContainer, data) {
var radiobutton = L.DomUtil.create('input', '', parentContainer);
radiobutton.type = 'radiobutton';
@ -128,8 +157,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
currentInsertPlace = L.DomUtil.create('td', '', currentHorizontalRow);
}
var childIsContainer = (childType == 'container' || childType == 'borderwindow');
var childIsVertical = childData.vertical === true;
var childIsContainer = (childType == 'container' || childType == 'borderwindow') && childData.children.length > 1;
var childIsVertical = childData.vertical == 'true';
var childColumns = childData.cols;
var childObject = null;
@ -145,7 +174,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var handler = this._controlHandlers[childType];
if (handler)
processChildren = handler(childObject, childData);
processChildren = handler(childObject, childData, this);
else
console.warn('Unsupported control type: \"' + childType + '\"');
@ -158,5 +187,6 @@ L.Control.JSDialogBuilder = L.Control.extend({
L.control.jsDialogBuilder = function (options) {
var builder = new L.Control.JSDialogBuilder(options);
builder._setup();
builder.wizard = options.mobileWizard;
return builder;
};

2
loleaflet/src/control/Control.MobileWizard.js
View file

@ -60,7 +60,7 @@ L.Control.MobileWizard = L.Control.extend({
var content = $('#mobile-wizard-content');
content.empty();
L.control.jsDialogBuilder().build(content.get(0), [data]);
L.control.jsDialogBuilder({'mobileWizard': this}).build(content.get(0), [data]);
}
}
});