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

Show toolbars in edit mode on mobile

Browse source 
- fix position of rows container
- avoid using uninitialized 'toolbar' variable
- fire onUpdatePermission in Writer also...

Change-Id: I3a57c4185814d7784c591dfd9dcda7661d4adc72
Reviewed-on: https://gerrit.libreoffice.org/79853
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-30 13:56:18 +02:00
parent f97ae94410
commit 1df1275e3b
3 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
loleaflet/css/spreadsheet.css
View file

@ -74,7 +74,8 @@
}
#spreadsheet-row-column-frame.readonly {
top: 36px;
top: 36px;
bottom: 0px;
}
#spreadsheet-row-column-frame.tablet {

48
loleaflet/src/control/Control.Toolbar.js
View file

@ -2010,23 +2010,25 @@ function onUpdatePermission(e) {
});
}
presentationButtons.forEach(function(id) {
if (id === 'deletepage') {
var itemState = map['stateChangeHandler'].getItemValue('.uno:DeletePage');
} else if (id === 'insertpage') {
itemState = map['stateChangeHandler'].getItemValue('.uno:InsertPage');
} else if (id === 'duplicatepage') {
itemState = map['stateChangeHandler'].getItemValue('.uno:DuplicatePage');
} else {
itemState = 'enabled';
}
if (toolbar) {
presentationButtons.forEach(function(id) {
if (id === 'deletepage') {
var itemState = map['stateChangeHandler'].getItemValue('.uno:DeletePage');
} else if (id === 'insertpage') {
itemState = map['stateChangeHandler'].getItemValue('.uno:InsertPage');
} else if (id === 'duplicatepage') {
itemState = map['stateChangeHandler'].getItemValue('.uno:DuplicatePage');
} else {
itemState = 'enabled';
}
if (itemState === 'enabled') {
toolbar.enable(id);
} else {
toolbar.disable(id);
}
});
if (itemState === 'enabled') {
toolbar.enable(id);
} else {
toolbar.disable(id);
}
});
}
toolbar = w2ui['actionbar'];
if (toolbar) {
@ -2041,15 +2043,15 @@ function onUpdatePermission(e) {
$('#toolbar-down').show();
switch (map._docLayer._docType) {
case 'text':
$('#document-container').css('bottom', '33px');
$('#document-container').css('bottom', '35px');
break;
case 'spreadsheet':
$('#document-container').css('bottom', '68px'); // FIXME this and spreadsheet-row-column-frame are supposed to be the same, but are not
$('#spreadsheet-row-column-frame').css('bottom', '65px');
$('#document-container').css('bottom', '68px');
$('#spreadsheet-row-column-frame').css('bottom', '68px');
$('#spreadsheet-toolbar').show();
break;
case 'presentation':
$('#document-container').css('bottom', '33px');
$('#document-container').css('bottom', '35px');
break;
}
}
@ -2098,15 +2100,15 @@ function onUpdatePermission(e) {
$('#toolbar-down').hide();
switch (map._docLayer._docType) {
case 'text':
$('#document-container').css('bottom', '0');
$('#document-container').css('bottom', '35px');
break;
case 'spreadsheet':
$('#document-container').css('bottom', '35px');
$('#spreadsheet-row-column-frame').css('bottom', '0');
$('#spreadsheet-row-column-frame').css('bottom', '68px');
$('#spreadsheet-toolbar').show();
break;
case 'presentation':
$('#document-container').css('bottom', '0');
$('#document-container').css('bottom', '35px');
break;
}
}

1
loleaflet/src/layer/tile/WriterTileLayer.js
View file

@ -165,6 +165,7 @@ L.WriterTileLayer = L.TileLayer.extend({
}
});
map.on('updatepermission', window.onUpdatePermission);
},
onAnnotationModify: function (annotation) {