1 files changed, 38 insertions, 17 deletions

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index a7574b804..245519cbc 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -11,7 +11,7 @@
  * @author Pierre Spring <pierre.spring@caillou.ch>
  */
 (function ($) {
-    var toggle, list, prepare_content, insert, confirmattach, attachoptions, initpopup, updatehide, setalign, setsize, inSet, outSet, media_manager, hasFlash, form_params, list_view, details;
+    var toggle, list, prepare_content, insert, confirmattach, attachoptions, initpopup, updatehide, setalign, setsize, inSet, outSet, media_manager, hasFlash, form_params, list_view, details, update_content;
 
     var media_manager = {
         keepopen: false,
@@ -331,6 +331,7 @@
         if (document.getElementById('media__content')) {
             //popup
             content = $('#media__content');
+            content.html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
 
         } else {
             //fullscreen media manager
@@ -340,6 +341,8 @@
                 //changing namespace
                 $('#mediamanager__layout_detail').empty();
             }
+
+            $('.scroll-container', content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
         }
 
         params = '';
@@ -350,19 +353,8 @@
             params = form_params(link)+'&call=medialist';
         }
 
-        $('.scroll-container', content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
-
         // fetch the subtree
-        $.post(
-            DOKU_BASE + 'lib/exe/ajax.php',
-            params,
-            function (data) {
-                content.html(data);
-                prepare_content(content);
-                updatehide();
-            },
-            'html'
-        );
+        update_content(content, params);
 
     };
 
@@ -406,7 +398,7 @@
      * @author Kate Arzamastseva <pshns@ukr.net>
      */
     details = function (event) {
-        var link, content;
+        var link, content, params, update_list;
         link = $(this);
 
         event.preventDefault();
@@ -416,9 +408,32 @@
         content = $('#mediamanager__layout_detail');
         $('.scroll-container', content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
 
+        params = '';
+
+        if (link[0].search) {
+            params = link[0].search.substr(1)+'&call=mediadetails';
+        } else {
+            params = form_params(link)+'&call=mediadetails';
+        }
+
+        update_content(content, params);
+
+        update_list = (link[0].id == 'mediamanager__btn_delete' || link[0].id == 'mediamanager__btn_restore');
+        if (update_list) {
+            var link1, content1, params1;
+            link1 = $('a.files');
+            params1 = link1[0].search.substr(1)+'&call=medialist';
+            content1 = $('#mediamanager__layout_list');
+            $('.scroll-container', content1).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
+
+            update_content(content1, params1);
+        }
+    };
+
+    update_content = function (content, params) {
         $.post(
             DOKU_BASE + 'lib/exe/ajax.php',
-            link[0].search.substr(1)+'&call=mediadetails',
+            params,
             function (data) {
                 content.html(data);
             },
@@ -832,9 +847,15 @@
 
         $('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', list)
             .delegate('#mediamanager__tabs_list a', 'click', list_view)
-            .delegate('#mediamanager__file_list a', 'click', details);
+            .delegate('#mediamanager__file_list a', 'click', details)
+            .delegate('#dw__mediasearch', 'submit', list);
 
         $('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', details)
-            .delegate('#mediamanager__btn_update', 'submit', list);
+            .delegate('#mediamanager__btn_update', 'submit', list)
+            .delegate('#page__revisions', 'submit', details)
+            .delegate('#page__revisions a', 'click', details)
+            .delegate('#mediamanager__save_meta', 'submit', details)
+            .delegate('#mediamanager__btn_delete', 'submit', details)
+            .delegate('#mediamanager__btn_restore', 'submit', details);
     });
 }(jQuery));