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
0af709b9
Commit
0af709b9
authored
Apr 14, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE][PE][SSE] Mirgate to jquery 3.2.1
parent
82f87770
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
21 additions
and
21 deletions
+21
-21
apps/common/main/lib/component/Button.js
apps/common/main/lib/component/Button.js
+2
-2
apps/common/main/lib/component/DataView.js
apps/common/main/lib/component/DataView.js
+8
-8
apps/common/main/lib/component/InputField.js
apps/common/main/lib/component/InputField.js
+1
-1
apps/common/main/lib/component/Window.js
apps/common/main/lib/component/Window.js
+2
-2
apps/common/main/lib/extend/Bootstrap.js
apps/common/main/lib/extend/Bootstrap.js
+2
-2
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+2
-2
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+2
-2
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+2
-2
No files found.
apps/common/main/lib/component/Button.js
View file @
0af709b9
...
...
@@ -487,12 +487,12 @@ define([
this
.
caption
=
caption
;
if
(
this
.
rendered
)
{
var
captionNode
=
this
.
cmpEl
.
find
(
'
button:first > .caption
'
).
a
ndSelf
().
filter
(
'
button > .caption
'
);
var
captionNode
=
this
.
cmpEl
.
find
(
'
button:first > .caption
'
).
a
ddBack
().
filter
(
'
button > .caption
'
);
if
(
captionNode
.
length
>
0
)
{
captionNode
.
text
(
caption
);
}
else
{
this
.
cmpEl
.
find
(
'
button:first
'
).
a
ndSelf
().
filter
(
'
button
'
).
text
(
caption
);
this
.
cmpEl
.
find
(
'
button:first
'
).
a
ddBack
().
filter
(
'
button
'
).
text
(
caption
);
}
}
}
...
...
apps/common/main/lib/component/DataView.js
View file @
0af709b9
...
...
@@ -297,7 +297,7 @@ define([
if
(
_
.
isUndefined
(
this
.
scroller
)
&&
this
.
allowScrollbar
)
{
this
.
scroller
=
new
Common
.
UI
.
Scroller
({
el
:
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ndSelf
().
filter
(
'
.inner
'
),
el
:
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ddBack
().
filter
(
'
.inner
'
),
useKeyboard
:
this
.
enableKeyEvents
&&
!
this
.
handleSelect
,
minScrollbarLength
:
40
,
wheelSpeed
:
10
...
...
@@ -394,7 +394,7 @@ define([
});
if
(
view
)
{
var
innerEl
=
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ndSelf
().
filter
(
'
.inner
'
);
var
innerEl
=
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ddBack
().
filter
(
'
.inner
'
);
if
(
this
.
groups
&&
this
.
groups
.
length
>
0
)
{
var
group
=
this
.
groups
.
findWhere
({
id
:
record
.
get
(
'
group
'
)});
...
...
@@ -452,7 +452,7 @@ define([
}
if
(
this
.
store
.
length
<
1
&&
this
.
emptyText
.
length
>
0
)
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ndSelf
().
filter
(
'
.inner
'
).
append
(
'
<table cellpadding="10" class="empty-text"><tr><td>
'
+
this
.
emptyText
+
'
</td></tr></table>
'
);
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ddBack
().
filter
(
'
.inner
'
).
append
(
'
<table cellpadding="10" class="empty-text"><tr><td>
'
+
this
.
emptyText
+
'
</td></tr></table>
'
);
_
.
each
(
this
.
dataViewItems
,
function
(
item
)
{
this
.
stopListening
(
item
);
...
...
@@ -464,7 +464,7 @@ define([
if
(
this
.
allowScrollbar
)
{
this
.
scroller
=
new
Common
.
UI
.
Scroller
({
el
:
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ndSelf
().
filter
(
'
.inner
'
),
el
:
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ddBack
().
filter
(
'
.inner
'
),
useKeyboard
:
this
.
enableKeyEvents
&&
!
this
.
handleSelect
,
minScrollbarLength
:
40
,
wheelSpeed
:
10
...
...
@@ -487,7 +487,7 @@ define([
view
.
stopListening
();
if
(
this
.
store
.
length
<
1
&&
this
.
emptyText
.
length
>
0
)
{
var
el
=
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ndSelf
().
filter
(
'
.inner
'
);
var
el
=
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ddBack
().
filter
(
'
.inner
'
);
if
(
el
.
find
(
'
.empty-text
'
).
length
<=
0
)
el
.
append
(
'
<table cellpadding="10" class="empty-text"><tr><td>
'
+
this
.
emptyText
+
'
</td></tr></table>
'
);
}
...
...
@@ -653,7 +653,7 @@ define([
attachKeyEvents
:
function
()
{
if
(
this
.
enableKeyEvents
&&
this
.
handleSelect
)
{
var
el
=
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ndSelf
().
filter
(
'
.inner
'
);
var
el
=
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ddBack
().
filter
(
'
.inner
'
);
el
.
addClass
(
'
canfocused
'
);
el
.
attr
(
'
tabindex
'
,
'
0
'
);
el
.
on
((
this
.
parentMenu
&&
this
.
useBSKeydown
)
?
'
dataview:keydown
'
:
'
keydown
'
,
_
.
bind
(
this
.
onKeyDown
,
this
));
...
...
@@ -673,7 +673,7 @@ define([
setDisabled
:
function
(
disabled
)
{
this
.
disabled
=
disabled
;
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ndSelf
().
filter
(
'
.inner
'
).
toggleClass
(
'
disabled
'
,
disabled
);
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ddBack
().
filter
(
'
.inner
'
).
toggleClass
(
'
disabled
'
,
disabled
);
},
isDisabled
:
function
()
{
...
...
@@ -688,7 +688,7 @@ define([
var
menuRoot
=
(
this
.
parentMenu
.
cmpEl
.
attr
(
'
role
'
)
===
'
menu
'
)
?
this
.
parentMenu
.
cmpEl
:
this
.
parentMenu
.
cmpEl
.
find
(
'
[role=menu]
'
),
innerEl
=
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ndSelf
().
filter
(
'
.inner
'
),
innerEl
=
$
(
this
.
el
).
find
(
'
.inner
'
).
a
ddBack
().
filter
(
'
.inner
'
),
docH
=
Common
.
Utils
.
innerHeight
(),
menuH
=
menuRoot
.
outerHeight
(),
top
=
parseInt
(
menuRoot
.
css
(
'
top
'
));
...
...
apps/common/main/lib/component/InputField.js
View file @
0af709b9
...
...
@@ -150,7 +150,7 @@ define([
if
(
!
me
.
rendered
)
{
var
el
=
this
.
cmpEl
;
this
.
_input
=
this
.
cmpEl
.
find
(
'
input
'
).
a
ndSelf
().
filter
(
'
input
'
);
this
.
_input
=
this
.
cmpEl
.
find
(
'
input
'
).
a
ddBack
().
filter
(
'
input
'
);
if
(
this
.
editable
)
{
this
.
_input
.
on
(
'
blur
'
,
_
.
bind
(
this
.
onInputChanged
,
this
));
...
...
apps/common/main/lib/component/Window.js
View file @
0af709b9
...
...
@@ -695,7 +695,7 @@ define([
hide_mask
=
true
;
mask
.
attr
(
'
counter
'
,
parseInt
(
mask
.
attr
(
'
counter
'
))
-
1
);
if
(
this
.
$lastmodal
.
size
()
>
0
)
{
if
(
this
.
$lastmodal
.
length
>
0
)
{
this
.
$lastmodal
.
removeClass
(
'
dethrone
'
);
hide_mask
=
!
(
this
.
$lastmodal
.
hasClass
(
'
modal
'
)
&&
this
.
$lastmodal
.
is
(
'
:visible
'
));
}
...
...
@@ -736,7 +736,7 @@ define([
hide_mask
=
true
;
mask
.
attr
(
'
counter
'
,
parseInt
(
mask
.
attr
(
'
counter
'
))
-
1
);
if
(
this
.
$lastmodal
.
size
()
>
0
)
{
if
(
this
.
$lastmodal
.
length
>
0
)
{
this
.
$lastmodal
.
removeClass
(
'
dethrone
'
);
hide_mask
=
!
(
this
.
$lastmodal
.
hasClass
(
'
modal
'
)
&&
this
.
$lastmodal
.
is
(
'
:visible
'
));
}
...
...
apps/common/main/lib/extend/Bootstrap.js
View file @
0af709b9
...
...
@@ -81,8 +81,8 @@ function patchDropDownKeyDown(e) {
if
(
!
isActive
||
(
isActive
&&
e
.
keyCode
==
27
))
{
if
(
e
.
which
==
27
)
{
$items
=
$
(
'
[role=menu] li.dropdown-submenu.over:visible
'
,
$parent
);
if
(
$items
.
size
()
)
{
$items
.
eq
(
$items
.
size
()
-
1
).
removeClass
(
'
over
'
);
if
(
$items
.
length
)
{
$items
.
eq
(
$items
.
length
-
1
).
removeClass
(
'
over
'
);
return
false
;
}
else
if
(
$parent
.
hasClass
(
'
dropdown-submenu
'
)
&&
$parent
.
hasClass
(
'
over
'
))
{
$parent
.
removeClass
(
'
over
'
);
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
0af709b9
...
...
@@ -202,13 +202,13 @@ define([
me
.
api
.
asc_enableKeyEvents
(
false
);
},
'
modal:close
'
:
function
(
dlg
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
size
()
<
1
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
length
<
1
)
{
me
.
isModalShowed
=
false
;
me
.
api
.
asc_enableKeyEvents
(
true
);
}
},
'
modal:hide
'
:
function
(
dlg
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
size
()
<
1
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
length
<
1
)
{
me
.
isModalShowed
=
false
;
me
.
api
.
asc_enableKeyEvents
(
true
);
}
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
0af709b9
...
...
@@ -192,13 +192,13 @@ define([
me
.
api
.
asc_enableKeyEvents
(
false
);
},
'
modal:close
'
:
function
(
dlg
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
size
()
<
1
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
length
<
1
)
{
me
.
isModalShowed
=
false
;
me
.
api
.
asc_enableKeyEvents
(
true
);
}
},
'
modal:hide
'
:
function
(
dlg
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
size
()
<
1
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
length
<
1
)
{
me
.
isModalShowed
=
false
;
me
.
api
.
asc_enableKeyEvents
(
true
);
}
...
...
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
0af709b9
...
...
@@ -202,13 +202,13 @@ define([
me
.
api
.
asc_enableKeyEvents
(
false
);
},
'
modal:close
'
:
function
(
dlg
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
size
()
<
1
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
length
<
1
)
{
me
.
isModalShowed
=
false
;
me
.
api
.
asc_enableKeyEvents
(
true
);
}
},
'
modal:hide
'
:
function
(
dlg
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
size
()
<
1
)
{
if
(
dlg
&&
dlg
.
$lastmodal
&&
dlg
.
$lastmodal
.
length
<
1
)
{
me
.
isModalShowed
=
false
;
me
.
api
.
asc_enableKeyEvents
(
true
);
}
...
...
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