issue #56 ajax deleting images

2 files changed, 16 insertions, 15 deletions

diff --git a/inc/template.php b/inc/template.php
index 04e3e79cc..d5320c5dd 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1172,10 +1172,10 @@ function tpl_fileList(){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_fileDetails($image, $rev){
-    global $AUTH, $NS, $conf;
+    global $AUTH, $NS, $conf, $DEL;
 
     $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
-    if (!$image || (!file_exists(mediaFN($image)) && !$removed)) return '';
+    if (!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return '';
     if ($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
     if (isset($NS) && getNS($image) != $NS) return '';
     $do = $_REQUEST['mediado'];
@@ -1209,7 +1209,7 @@ function tpl_fileDetails($image, $rev){
 
     } elseif ($opened_tab == 'history' && $conf['mediarevisions']) {
         echo '<div id="mediamanager__details">';
-        media_tab_history($image,$NS,$AUTH);
+        media_tab_history($image,$NS,$AUTH,$removed);
         echo '</div>';
     }
 }
@@ -1465,6 +1465,7 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
+    echo '<div id="test"></div>';
     echo '<div id="mediamanager__page">';
     echo '<div id="mediamanager__layout">';
 
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index d5fdf1fdb..36dadf232 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -396,21 +396,11 @@ var dw_mediamanager = {
             params = dw_mediamanager.form_params($link.parents('form'))+'&call=mediadetails';
         }
 
-        dw_mediamanager.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 = jQuery('a.files');
-            params1 = $link1[0].search.substr(1)+'&call=medialist';
-            $content1 = jQuery('#mediamanager__layout_list');
-            jQuery('.scroll-container', $content1).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
-
-            dw_mediamanager.update_content($content1, params1);
-        }
+        dw_mediamanager.update_content($content, params, update_list);
     },
 
-    update_content: function ($content, params) {
+    update_content: function ($content, params, update_list) {
         jQuery.post(
             DOKU_BASE + 'lib/exe/ajax.php',
             params,
@@ -430,6 +420,16 @@ var dw_mediamanager = {
                 dw_mediamanager.set_filelist_view(dw_mediamanager.view, false);
                 dw_mediamanager.image_diff();
                 dw_mediamanager.init_ajax_uploader();
+
+                if (update_list) {
+                    var $link1, $content1, params1;
+                    $link1 = jQuery('a.files');
+                    params1 = $link1[0].search.substr(1)+'&call=medialist';
+                    $content1 = jQuery('#mediamanager__layout_list');
+                    jQuery('.scroll-container', $content1).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
+
+                    dw_mediamanager.update_content($content1, params1);
+                }
             },
             'html'
         );