Edit buttons center alignment.

[fa-stable.git] / js / utils.js

diff --git a/js/utils.js b/js/utils.js
index 97200cfbf25bd77d156f71717de539b811897771..1c66384bb03d663fd18c3ab037fac41c2efd6bc9 100644 (file)
--- a/js/utils.js
+++ b/js/utils.js
@@ -118,9 +118,7 @@
                var q = {};
 
                if (typeof(inp) == "string")
-                       submitObj = document.getElementsByName(inp)[0];
-               else
-                       submitObj = inp;
+                       submitObj = document.getElementsByName(inp)[0]||inp;
                
                objForm = objForm || (submitObj && submitObj.form);
 
@@ -214,18 +212,21 @@ function goBack() {
 
 function setFocus(name, byId) {
 
-  if(!name) { // page load/ajax update
-       if (_focus)     
-               name = _focus;  // last focus set in onfocus handlers
-       else 
-        if (document.forms.length) {   // no current focus (first page display) -  set it from from last form
-         var cur = document.getElementsByName('_focus')[document.forms.length-1];
-         if(cur) name = cur.value;
-       }
+ if(typeof(name)=='object')
+       el = name;
+ else {
+       if(!name) { // page load/ajax update
+               if (_focus)     
+                       name = _focus;  // last focus set in onfocus handlers
+               else 
+                       if (document.forms.length) {    // no current focus (first page display) -  set it from from last form
+                         var cur = document.getElementsByName('_focus')[document.forms.length-1];
+                         if(cur) name = cur.value;
+                       }
+         }
+         if(byId || !(el = document.getElementsByName(name)[0]))
+               el = document.getElementById(name);
   }
-  if(byId || !(el = document.getElementsByName(name)[0]))
-       el = document.getElementById(name);
-
   if(el && el.focus) {
     // The timeout is needed to prevent unpredictable behaviour on IE & Gecko.
     // Using tmp var prevents crash on IE5
@@ -236,28 +237,28 @@ function setFocus(name, byId) {
 }
 /*
        Find closest element in neighbourhood and set focus.
-       dir is direction as arrow code.
+       dir is arrow keycode.
 */
-function move_focus(dir, e, neighbours)
+function move_focus(dir, e0, neighbours)
 {
-       var p0 = element_pos(e);
+       var p0 = element_pos(e0);
        var t;
        var l=0;
        for(var i=0; i<neighbours.length; i++) {
-               var p = element_pos(neighbours[i]);
-               if (neighbours[i].className!='menu_option') continue;
-               if (((dir==40) && (p.y>p0.y)) || (dir==38 && (p.y<p0.y)) 
-                       || ((dir==37) && (p.x<p0.x)) || ((dir==39 && (p.x>p0.x)))) {
-                               var l1 = (p.y-p0.y)*(p.y-p0.y)+(p.x-p0.x)*(p.x-p0.x);
-                               if ((l1<l) || (l==0)) {
-                                       l = l1; t = neighbours[i];
-                               }
+               var e = neighbours[i];
+               var p = element_pos(e);
+               if (p!=null && (e.className=='menu_option' || e.className=='printlink')) {
+                       if (((dir==40) && (p.y>p0.y)) || (dir==38 && (p.y<p0.y)) 
+                               || ((dir==37) && (p.x<p0.x)) || ((dir==39 && (p.x>p0.x)))) {
+                                       var l1 = (p.y-p0.y)*(p.y-p0.y)+(p.x-p0.x)*(p.x-p0.x);
+                                       if ((l1<l) || (l==0)) {
+                                               l = l1; t = e;
+                                       }
+                       }
                }
        }
-       if (t) {
-       var tmp = function() {t.focus(); if (t.select) t.select();};
-               setTimeout(tmp, 0);
-       }
+       if (t)
+               setFocus(t);
        return t;
 }
 
@@ -266,16 +267,16 @@ var __isFireFox = navigator.userAgent.match(/gecko/i);
 function element_pos(e) {
        var res = new Object();
                res.x = 0; res.y = 0;
-       if (element !== null) {
+       if (e !== null) {
                res.x = e.offsetLeft;
                res.y = e.offsetTop;
                var offsetParent = e.offsetParent;
                var parentNode = e.parentNode;
 
-               while (offsetParent !== null) {
+               while (offsetParent !== null && offsetParent.style.display != 'none') {
                        res.x += offsetParent.offsetLeft;
                        res.y += offsetParent.offsetTop;
-
+                       // the second case is for IE6/7 in some doctypes
                        if (offsetParent != document.body && offsetParent != document.documentElement) {
                                res.x -= offsetParent.scrollLeft;
                                res.y -= offsetParent.scrollTop;
@@ -293,5 +294,7 @@ function element_pos(e) {
                        offsetParent = offsetParent.offsetParent;
                }
        }
+       // parentNode has style.display set to none
+       if (parentNode != document.documentElement) return null;
        return res;
 }
\ No newline at end of file