Merge branch 'master' of github.com:splitbrain/dokuwiki

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index f7e78c747..b9dacfa29 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -43,7 +43,7 @@ var dw_mediamanager = {
         $tree.dw_tree({toggle_selector: 'img',
                        load_data: function (show_sublist, $clicky) {
                            // get the enclosed link (is always the first one)
-                           var $link = $clicky.siblings('a').first();
+                           var $link = $clicky.parent().find('div.li a.idx_dir');
 
                            jQuery.post(
                                DOKU_BASE + 'lib/exe/ajax.php',
@@ -51,13 +51,12 @@ var dw_mediamanager = {
                                show_sublist,
                                'html'
                            );
-
-                           $clicky.attr('src', DOKU_BASE + 'lib/images/minus.gif');
                        },
 
-                       close: function ($clicky) {
+                       toggle_display: function ($clicky, opening) {
                            $clicky.attr('src',
-                                        DOKU_BASE + 'lib/images/plus.gif');
+                                        DOKU_BASE + 'lib/images/' +
+                                        (opening ? 'minus' : 'plus') + '.gif');
                        }});
         $tree.delegate('a', 'click', dw_mediamanager.list);
     },
@@ -484,7 +483,7 @@ var dw_mediamanager = {
         var allowed = bind(dw_mediamanager.allowedOpt, opt);
 
         // Current value
-        if (dw_mediamanager[opt] !== false && allowed(dw_mediamanager[opt]) {
+        if (dw_mediamanager[opt] !== false && allowed(dw_mediamanager[opt])) {
             return dw_mediamanager[opt];
         }