Merge branch 'master' of github.com:dom-mel/dokuwiki

3 files changed, 41 insertions, 65 deletions

diff --git a/lib/scripts/jquery/jquery-ui-theme/smoothness.css b/lib/scripts/jquery/jquery-ui-theme/smoothness.css
index 0f1a7e770..910d24b95 100644
--- a/lib/scripts/jquery/jquery-ui-theme/smoothness.css
+++ b/lib/scripts/jquery/jquery-ui-theme/smoothness.css
@@ -56,9 +56,9 @@
 
 /* Component containers
 ----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget { font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-size: 1em; }
 .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
 .ui-widget-content a { color: #222222; }
 .ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
diff --git a/lib/scripts/jquery/update.sh b/lib/scripts/jquery/update.sh
index 38f38bece..fde46f4d7 100755
--- a/lib/scripts/jquery/update.sh
+++ b/lib/scripts/jquery/update.sh
@@ -23,3 +23,6 @@ for img in $images
 do
     wget -nv https://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/smoothness/$img -O jquery-ui-theme/$img
 done
+
+# remove font family declarations from smoothness CSS
+sed -i "s/font-family:[^;]*; \?//" jquery-ui-theme/smoothness.css
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index aa369657d..7f5514f56 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -427,6 +427,10 @@ var dw_mediamanager = {
             function (data) {
                 dw_mediamanager.$resizables().resizable('destroy');
 
+                if (update_list) {
+                    dw_mediamanager.list.call(jQuery('input[value="Apply"]')[0]);
+                }
+
                 $content.html(data);
 
                 dw_mediamanager.prepare_content($content);
@@ -442,9 +446,6 @@ var dw_mediamanager = {
                 dw_mediamanager.init_ajax_uploader();
                 dw_mediamanager.init_options();
 
-                if (update_list) {
-                    dw_mediamanager.list.call(jQuery('a.files')[0]);
-                }
             },
             'html'
         );
@@ -456,44 +457,6 @@ var dw_mediamanager = {
     },
 
     window_resize: function () {
-        if (jQuery('#mediamanager__page').width() == dw_mediamanager.layout_width) {
-            return;
-        }
-
-        dw_mediamanager.layout_width = jQuery('#mediamanager__page').width();
-        $r = jQuery("#mediamanager__page div.panel");
-
-        var w = 0, wSum = 0, mCount = 0, mArray = [];
-        $r.each(function() {
-            w = jQuery(this).width();
-            if (w == parseFloat(jQuery(this).css("min-width"))) {
-                wSum += w;
-            } else {
-                mArray[mCount] = jQuery(this);
-                mCount++;
-            }
-        });
-
-        if (mCount > 0) {
-            var width = (0.95 * jQuery('#mediamanager__page').width() - wSum - 30);
-            wSum = 0;
-            for(var i = 0; i < mArray.length; i++) {
-                wSum += mArray[i].width();
-            }
-            for(var i = 0; i < mArray.length; i++) {
-                w = mArray[i].width();
-                w = 100*w / wSum;
-                mArray[i].width(width*w/100);
-            }
-        }
-
-        $r.each(function() {
-            w = jQuery(this).width();
-            w = (100 * w / jQuery('#mediamanager__page').width());
-            w += "%";
-            jQuery(this).width(w);
-        });
-
         dw_mediamanager.resize();
 
         dw_mediamanager.opacity_slider();
@@ -512,32 +475,37 @@ var dw_mediamanager = {
     update_resizable: function () {
         $resizables = dw_mediamanager.$resizables();
 
-        $resizables.resizable({ handles: 'e' ,
+        $resizables.resizable({
+            handles: 'e',
             resize: function(event, ui){
-                var w = 0;
+                var widthFull = jQuery('#mediamanager__page').width();
+                var widthResizables = 0;
                 $resizables.each(function() {
-                    w += jQuery(this).width();
+                    widthResizables += jQuery(this).width();
                 });
-                wSum = w + parseFloat(jQuery('#mediamanager__page div.file').css("min-width"));
+                var $filePanel = jQuery('#mediamanager__page div.panel.file');
 
-                // max width of resizable column
-                var maxWidth = 0.95 * jQuery('#mediamanager__page').width() - wSum + jQuery(this).width() - 30;
+                // set max width of resizable column
+                var widthOtherResizable = widthResizables - jQuery(this).width();
+                var minWidthNonResizable = parseFloat($filePanel.css("min-width"));
+                var maxWidth = widthFull - (widthOtherResizable + minWidthNonResizable);
                 $resizables.resizable( "option", "maxWidth", maxWidth );
 
-                // percentage width of the first two columns
-                var wLeft = ( 100*(w+30) / jQuery('#mediamanager__page').width() );
-
-                // width of the third column
-                var wRight = 95-wLeft;
-                wRight += "%";
-                jQuery('#mediamanager__page div.file').width(wRight);
-
-                $resizables.each(function() {
-                    w = jQuery(this).width();
-                    w = (100 * w / jQuery('#mediamanager__page').width());
-                    w += "%";
-                    jQuery(this).width(w);
-                });
+                // width of file panel in % = 100% - width of resizables in % 
+                // this calculates with 99.99 and not 100 to overcome rounding errors
+                var relWidthNonResizable = 99.99 - (100 * widthResizables / widthFull);
+                // set width of file panel
+                $filePanel.width(relWidthNonResizable+'%');
+
+                // FIXME: please fix without browser sniffing
+                if (!jQuery.browser.webkit) {
+                    $resizables.each(function() {
+                        w = jQuery(this).width();
+                        w = (99.99 * w / widthFull);
+                        w += "%";
+                        jQuery(this).width(w);
+                    });
+                }
 
                 dw_mediamanager.opacity_slider();
                 dw_mediamanager.portions_slider();
@@ -549,7 +517,7 @@ var dw_mediamanager = {
 
     resize: function () {
         var $contents = jQuery('#mediamanager__page div.panelContent'),
-            height = jQuery(window).height() - jQuery(document).height() +
+            height = jQuery(window).height() - jQuery(document.body).height() +
                       Math.max.apply(null, jQuery.map($contents, function (v) {
             return jQuery(v).height();
         }));
@@ -682,12 +650,17 @@ var dw_mediamanager = {
         });
     },
 
+    /**
+     * Parse a URI query string to an associative array
+     *
+     * @author Kate Arzamastseva <pshns@ukr.net>
+     */
     params_toarray: function (str) {
         var vars = [], hash;
         var hashes = str.split('&');
         for(var i = 0; i < hashes.length; i++) {
             hash = hashes[i].split('=');
-            vars[hash[0]] = hash[1];
+            vars[decodeURIComponent(hash[0])] = decodeURIComponent(hash[1]);
         }
         return vars;
     },