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
0b445bb2
Commit
0b445bb2
authored
Apr 17, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Debug with jquery 3.2.1.
parent
94134156
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
apps/common/main/lib/component/Window.js
apps/common/main/lib/component/Window.js
+6
-5
apps/common/main/lib/view/AdvancedSettingsWindow.js
apps/common/main/lib/view/AdvancedSettingsWindow.js
+3
-2
No files found.
apps/common/main/lib/component/Window.js
View file @
0b445bb2
...
...
@@ -433,7 +433,8 @@ define([
var
footer
=
window
.
getChild
(
'
.footer
'
);
var
header
=
window
.
getChild
(
'
.header
'
);
var
body
=
window
.
getChild
(
'
.body
'
);
var
icon
=
window
.
getChild
(
'
.icon
'
);
var
icon
=
window
.
getChild
(
'
.icon
'
),
icon_height
=
(
icon
.
length
>
0
)
?
icon
.
height
()
:
0
;
var
check
=
window
.
getChild
(
'
.info-box .dont-show-checkbox
'
);
if
(
!
options
.
dontshow
)
body
.
css
(
'
padding-bottom
'
,
'
10px
'
);
...
...
@@ -443,19 +444,19 @@ define([
options
.
width
=
options
.
maxwidth
;
}
if
(
options
.
width
==
'
auto
'
)
{
text_cnt
.
height
(
Math
.
max
(
text
.
height
()
+
((
check
.
length
>
0
)
?
(
check
.
height
()
+
parseInt
(
check
.
css
(
'
margin-top
'
)))
:
0
),
icon
.
height
()
));
text_cnt
.
height
(
Math
.
max
(
text
.
height
()
+
((
check
.
length
>
0
)
?
(
check
.
height
()
+
parseInt
(
check
.
css
(
'
margin-top
'
)))
:
0
),
icon
_height
));
body
.
height
(
parseInt
(
text_cnt
.
css
(
'
height
'
))
+
parseInt
(
footer
.
css
(
'
height
'
)));
window
.
setSize
(
text
.
position
().
left
+
text
.
width
()
+
parseInt
(
text_cnt
.
css
(
'
padding-right
'
)),
parseInt
(
body
.
css
(
'
height
'
))
+
parseInt
(
header
.
css
(
'
height
'
)));
}
else
{
text
.
css
(
'
white-space
'
,
'
normal
'
);
window
.
setWidth
(
options
.
width
);
text_cnt
.
height
(
Math
.
max
(
text
.
height
()
+
((
check
.
length
>
0
)
?
(
check
.
height
()
+
parseInt
(
check
.
css
(
'
margin-top
'
)))
:
0
),
icon
.
height
()
));
text_cnt
.
height
(
Math
.
max
(
text
.
height
()
+
((
check
.
length
>
0
)
?
(
check
.
height
()
+
parseInt
(
check
.
css
(
'
margin-top
'
)))
:
0
),
icon
_height
));
body
.
height
(
parseInt
(
text_cnt
.
css
(
'
height
'
))
+
parseInt
(
footer
.
css
(
'
height
'
)));
window
.
setHeight
(
parseInt
(
body
.
css
(
'
height
'
))
+
parseInt
(
header
.
css
(
'
height
'
)));
}
if
(
text
.
height
()
<
icon
.
height
()
-
10
)
text
.
css
({
'
vertical-align
'
:
'
baseline
'
,
'
line-height
'
:
icon
.
height
()
+
'
px
'
});
if
(
text
.
height
()
<
icon
_height
-
10
)
text
.
css
({
'
vertical-align
'
:
'
baseline
'
,
'
line-height
'
:
icon
_height
+
'
px
'
});
}
function
onBtnClick
(
event
)
{
...
...
apps/common/main/lib/view/AdvancedSettingsWindow.js
View file @
0b445bb2
...
...
@@ -102,9 +102,10 @@ define([
btn
.
on
(
'
click
'
,
_
.
bind
(
me
.
onCategoryClick
,
me
));
me
.
btnsCategory
.
push
(
btn
);
});
var
cnt_panel
=
$window
.
find
(
'
.content-panel
'
);
var
cnt_panel
=
$window
.
find
(
'
.content-panel
'
),
menu_panel
=
$window
.
find
(
'
.menu-panel
'
);
cnt_panel
.
width
(
this
.
contentWidth
);
$window
.
width
(
$window
.
find
(
'
.menu-panel
'
).
width
(
)
+
cnt_panel
.
outerWidth
()
+
2
);
$window
.
width
(
((
menu_panel
.
length
>
0
)
?
menu_panel
.
width
()
:
0
)
+
cnt_panel
.
outerWidth
()
+
2
);
this
.
content_panels
=
$window
.
find
(
'
.settings-panel
'
);
if
(
this
.
btnsCategory
.
length
>
0
)
...
...
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