[KS] Fixed shortcuts in case of classic window tab
authorDavid Baz Fayos <david.baz@openbravo.com>
Thu, 02 Jun 2011 00:17:58 +0200
changeset 12665 8305abf39221
parent 12664 ab3efc55cda3
child 12666 1fe85d718959
[KS] Fixed shortcuts in case of classic window tab
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
src/org/openbravo/erpCommon/security/Login.html
src/org/openbravo/erpCommon/security/Login_F1.html
web/js/utils.js
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml	Wed Jun 01 23:28:18 2011 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml	Thu Jun 02 00:17:58 2011 +0200
@@ -39,7 +39,7 @@
   {"id": "ToolBar_Link", "keyComb": {"ctrl": true, "shift": true, "key": "U"}},
   {"id": "StatusBar_Previous", "keyComb": {"alt": true, "shift": true, "key": "Page_Up"}},
   {"id": "StatusBar_Next", "keyComb": {"alt": true, "shift": true, "key": "Page_Down"}},
-  {"id": "StatusBar_Maximize-Restore", "keyComb": {"ctrl": true, "alt": true, "key": "Enter"}},
+  {"id": "StatusBar_Maximize-Restore", "keyComb": {"alt": true, "shift": true, "key": "Enter"}},
   {"id": "StatusBar_Close", "keyComb": {"key": "Escape"}},
   {"id": "Grid_EditInForm", "keyComb": {"ctrl": true, "alt": false, "key": "f2"}},
   {"id": "Grid_EditInGrid", "keyComb": {"ctrl": false, "alt": false, "key": "f2"}}
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Wed Jun 01 23:28:18 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Thu Jun 02 00:17:58 2011 +0200
@@ -239,13 +239,22 @@
           auxKey = '';
 
           if (LKS.list[i].keyComb.ctrl === true) {
-            auxKey = auxKey + 'ctrlKey';
+            if (auxKey.length > 0) {
+              auxKey += '+';
+            }
+            auxKey += 'ctrlKey';
           }
           if (LKS.list[i].keyComb.alt === true) {
-            auxKey = auxKey + '+altKey';
+            if (auxKey.length > 0) {
+              auxKey += '+';
+            }
+            auxKey += 'altKey';
           }
           if (LKS.list[i].keyComb.shift === true) {
-            auxKey = auxKey + '+shiftKey';
+            if (auxKey.length > 0) {
+              auxKey += '+';
+            }
+            auxKey += 'shiftKey';
           }
           if (LKS.list[i].keyComb.key !== null) {
             key = LKS.list[i].keyComb.key;
--- a/src/org/openbravo/erpCommon/security/Login.html	Wed Jun 01 23:28:18 2011 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.html	Thu Jun 02 00:17:58 2011 +0200
@@ -373,7 +373,7 @@
     }
     catch (e) { }
 
-    if ((!revisionControl('11622')) || (isOpsInstance() != isOpsInstanceCached())) {
+    if ((!revisionControl('11665')) || (isOpsInstance() != isOpsInstanceCached())) {
       maskLoginWindow(cacheMsg);
       setLoginMessage('Warning', '', cacheMsg);
     }
--- a/src/org/openbravo/erpCommon/security/Login_F1.html	Wed Jun 01 23:28:18 2011 +0200
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html	Thu Jun 02 00:17:58 2011 +0200
@@ -126,7 +126,7 @@
       clearForm();
     } catch (e) {}
     setWindowElementFocus('firstElement');
-    if ((!revisionControl('11622')) || (isOpsInstance() != isOpsInstanceCached())) {
+    if ((!revisionControl('11665')) || (isOpsInstance() != isOpsInstanceCached())) {
       alert(cacheMsg);
     }
 
--- a/web/js/utils.js	Wed Jun 01 23:28:18 2011 +0200
+++ b/web/js/utils.js	Thu Jun 02 00:17:58 2011 +0200
@@ -95,7 +95,7 @@
 * Return a number that would be checked at the Login screen to know if the file is cached with the correct version
 */
 function getCurrentRevision() {
-  var number = '11622';
+  var number = '11665';
   return number;
 }
 
@@ -1499,7 +1499,9 @@
                 (keyArray[i].auxKey == "altKey" && !pushedKey.ctrlKey && pushedKey.altKey && !pushedKey.shiftKey) ||
                 (keyArray[i].auxKey == "shiftKey" && !pushedKey.ctrlKey && !pushedKey.altKey && pushedKey.shiftKey) ||
                 (keyArray[i].auxKey == "ctrlKey+shiftKey" && pushedKey.ctrlKey && !pushedKey.altKey && pushedKey.shiftKey) ||
-                (keyArray[i].auxKey == "ctrlKey+altKey" && pushedKey.ctrlKey && pushedKey.altKey && !pushedKey.shiftKey)) {
+                (keyArray[i].auxKey == "ctrlKey+altKey" && pushedKey.ctrlKey && pushedKey.altKey && !pushedKey.shiftKey) ||
+                (keyArray[i].auxKey == "altKey+shiftKey" && !pushedKey.ctrlKey && pushedKey.altKey && pushedKey.shiftKey) ||
+                (keyArray[i].auxKey == "ctrlKey+altKey+shiftKey" && pushedKey.ctrlKey && pushedKey.altKey && pushedKey.shiftKey)) {
               try {
                 if (!isWindowInMDIContext || typeof keyArray[i].evalfunc !== "object") {
                   eval(evalfuncTrl);
@@ -1573,7 +1575,9 @@
                 (keyArray[i].auxKey == "altKey" && !pushedKey.ctrlKey && pushedKey.altKey && !pushedKey.shiftKey) ||
                 (keyArray[i].auxKey == "shiftKey" && !pushedKey.ctrlKey && !pushedKey.altKey && pushedKey.shiftKey) ||
                 (keyArray[i].auxKey == "ctrlKey+shiftKey" && pushedKey.ctrlKey && !pushedKey.altKey && pushedKey.shiftKey) ||
-                (keyArray[i].auxKey == "ctrlKey+altKey" && pushedKey.ctrlKey && pushedKey.altKey && !pushedKey.shiftKey)) {
+                (keyArray[i].auxKey == "ctrlKey+altKey" && pushedKey.ctrlKey && pushedKey.altKey && !pushedKey.shiftKey) ||
+                (keyArray[i].auxKey == "altKey+shiftKey" && !pushedKey.ctrlKey && pushedKey.altKey && pushedKey.shiftKey) ||
+                (keyArray[i].auxKey == "ctrlKey+altKey+shiftKey" && pushedKey.ctrlKey && pushedKey.altKey && pushedKey.shiftKey)) {
               try {
                 if (!isWindowInMDIContext || typeof keyArray[i].evalfunc !== "object") {
                   eval(evalfuncTrl);