Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE] bug 34035, 33978, 33945.

Browse source
This commit is contained in:
Julia Radzhabova 2017-03-14 13:51:39 +03:00
parent ef65270ec7
commit 52e9b6a6ee
2 changed files with 60 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
apps/presentationeditor/mobile/app/controller/add/AddTable.js
View file

@ -91,64 +91,66 @@ define([
$target = $(e.currentTarget), $target = $(e.currentTarget),
type = $target.data('type'); type = $target.data('type');
if ($('.modal.modal-in').length > 0) {
return;
}
PE.getController('AddContainer').hideModal(); PE.getController('AddContainer').hideModal();
_.delay(function () { if ($target) {
if ($target) { var picker;
var picker; var modal = uiApp.modal({
var modal = uiApp.modal({ title: me.textTableSize,
title: me.textTableSize, text: '',
text: '', afterText:
afterText: '<div class="content-block">' +
'<div class="content-block">' + '<div class="row">' +
'<div class="row">' + '<div class="col-50">' + me.textColumns + '</div>' +
'<div class="col-50">' + me.textColumns + '</div>' + '<div class="col-50">' + me.textRows + '</div>' +
'<div class="col-50">' + me.textRows + '</div>' + '</div>' +
'</div>' + '<div id="picker-table-size"></div>' +
'<div id="picker-table-size"></div>' + '</div>',
'</div>', buttons: [
buttons: [ {
{ text: me.textCancel
text: me.textCancel },
}, {
{ text: 'OK',
text: 'OK', bold: true,
bold: true, onClick: function () {
onClick: function () { var size = picker.value;
var size = picker.value;
if (me.api) { if (me.api) {
me.api.put_Table(parseInt(size[0]), parseInt(size[1])); me.api.put_Table(parseInt(size[0]), parseInt(size[1]));
var properties = new Asc.CTableProp(); var properties = new Asc.CTableProp();
properties.put_TableStyle(type); properties.put_TableStyle(type);
me.api.tblApply(properties); me.api.tblApply(properties);
}
} }
} }
] }
}); ]
});
picker = uiApp.picker({ picker = uiApp.picker({
container: '#picker-table-size', container: '#picker-table-size',
toolbar: false, toolbar: false,
rotateEffect: true, rotateEffect: true,
value: [3, 3], value: [3, 3],
cols: [{ cols: [{
textAlign: 'left', textAlign: 'left',
values: [1,2,3,4,5,6,7,8,9,10] values: [1,2,3,4,5,6,7,8,9,10]
}, { }, {
values: [1,2,3,4,5,6,7,8,9,10] values: [1,2,3,4,5,6,7,8,9,10]
}] }]
}); });
// Vertical align // Vertical align
$$(modal).css({ $$(modal).css({
marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px' marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px'
}); });
} }
}, 300);
}, },
// Public // Public

13
apps/presentationeditor/mobile/app/controller/edit/EditTable.js
View file

@ -69,14 +69,19 @@ define([
return _sizes[index]; return _sizes[index];
}, },
sizeByValue: function (value) { indexSizeByValue: function (value) {
var index = 0; var index = 0;
_.each(_sizes, function (size, idx) { _.each(_sizes, function (size, idx) {
if (Math.abs(size - value) < 0.25) { if (Math.abs(size - value) < 0.25) {
index = idx; index = idx;
} }
}); });
return _sizes[index];
return index;
},
sizeByValue: function (value) {
return _sizes[this.indexSizeByValue(value)];
} }
} }
})(); })();
@ -182,7 +187,7 @@ define([
}, },
_initTableOptionsView: function() { _initTableOptionsView: function() {
var margins = _tableObject.get_DefaultMargins(); var margins = _tableObject.get_CellMargins();
if (margins) { if (margins) {
var distance = Common.Utils.Metric.fnRecalcFromMM(margins.get_Left()); var distance = Common.Utils.Metric.fnRecalcFromMM(margins.get_Left());
$('#table-options-margins input').val(distance); $('#table-options-margins input').val(distance);
@ -262,7 +267,7 @@ define([
// }); // });
// } // }
$('#edit-table-bordersize input').val([borderSizeTransform.sizeByIndex(_cellBorderWidth)]); $('#edit-table-bordersize input').val([borderSizeTransform.indexSizeByValue(_cellBorderWidth)]);
$('#edit-table-bordersize .item-after').text(borderSizeTransform.sizeByValue(_cellBorderWidth) + ' ' + _metricText); $('#edit-table-bordersize .item-after').text(borderSizeTransform.sizeByValue(_cellBorderWidth) + ' ' + _metricText);
var borderPalette = me.getView('EditTable').paletteBorderColor; var borderPalette = me.getView('EditTable').paletteBorderColor;