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

Merge pull request #829 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-04-22 17:16:57 +03:00 committed by GitHub
parent 21300ad418 28447731e6
commit d7ee56626a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -89,7 +89,8 @@ define([
GradColor: '000000', GradColor: '000000',
GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR,
FormId: null, FormId: null,
DisabledControls: false DisabledControls: false,
applicationPixelRatio: Common.Utils.applicationPixelRatio()
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
@ -121,6 +122,8 @@ define([
this.FillColorContainer = $('#textart-panel-color-fill'); this.FillColorContainer = $('#textart-panel-color-fill');
this.FillGradientContainer = $('#textart-panel-gradient-fill'); this.FillGradientContainer = $('#textart-panel-gradient-fill');
this.TransparencyContainer = $('#textart-panel-transparent-fill'); this.TransparencyContainer = $('#textart-panel-transparent-fill');
$(window).on('resize', _.bind(this.onWindowResize, this));
}, },
setApi: function(api) { setApi: function(api) {
@ -1126,22 +1129,17 @@ define([
}, },
fillTransform: function(transforms) { fillTransform: function(transforms) {
if (transforms && transforms.length>1 && transforms[1]){ if (transforms){
var me = this, var artStore = [];
artStore = [], for (var i=0; i<transforms.length; i++) {
arrTransforms = transforms[1]; var item = transforms[i];
for (var i=0; i<arrTransforms.length; i++) { artStore.push({
var arr = arrTransforms[i]; imageUrl: item.Image,
if (arr && arr.length>0) type : item.Type,
_.each(arr, function(item){ selected: false
artStore.push({ });
imageUrl: item.Image,
type : item.Type,
selected: false
});
});
} }
this.cmbTransform.menuPicker.store.add(artStore); this.cmbTransform.menuPicker.store.reset(artStore);
if (this.cmbTransform.menuPicker.store.length > 0) { if (this.cmbTransform.menuPicker.store.length > 0) {
this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true);
} }
@ -1294,6 +1292,13 @@ define([
} }
}, },
onWindowResize: function() {
if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio())
this.fillTransform(this.api.asc_getPropertyEditorTextArts());
this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio();
},
txtNoBorders : 'No Line', txtNoBorders : 'No Line',
strStroke : 'Stroke', strStroke : 'Stroke',
strColor : 'Color', strColor : 'Color',

2
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1695,7 +1695,7 @@ define([
// set menus // set menus
var me = this; var me = this;
var levelTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div id="<%= options.previewId %>" class="menu-list-preview" style="width: 160px; height: 30px;"></div></a>'); var levelTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div id="<%= options.previewId %>" class="menu-list-preview" style="width: 200px; height: 30px;"></div></a>');
var items = [], ids = []; var items = [], ids = [];
for (var i=0; i<9; i++) { for (var i=0; i<9; i++) {
ids.push('id-toolbar-menu-markers-level-' + i); ids.push('id-toolbar-menu-markers-level-' + i);

36
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -93,7 +93,8 @@ define([
GradColor: '000000', GradColor: '000000',
GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR,
FormId: null, FormId: null,
DisabledControls: false DisabledControls: false,
applicationPixelRatio: Common.Utils.applicationPixelRatio()
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
@ -134,6 +135,7 @@ define([
el.html(this.template({ el.html(this.template({
scope: this scope: this
})); }));
$(window).on('resize', _.bind(this.onWindowResize, this));
}, },
setApi: function(api) { setApi: function(api) {
@ -1538,22 +1540,17 @@ define([
}, },
fillTransform: function(transforms) { fillTransform: function(transforms) {
if (transforms && transforms.length>1 && transforms[1]){ if (transforms){
var me = this, var artStore = [];
artStore = [], for (var i=0; i<transforms.length; i++) {
arrTransforms = transforms[1]; var item = transforms[i];
for (var i=0; i<arrTransforms.length; i++) { artStore.push({
var arr = arrTransforms[i]; imageUrl: item.Image,
if (arr && arr.length>0) type : item.Type,
_.each(arr, function(item){ selected: false
artStore.push({ });
imageUrl: item.Image,
type : item.Type,
selected: false
});
});
} }
this.cmbTransform.menuPicker.store.add(artStore); this.cmbTransform.menuPicker.store.reset(artStore);
if (this.cmbTransform.menuPicker.store.length > 0) { if (this.cmbTransform.menuPicker.store.length > 0) {
this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true);
} }
@ -1727,6 +1724,13 @@ define([
} }
}, },
onWindowResize: function() {
if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio())
this.fillTransform(this.api.asc_getPropertyEditorTextArts());
this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio();
},
txtNoBorders : 'No Line', txtNoBorders : 'No Line',
strStroke : 'Stroke', strStroke : 'Stroke',
strColor : 'Color', strColor : 'Color',

36
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -94,7 +94,8 @@ define([
GradColor: '000000', GradColor: '000000',
GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR,
FormId: null, FormId: null,
DisabledControls: false DisabledControls: false,
applicationPixelRatio: Common.Utils.applicationPixelRatio()
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
@ -135,6 +136,7 @@ define([
el.html(this.template({ el.html(this.template({
scope: this scope: this
})); }));
$(window).on('resize', _.bind(this.onWindowResize, this));
}, },
setApi: function(api) { setApi: function(api) {
@ -1543,22 +1545,17 @@ define([
}, },
fillTransform: function(transforms) { fillTransform: function(transforms) {
if (transforms && transforms.length>1 && transforms[1]){ if (transforms){
var me = this, var artStore = [];
artStore = [], for (var i=0; i<transforms.length; i++) {
arrTransforms = transforms[1]; var item = transforms[i];
for (var i=0; i<arrTransforms.length; i++) { artStore.push({
var arr = arrTransforms[i]; imageUrl: item.Image,
if (arr && arr.length>0) type : item.Type,
_.each(arr, function(item){ selected: false
artStore.push({ });
imageUrl: item.Image,
type : item.Type,
selected: false
});
});
} }
this.cmbTransform.menuPicker.store.add(artStore); this.cmbTransform.menuPicker.store.reset(artStore);
if (this.cmbTransform.menuPicker.store.length > 0) { if (this.cmbTransform.menuPicker.store.length > 0) {
this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true);
} }
@ -1730,6 +1727,13 @@ define([
} }
}, },
onWindowResize: function() {
if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio())
this.fillTransform(this.api.asc_getPropertyEditorTextArts());
this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio();
},
txtNoBorders : 'No Line', txtNoBorders : 'No Line',
strStroke : 'Stroke', strStroke : 'Stroke',
strColor : 'Color', strColor : 'Color',