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

2 files changed, 20 insertions, 19 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];
         }
 
diff --git a/lib/scripts/tree.js b/lib/scripts/tree.js
index 46b0f6695..98d3f55d4 100644
--- a/lib/scripts/tree.js
+++ b/lib/scripts/tree.js
@@ -29,33 +29,34 @@ jQuery.fn.dw_tree = function(overrides) {
          * @author Pierre Spring <pierre.spring@caillou.ch>
          */
         toggle: function (e) {
-            var $listitem, $sublist, timeout, $clicky, show_sublist, dw_tree;
+            var $listitem, $sublist, timeout, $clicky, show_sublist, dw_tree, opening;
 
             e.preventDefault();
 
+            dw_tree = e.data;
             $clicky = jQuery(this);
             $listitem = $clicky.closest('li');
             $sublist = $listitem.find('ul').first();
-            dw_tree = e.data;
+            opening = $listitem.hasClass('closed');
+            $listitem.toggleClass('open closed');
+            dw_tree.toggle_display($clicky, opening);
 
             // if already open, close by hiding the sublist
-            if ($listitem.hasClass('open')) {
-                $sublist.dw_hide(function () {
-                    dw_tree.close($clicky);
-                    $listitem.addClass('closed').removeClass('open');
-                });
+            if (!opening) {
+                $sublist.dw_hide();
                 return;
             }
 
             show_sublist = function (data) {
-                if (!$listitem.hasClass('open') || $sublist.parent().length === 0) {
-                    $listitem.append($sublist).addClass('open').removeClass('closed');
-                }
                 $sublist.hide();
-                if (data) {
+                if (typeof data !== 'undefined') {
                     $sublist.html(data);
                 }
-                $sublist.dw_show();
+                if ($listitem.hasClass('open')) {
+                    // Only show if user didn’t close the list since starting
+                    // to load the content
+                    $sublist.dw_show();
+                }
             };
 
             // just show if already loaded
@@ -66,6 +67,7 @@ jQuery.fn.dw_tree = function(overrides) {
 
             //prepare the new ul
             $sublist = jQuery('<ul class="idx"/>');
+            $listitem.append($sublist);
 
             timeout = window.setTimeout(
                 bind(show_sublist, '<li><img src="' + DOKU_BASE + 'lib/images/throbber.gif" alt="loading..." title="loading..." /></li>'), dw_tree.throbber_delay);
@@ -76,7 +78,7 @@ jQuery.fn.dw_tree = function(overrides) {
                               }, $clicky);
         },
 
-        close: function ($clicky) {
+        toggle_display: function ($clicky, opening) {
         },
 
         load_data: function (show_data, $clicky) {