From ca19d8eda91766ccb74c075e1baebdec19c0be95 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Mon, 19 Sep 2011 21:02:33 +0200
Subject: Fix resizing and file panel AJAX-based tabs

---
 lib/scripts/media.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 54309640c..5e254fe84 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -84,7 +84,7 @@ var dw_mediamanager = {
             .delegate('.qq-upload-file a', 'click', dw_mediamanager.details);
 
         // changing opened tab in the file details panel
-        jQuery('#mediamanager__page div.file').delegate('#mediamanager__tabs_details a', 'click', dw_mediamanager.details)
+        jQuery('#mediamanager__page div.file').delegate('ul.tabs a', 'click', dw_mediamanager.details)
             // "update new version" button
             .delegate('#mediamanager__btn_update', 'submit', dw_mediamanager.list)
             // revisions form
@@ -410,9 +410,7 @@ var dw_mediamanager = {
             DOKU_BASE + 'lib/exe/ajax.php',
             params,
             function (data) {
-                jQuery('.ui-resizable').each(function(){
-                    jQuery(this).resizable('destroy');
-                });
+                dw_mediamanager.$resizables().resizable('destroy');
 
                 $content.html(data);
 
@@ -483,32 +481,36 @@ var dw_mediamanager = {
         if (layout_height < height) {
             layout_height = height;
             jQuery('#mediamanager__page div.panelContent').height(height);
-            $resizable.height(height+100);
+            dw_mediamanager.$resizables().height(height+100);
         }
 
         dw_mediamanager.opacity_slider();
         dw_mediamanager.portions_slider();
     },
 
+    $resizables: function () {
+        return jQuery('#mediamanager__page').find('div.namespaces, div.filelist');
+    },
+
     /**
      * Updates mediamanager layout
      *
      * @author Kate Arzamastseva <pshns@ukr.net>
      */
     update_resizable: function () {
-        $resizable = jQuery("#mediamanager__page .layout-resizable");
+        $resizables = dw_mediamanager.$resizables();
 
-        $resizable.resizable({ handles: 'e' ,
+        $resizables.resizable({ handles: 'e' ,
             resize: function(event, ui){
                 var w = 0;
-                $resizable.each(function() {
+                $resizables.each(function() {
                     w += jQuery(this).width();
                 });
                 wSum = w + parseFloat(jQuery('#mediamanager__page div.file').css("min-width"));
 
                 // max width of resizable column
                 var maxWidth = 0.95 * jQuery('#mediamanager__page').width() - wSum + jQuery(this).width() - 30;
-                $resizable.resizable( "option", "maxWidth", maxWidth );
+                $resizables.resizable( "option", "maxWidth", maxWidth );
 
                 // percentage width of the first two columns
                 var wLeft = ( 100*(w+30) / jQuery('#mediamanager__page').width() );
@@ -518,7 +520,7 @@ var dw_mediamanager = {
                 wRight += "%";
                 jQuery('#mediamanager__page div.file').width(wRight);
 
-                $resizable.each(function() {
+                $resizables.each(function() {
                     w = jQuery(this).width();
                     w = (100 * w / jQuery('#mediamanager__page').width());
                     w += "%";
@@ -534,7 +536,7 @@ var dw_mediamanager = {
         var height = windowHeight - 300;
         layout_height = height;
         jQuery('#mediamanager__page .panelContent').height(height);
-        $resizable.height(height+100);
+        $resizables.height(height+100);
     },
 
      /**
-- 
cgit v1.2.3