Bug 21139: No table in toolbar

[koha_ffzg] / koha-tmpl / intranet-tmpl / lib / jquery / plugins / jquery.fixFloat.js

diff --git a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.fixFloat.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.fixFloat.js
index fb9ffcf..c0df4ea 100644 (file)
--- a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.fixFloat.js
+++ b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.fixFloat.js
@@ -3,15 +3,22 @@
 */
 (function ($, window) {
     "use strict";
-    $.fn.fixFloat = function (options={}) {
+    $.fn.fixFloat = function (options) {
+        var options = options || {};
         var tbh = $(this);
         var defaults = {
             enabled: true,
-            originalOffset: tbh.position().top
+            originalOffset: tbh.offset().top,
+            originalPosition: tbh.position().top,
         };
         var originalOffset = typeof options.originalOffset === 'undefined'
             ? defaults.originalOffset
             : options.originalOffset;
+
+        var originalPosition = typeof options.originalPosition === 'undefined'
+            ? defaults.originalPosition
+            : options.originalPosition;
+
         options = $.extend(defaults, options);
 
         if (tbh.css('position') !== 'absolute') {
@@ -20,45 +27,47 @@
                 "display": tbh.css("display"),
                     "visibility": "hidden"
             });
-            tbhBis.width(tbh.outerWidth(true));
-            tbhBis.height(tbh.outerHeight(true));
+            tbhBis.width(tbh.innerWidth(true));
+            tbhBis.height(tbh.innerHeight(true));
+            tbhBis.attr('id', tbh.attr('id')+'Bis'); // Avoid 2 elts with the same id
             tbh.after(tbhBis);
             tbh.width(tbh.width());
-            var tbl = tbh.find("th,td");
-            if (tbl.length > 0) {
-                tbl.each(function () {
-                    var $elt = $(this);
-                    $elt.width($elt.outerWidth(true));
-                });
-            }
             tbh.css({
                 'position': 'absolute',
-                    'top': originalOffset
+                    'top': originalPosition,
             });
         }
-        tbh.css({
-            'z-index': 1000
-        });
 
         if (options.enabled) {
             $(window).scroll(function () {
                 var offsetTop = tbh.offset().top;
+
                 var s = parseInt($(window).scrollTop(), 10);
+
                 var fixMe = (s > offsetTop);
                 var repositionMe = (s < originalOffset);
                 if (fixMe) {
                     tbh.css({
                         'position': 'fixed',
-                            'top': '0'
+                            'top': '0',
+                        'z-index': '1000'
                     });
+                    tbh.addClass("floating");
                 }
                 if (repositionMe) {
                     tbh.css({
                         'position': 'absolute',
-                            'top': originalOffset
+                            'top': originalPosition,
+                        'z-index': '1'
                     });
+                    tbh.removeClass("floating");
                 }
             });
+
+            $(window).resize(function() {
+                var p = $(tbh).parents('div').first();
+                $(tbh).width(p.width()-10);
+            });
         }
     };
 })(jQuery, window);