Additional Chrome related fix in hotkeys support.

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

diff --git a/js/inserts.js b/js/inserts.js
index 9ac008f0e9c5ee351e80896d33f90f1f9fe70e85..3448c86949691da79ffa36722467b7e72b8caadc 100644 (file)
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -229,12 +229,30 @@ function fix_date(date, last)
        } else {
                day = dat[2]; month = dat[1]; year = dat[0];
        }
-       if (cur[2] == undefined || cur[2] == "") // day or day-month
+       if (cur[1] != undefined && cur[1] != "") // day or month entered, could be string 3
+       { 
+               if (user.datefmt == 0 || user.datefmt == 3 || ((user.datefmt == 2 || user.datefmt == 5) && (cur[2] == undefined || cur[2] == "")))
+                       day = cur[1];
+               else    
+                       month = cur[1];
+       }               
+       if (cur[0] != undefined && cur[0] != "") // day or month entered. could be string 3
        {
-               if (cur[0] != undefined && cur[0] != "" && cur[0].length < 3) // day entered
+               if (cur[1] == undefined || cur[1] == "")
                        day = cur[0];
-               if (cur[1] != undefined && cur[1] != "" && cur[1].length < 3) // month entered
-                       month = cur[1];
+               else if (user.datefmt == 0 || user.datefmt == 3 || ((user.datefmt == 2 || user.datefmt == 5) && (cur[2] == undefined || cur[2] == "")))
+                       month = cur[0];
+               else if (user.datefmt == 2 || user.datefmt == 5)
+                       year = cur[0];
+               else    
+                       day = cur[0];
+       }
+       if (cur[2] != undefined && cur[2] != "") // year,
+       {
+               if (user.datefmt == 2 || user.datefmt == 5)
+                       day = cur[2];
+               else
+                       year = cur[2];
        }               
        if (user.datefmt<3) {
                if (day<10) day = '0'+parseInt(day, 10);
@@ -436,7 +454,9 @@ var inserts = {
                                        ev.returnValue = false;
                                        return false;
                                }
-                               window.location = e.href;
+                               if (_hotkeys.alt)       // ommit Chrome accesskeys 
+                                       return false;
+                               window.location = e.href;
                        }
        },
        'ul.ajaxtabs':  function(ul) {
@@ -447,7 +467,8 @@ var inserts = {
 // ?  var modifiedurl=ulistlink.getAttribute("href").replace(/^http:\/\/[^\/]+\//i, "http://"+window.location.hostname+"/")
                    var url = tab.form.action
                    tab.onclick=function(){
-                       _expand(this);
+                   if (!_hotkeys.alt && !tab.disabled)
+                               _expand(this);
                        return false;
                    }
                }
@@ -520,7 +541,7 @@ function setHotKeys() {
                        for (var i=0; i<cnt; i++) { 
                                n = (n+1)%cnt;
                                // check also if the link is visible
-                               if (l[n].accessKey==key && l[n].scrollWidth) {
+                               if (l[n].accessKey==key && (l[n].offsetWidth || l[n].offsetHeight)) {
                                        _hotkeys.focus = n;
            // The timeout is needed to prevent unpredictable behaviour on IE.
                                        var tmp = function() {l[_hotkeys.focus].focus();};