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

Merge pull request #1488 from ONLYOFFICE/fix/bugfix

Browse source 
Fix Bug 54917
This commit is contained in:
Julia Radzhabova 2022-01-17 22:58:07 +03:00 committed by GitHub
parent 05b7bc4212 cd39943c81
commit e234730e70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/main/app/controller/Main.js
View file

@ -2193,7 +2193,8 @@ define([
var me = this, var me = this,
shapegrouparray = [], shapegrouparray = [],
shapeStore = this.getCollection('ShapeGroups'); shapeStore = this.getCollection('ShapeGroups'),
name_arr = {};
shapeStore.reset(); shapeStore.reset();
@ -2208,12 +2209,15 @@ define([
width = 30 * cols; width = 30 * cols;
_.each(shapes[index], function(shape, idx){ _.each(shapes[index], function(shape, idx){
var name = me['txtShape_' + shape.Type];
arr.push({ arr.push({
data : {shapeType: shape.Type}, data : {shapeType: shape.Type},
tip : me['txtShape_' + shape.Type] || (me.textShape + ' ' + (idx+1)), tip : name || (me.textShape + ' ' + (idx+1)),
allowSelected : true, allowSelected : true,
selected: false selected: false
}); });
if (name)
name_arr[shape.Type] = name;
}); });
store.add(arr); store.add(arr);
shapegrouparray.push({ shapegrouparray.push({
@ -2228,6 +2232,7 @@ define([
setTimeout(function(){ setTimeout(function(){
me.getApplication().getController('Toolbar').onApiAutoShapes(); me.getApplication().getController('Toolbar').onApiAutoShapes();
}, 50); }, 50);
this.api.asc_setShapeNames(name_arr);
}, },
fillTextArt: function(shapes){ fillTextArt: function(shapes){

9
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1905,7 +1905,8 @@ define([
return; return;
var me = this, var me = this,
shapegrouparray = []; shapegrouparray = [],
name_arr = {};
_.each(groupNames, function(groupName, index){ _.each(groupNames, function(groupName, index){
var store = new Backbone.Collection([], { var store = new Backbone.Collection([], {
@ -1918,12 +1919,15 @@ define([
width = 30 * cols; width = 30 * cols;
_.each(shapes[index], function(shape, idx){ _.each(shapes[index], function(shape, idx){
var name = me['txtShape_' + shape.Type];
arr.push({ arr.push({
data : {shapeType: shape.Type}, data : {shapeType: shape.Type},
tip : me['txtShape_' + shape.Type] || (me.textShape + ' ' + (idx+1)), tip : name || (me.textShape + ' ' + (idx+1)),
allowSelected : true, allowSelected : true,
selected: false selected: false
}); });
if (name)
name_arr[shape.Type] = name;
}); });
store.add(arr); store.add(arr);
shapegrouparray.push({ shapegrouparray.push({
@ -1935,6 +1939,7 @@ define([
}); });
this.getCollection('ShapeGroups').reset(shapegrouparray); this.getCollection('ShapeGroups').reset(shapegrouparray);
this.api.asc_setShapeNames(name_arr);
}, },
fillLayoutsStore: function(layouts){ fillLayoutsStore: function(layouts){

9
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -2349,7 +2349,8 @@ define([
var me = this, var me = this,
shapegrouparray = [], shapegrouparray = [],
shapeStore = this.getCollection('ShapeGroups'); shapeStore = this.getCollection('ShapeGroups'),
name_arr = {};
shapeStore.reset(); shapeStore.reset();
@ -2364,12 +2365,15 @@ define([
width = 30 * cols; width = 30 * cols;
_.each(shapes[index], function(shape, idx){ _.each(shapes[index], function(shape, idx){
var name = me['txtShape_' + shape.Type];
arr.push({ arr.push({
data : {shapeType: shape.Type}, data : {shapeType: shape.Type},
tip : me['txtShape_' + shape.Type] || (me.textShape + ' ' + (idx+1)), tip : name || (me.textShape + ' ' + (idx+1)),
allowSelected : true, allowSelected : true,
selected: false selected: false
}); });
if (name)
name_arr[shape.Type] = name;
}); });
store.add(arr); store.add(arr);
shapegrouparray.push({ shapegrouparray.push({
@ -2385,6 +2389,7 @@ define([
setTimeout(function(){ setTimeout(function(){
me.getApplication().getController('Toolbar').onApiAutoShapes(); me.getApplication().getController('Toolbar').onApiAutoShapes();
}, 50); }, 50);
this.api.asc_setShapeNames(name_arr);
}, },
fillTextArt: function(shapes){ fillTextArt: function(shapes){