Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extmenu drag and drop fixed, closes #801. #924

Merged
1 commit merged into from
Aug 2, 2013
Merged

Extmenu drag and drop fixed, closes #801. #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Fixes:
- Fixed not working password recovery process if using your email adress
- Fixed System::queryStringSetVar() does not update the request object, #753.
- Fixed category tree html encoding problem, #681
- Fixed extmenu drag and drop problem, #801.

Features:
- Added garbage collection to CSRF token generator
Expand Down
10 changes: 6 additions & 4 deletions src/system/Zikula/Module/AdminModule/Resources/public/js/admin_admin_ajax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,12 @@ Object.extend(Zikula.AdminPanel.Tab, /** @lends Zikula.AdminPanel.Tab */{
};
Draggables.addObserver({
onStart: function(name, draggable, event) {
draggable.element.down('a').stopObserving('click', preventDefault);
setTimeout(function() {
draggable.element.down('a').observe('click', preventDefault);
}, 200);
if (draggable.element.down('a') != undefined) {
draggable.element.down('a').stopObserving('click', preventDefault);
setTimeout(function() {
draggable.element.down('a').observe('click', preventDefault);
}, 200);
}
}
});
$('admintabs').select('li.admintab').each(function(tab) {
Expand Down