Mercurial > hg > digilib-old

changeset 711:eab17859be79 jquery

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved button positioning
author robcast
date Sun, 30 Jan 2011 16:37:05 +0100
parents d533bdf0e64e
children 823f0050f7eb c1fa722c570e
files client/digitallibrary/jquery/jquery.digilib.js
diffstat 1 files changed, 9 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/client/digitallibrary/jquery/jquery.digilib.js	Sat Jan 29 23:50:06 2011 +0100
+++ b/client/digitallibrary/jquery/jquery.digilib.js	Sun Jan 30 16:37:05 2011 +0100
@@ -731,7 +731,7 @@
         if (opts.buttons != null) {
             settings.visibleButtonSets = opts.buttons;
             };
-    }
+    };
 
     // clear digilib data for reset
     var resetData = function (data) {
@@ -951,6 +951,7 @@
 
     // display more (or less) button sets
     var showButtons = function (data, more, setIdx, animated) {
+        var atime = animated ? 'fast': 0;
         if (more) {
             // add set
             var $otherSets = data.$elem.find('div.buttons:visible');
@@ -964,16 +965,12 @@
             if ($set == null) return false;
             var btnWidth = $set.width();
             // move remaining sets left and show new set
-            if (animated) {
-                $otherSets.animate({left : '-='+btnWidth+'px'}, 'fast',
-                        function () {$set.show();});
+            if ($otherSets.length > 0) {
+                    $otherSets.animate({right : '+='+btnWidth+'px'}, atime,
+                            function () {$set.show();});
             } else {
-                var oldpos = $otherSets.position();
-                if (oldpos) {
-                    $otherSets.css({left : oldpos.left-btnWidth+'px'});
-                    };
                 $set.show();
-                };
+            }
         } else {
             // remove set
             var $set = data.$buttonSets[setIdx];
@@ -983,12 +980,8 @@
             $set.hide();
             // take remaining sets and move right
             var $otherSets = data.$elem.find('div.buttons:visible');
-            if (animated) {
-                $otherSets.animate({left : '+='+btnWidth+'px'}, 'fast');
-            } else {
-                $otherSets.css({left : '+='+btnWidth+'px'});
-                };
-            };
+            $otherSets.animate({right : '-='+btnWidth+'px'}, atime);
+        }
         return true;
     };
 
@@ -1319,7 +1312,7 @@
             $(document).unbind("mousemove.digilib", dragMove);
             $(document).unbind("mouseup.digilib", dragEnd);
             // calculate relative offset
-            if (dx == 0 && dy == 0) return false // no movement
+            if (dx == 0 && dy == 0) return false; // no movement
             // reload with scaler image showing the new ausschnitt
             // digilib.moveBy(x, y);
             var pos = geom.position(-dx, -dy);