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

[DE] Fix Bug 32999.

Browse source
This commit is contained in:
Julia Radzhabova 2016-08-29 11:16:31 +03:00
parent b62a98c7aa
commit 9d43ac5a4b
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -1455,23 +1455,25 @@ define([
onInitStandartTextures: function(texture) { onInitStandartTextures: function(texture) {
var me = this; var me = this;
if (texture && texture.length>0){ if (texture && texture.length>0){
this.btnTexture = new Common.UI.ComboBox({ if (!this.btnTexture) {
el: $('#shape-combo-fill-texture'), this.btnTexture = new Common.UI.ComboBox({
template: _.template([ el: $('#shape-combo-fill-texture'),
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">', template: _.template([
'<div class="form-control text" style="width: 90px;">' + this.textSelectTexture + '</div>', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">',
'<div style="display: table-cell;"></div>', '<div class="form-control text" style="width: 90px;">' + this.textSelectTexture + '</div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>', '<div style="display: table-cell;"></div>',
'</div>' '<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
].join('')) '</div>'
}); ].join(''))
this.textureMenu = new Common.UI.Menu({ });
items: [ this.textureMenu = new Common.UI.Menu({
{ template: _.template('<div id="id-shape-menu-texture" style="width: 233px; margin: 0 5px;"></div>') } items: [
] { template: _.template('<div id="id-shape-menu-texture" style="width: 233px; margin: 0 5px;"></div>') }
}); ]
this.textureMenu.render($('#shape-combo-fill-texture')); });
this.fillControls.push(this.btnTexture); this.textureMenu.render($('#shape-combo-fill-texture'));
this.fillControls.push(this.btnTexture);
}
var texturearray = []; var texturearray = [];
_.each(texture, function(item){ _.each(texture, function(item){