Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
9d43ac5a
Commit
9d43ac5a
authored
Aug 29, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Fix Bug 32999.
parent
b62a98c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
17 deletions
+19
-17
apps/documenteditor/main/app/view/ShapeSettings.js
apps/documenteditor/main/app/view/ShapeSettings.js
+19
-17
No files found.
apps/documenteditor/main/app/view/ShapeSettings.js
View file @
9d43ac5a
...
@@ -1455,23 +1455,25 @@ define([
...
@@ -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
){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment