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

Merge pull request #581 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-11-21 14:52:22 +03:00 committed by GitHub
parent cac7d741d7 aec56b6c15
commit 7fc798e5ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/documenteditor/main/app/controller/Links.js
View file

@ -317,7 +317,9 @@ define([
})).show(); })).show();
break; break;
case 'settings': case 'settings':
var isEndNote = me.api.asc_IsCursorInEndnote(); var isEndNote = me.api.asc_IsCursorInEndnote(),
isFootNote = me.api.asc_IsCursorInFootnote();
isEndNote = (isEndNote || isFootNote) ? isEndNote : Common.Utils.InternalSettings.get("de-settings-note-last") || false;
(new DE.Views.NoteSettingsDialog({ (new DE.Views.NoteSettingsDialog({
api: me.api, api: me.api,
handler: function (result, settings) { handler: function (result, settings) {
@ -328,6 +330,9 @@ define([
setTimeout(function() { setTimeout(function() {
settings.isEndNote ? me.api.asc_AddEndnote(settings.custom) : me.api.asc_AddFootnote(settings.custom); settings.isEndNote ? me.api.asc_AddEndnote(settings.custom) : me.api.asc_AddFootnote(settings.custom);
}, 1); }, 1);
if (result == 'insert' || result == 'apply') {
Common.Utils.InternalSettings.set("de-settings-note-last", settings.isEndNote);
}
} }
Common.NotificationCenter.trigger('edit:complete', me.toolbar); Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}, },

3
apps/documenteditor/mobile/app/controller/edit/EditShape.js
View file

@ -227,7 +227,8 @@ define([
$('#edit-shape-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)); $('#edit-shape-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt));
// Init style opacity // Init style opacity
$('#edit-shape-effect input').val([shapeProperties.get_fill().asc_getTransparent() ? shapeProperties.get_fill().asc_getTransparent() / 2.55 : 100]); var transparent = shapeProperties.get_fill().asc_getTransparent();
$('#edit-shape-effect input').val([transparent!==null && transparent!==undefined ? transparent / 2.55 : 100]);
$('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%"); $('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%");
paletteFillColor && paletteFillColor.on('select', _.bind(me.onFillColor, me)); paletteFillColor && paletteFillColor.on('select', _.bind(me.onFillColor, me));

3
apps/presentationeditor/mobile/app/controller/edit/EditShape.js
View file

@ -160,7 +160,8 @@ define([
$('#edit-shape-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)); $('#edit-shape-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt));
// Init style opacity // Init style opacity
$('#edit-shape-effect input').val([_shapeObject.get_fill().asc_getTransparent() ? _shapeObject.get_fill().asc_getTransparent() / 2.55 : 100]); var transparent = _shapeObject.get_fill().asc_getTransparent();
$('#edit-shape-effect input').val([transparent!==null && transparent!==undefined ? transparent / 2.55 : 100]);
$('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%"); $('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%");
paletteFillColor && paletteFillColor.on('select', _.bind(me.onFillColor, me)); paletteFillColor && paletteFillColor.on('select', _.bind(me.onFillColor, me));

14
apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js
View file

@ -341,7 +341,7 @@ define([
initVertAxisPage: function () { initVertAxisPage: function () {
var me = this, var me = this,
$vertAxisPage = $('.page[data-page=edit-chart-vertical-axis]'), $vertAxisPage = $('.page[data-page=edit-chart-vertical-axis]'),
chartProperty = me.api.asc_getChartObject(), chartProperty = me.api.asc_getChartObject(true),
verAxisProps = chartProperty.getVertAxisProps(), verAxisProps = chartProperty.getVertAxisProps(),
axisProps = (verAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? verAxisProps : chartProperty.getHorAxisProps(); axisProps = (verAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? verAxisProps : chartProperty.getHorAxisProps();
@ -440,7 +440,7 @@ define([
initHorAxisPage: function () { initHorAxisPage: function () {
var me = this, var me = this,
$horAxisPage = $('.page[data-page=edit-chart-horizontal-axis]'), $horAxisPage = $('.page[data-page=edit-chart-horizontal-axis]'),
chartProperty = me.api.asc_getChartObject(), chartProperty = me.api.asc_getChartObject(true),
horAxisProps = chartProperty.getHorAxisProps(), horAxisProps = chartProperty.getHorAxisProps(),
axisProps = (horAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? chartProperty.getVertAxisProps() : horAxisProps; axisProps = (horAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? chartProperty.getVertAxisProps() : horAxisProps;
@ -940,14 +940,14 @@ define([
// Helpers // Helpers
_getVerticalAxisProp: function () { _getVerticalAxisProp: function () {
var chartObject = this.api.asc_getChartObject(), var chartObject = this.api.asc_getChartObject(true),
verAxisProps = chartObject.getVertAxisProps(); verAxisProps = chartObject.getVertAxisProps();
return (verAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? verAxisProps : chartObject.getHorAxisProps(); return (verAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? verAxisProps : chartObject.getHorAxisProps();
}, },
_setVerticalAxisProp: function (axisProps) { _setVerticalAxisProp: function (axisProps) {
var chartObject = this.api.asc_getChartObject(), var chartObject = this.api.asc_getChartObject(true),
verAxisProps = chartObject.getVertAxisProps(); verAxisProps = chartObject.getVertAxisProps();
if (!_.isUndefined(chartObject)) { if (!_.isUndefined(chartObject)) {
@ -957,14 +957,14 @@ define([
}, },
_getHorizontalAxisProp: function () { _getHorizontalAxisProp: function () {
var chartObject = this.api.asc_getChartObject(), var chartObject = this.api.asc_getChartObject(true),
verHorProps = chartObject.getHorAxisProps(); verHorProps = chartObject.getHorAxisProps();
return (verHorProps.getAxisType() == Asc.c_oAscAxisType.val) ? chartObject.getVertAxisProps() : verHorProps; return (verHorProps.getAxisType() == Asc.c_oAscAxisType.val) ? chartObject.getVertAxisProps() : verHorProps;
}, },
_setHorizontalAxisProp: function (axisProps) { _setHorizontalAxisProp: function (axisProps) {
var chartObject = this.api.asc_getChartObject(), var chartObject = this.api.asc_getChartObject(true),
verAxisProps = chartObject.getHorAxisProps(); verAxisProps = chartObject.getHorAxisProps();
if (!_.isUndefined(chartObject)) { if (!_.isUndefined(chartObject)) {
@ -975,7 +975,7 @@ define([
_setLayoutProperty: function (propertyMethod, e) { _setLayoutProperty: function (propertyMethod, e) {
var value = $(e.currentTarget).val(), var value = $(e.currentTarget).val(),
chartObject = this.api.asc_getChartObject(); chartObject = this.api.asc_getChartObject(true);
if (!_.isUndefined(chartObject) && value && value.length > 0) { if (!_.isUndefined(chartObject) && value && value.length > 0) {
var intValue = parseInt(value); var intValue = parseInt(value);

3
apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js
View file

@ -188,7 +188,8 @@ define([
// Effect // Effect
// Init style opacity // Init style opacity
$('#edit-shape-effect input').val([shapeProperties.get_fill().asc_getTransparent() ? shapeProperties.get_fill().asc_getTransparent() / 2.55 : 100]); var transparent = shapeProperties.get_fill().asc_getTransparent();
$('#edit-shape-effect input').val([transparent!==null && transparent!==undefined ? transparent / 2.55 : 100]);
$('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%"); $('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%");
$('#edit-shape-effect input').single('change touchend', _.buffered(me.onOpacity, 100, me)); $('#edit-shape-effect input').single('change touchend', _.buffered(me.onOpacity, 100, me));
$('#edit-shape-effect input').single('input', _.bind(me.onOpacityChanging, me)); $('#edit-shape-effect input').single('input', _.bind(me.onOpacityChanging, me));