Merge pull request #924 from phaidon/extmenu-draggable-fix

Extmenu drag and drop fixed, closes #801.
zikula · Aug 2, 2013 · d16d0c5 · d16d0c5
2 parents 9bbe82d + e9cff6a
commit d16d0c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/docs/CHANGELOG.md b/src/docs/CHANGELOG.md
@@ -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

diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/admin_admin_ajax.js b/src/system/Zikula/Module/AdminModule/Resources/public/js/admin_admin_ajax.js
@@ -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) {