Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
7c2a7e64
Commit
7c2a7e64
authored
8 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
Javascript fixes
parent
b65b405a
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
fusiondirectory-1.3.1
fusiondirectory-1.3
fusiondirectory-1.2.3
fusiondirectory-1.2.2
fusiondirectory-1.2.1
fusiondirectory-1.2
fusiondirectory-1.1.1
fusiondirectory-1.1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
html/include/fusiondirectory.js
+3
-2
html/include/fusiondirectory.js
html/include/pulldown.js
+8
-6
html/include/pulldown.js
with
11 additions
and
8 deletions
+11
-8
html/include/fusiondirectory.js
+
3
−
2
View file @
7c2a7e64
...
...
@@ -47,7 +47,7 @@ function chk_set_all_by_class(regex,value)
function
toggle_all_
(
regex
,
state_object
)
{
state
=
document
.
getElementById
(
state_object
).
checked
;
var
state
=
document
.
getElementById
(
state_object
).
checked
;
chk_set_all
(
regex
,
state
);
}
...
...
@@ -150,6 +150,7 @@ function next_msg_dialog()
var
tmp
=
""
;
var
ele
;
var
ele2
;
var
ele3
;
var
cur_id
;
if
(
document
.
getElementById
(
'
current_msg_dialogs
'
))
{
...
...
@@ -174,11 +175,11 @@ function next_msg_dialog()
tmp
=
tmp
.
replace
(
/,$/g
,
""
);
if
(
i_id
!==
""
)
{
ele
=
document
.
getElementById
(
'
e_layer
'
+
i_id
);
ele2
=
document
.
getElementById
(
'
e_layer2
'
)
;
ele3
=
document
.
getElementById
(
'
e_layerTitle
'
+
i_id
);
ele
.
style
.
display
=
'
block
'
;
document
.
getElementById
(
'
pending_msg_dialogs
'
).
value
=
tmp
;
document
.
getElementById
(
'
current_msg_dialogs
'
).
value
=
i_id
;
ele2
=
document
.
getElementById
(
'
e_layer2
'
)
;
ele3
.
onmousedown
=
start_move_div_by_cursor
;
ele2
.
onmouseup
=
stop_move_div_by_cursor
;
ele2
.
onmousemove
=
move_div_by_cursor
;
...
...
This diff is collapsed.
Click to expand it.
html/include/pulldown.js
+
8
−
6
View file @
7c2a7e64
...
...
@@ -205,8 +205,12 @@ Object.extend(Object.extend(MenuItem.prototype, MenuContainer.prototype), {
}
if
(
this
.
subMenu
)
{
this
.
element
.
onmouseout
=
function
()
{
if
(
menuItem
.
root
.
openDelayTimer
)
window
.
clearTimeout
(
menuItem
.
root
.
openDelayTimer
);
if
(
menuItem
.
root
.
closeDelayTimer
)
window
.
clearTimeout
(
menuItem
.
root
.
closeDelayTimer
);
if
(
menuItem
.
root
.
openDelayTimer
)
{
window
.
clearTimeout
(
menuItem
.
root
.
openDelayTimer
);
}
if
(
menuItem
.
root
.
closeDelayTimer
)
{
window
.
clearTimeout
(
menuItem
.
root
.
closeDelayTimer
);
}
menuItem
.
root
.
closingMenuItem
=
menuItem
;
menuItem
.
root
.
closeDelayTimer
=
window
.
setTimeout
(
menuItem
.
root
.
name
+
"
.closingMenuItem.subMenu.close()
"
,
menuItem
.
root
.
closeDelayTime
);
}
...
...
@@ -222,10 +226,8 @@ Object.extend(Object.extend(MenuItem.prototype, MenuContainer.prototype), {
closeItem
:
function
(
trigger
)
{
this
.
isOpen
=
false
;
if
(
this
.
subMenu
)
{
if
(
this
.
subMenu
!==
trigger
)
{
this
.
subMenu
.
close
();
}
if
(
this
.
subMenu
&&
(
this
.
subMenu
!==
trigger
))
{
this
.
subMenu
.
close
();
}
}
});
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets