details: /erp/devel/pi/rev/845b0a3581ec
changeset: 12302:845b0a3581ec
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon May 23 01:56:50 2011 +0200
summary: [KS] Avoided Firefox default action propagation
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-keyboard-manager.js
| 8 ++++++--
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quickrun-widget.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-tab.js
| 3 +++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 6 ++++--
8 files changed, 18 insertions(+), 4 deletions(-)
diffs (132 lines):
diff -r f5fee3e94663 -r 845b0a3581ec
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl
Mon May 23 01:53:08 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl
Mon May 23 01:56:50 2011 +0200
@@ -28,6 +28,7 @@
var me = this;
var ksAction = function() {
OB.Utilities.logout();
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set(this.keyboardShortcutId, ksAction);
this.Super("draw", arguments);
diff -r f5fee3e94663 -r 845b0a3581ec
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
Mon May 23 01:53:08 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
Mon May 23 01:56:50 2011 +0200
@@ -167,6 +167,7 @@
OB.MainView.TabSet.getSelectedTab().pane.focusTab();
}
}
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set(this.keyboardShortcutId, ksAction);
this.Super('draw', arguments);
diff -r f5fee3e94663 -r 845b0a3581ec
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-keyboard-manager.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-keyboard-manager.js
Mon May 23 01:53:08 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-keyboard-manager.js
Mon May 23 01:56:50 2011 +0200
@@ -67,7 +67,9 @@
pushedKS.key = isc.Event.getKey();
var position = keyboardMgr.KS.getPosition(pushedKS, 'keyComb');
if (position !== null) {
- keyboardMgr.KS.execute(position);
+ return keyboardMgr.KS.execute(position);
+ } else {
+ return true;
}
}
},
@@ -159,7 +161,9 @@
execute: function(position){
if (this.list[position].action !== null) {
- this.list[position].action(this.list[position].funcParam);
+ return this.list[position].action(this.list[position].funcParam);
+ } else {
+ return true;
}
},
diff -r f5fee3e94663 -r 845b0a3581ec
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quickrun-widget.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quickrun-widget.js
Mon May 23 01:53:08 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quickrun-widget.js
Mon May 23 01:56:50 2011 +0200
@@ -89,6 +89,7 @@
OB.MainView.TabSet.getSelectedTab().pane.focusTab();
}
}
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set(this.keyboardShortcutId, ksAction);
this.Super('draw', arguments);
diff -r f5fee3e94663 -r 845b0a3581ec
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Mon May 23 01:53:08 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Mon May 23 01:56:50 2011 +0200
@@ -341,6 +341,7 @@
var moveFocusAction = function(){
// standardWindow
// console.log('-->' + standardWindow.tabTitle);
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set('StandardWindow_MoveFocus', moveFocusAction);
},
diff -r f5fee3e94663 -r 845b0a3581ec
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-tab.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-tab.js
Mon May 23 01:53:08 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-tab.js
Mon May 23 01:56:50 2011 +0200
@@ -114,6 +114,7 @@
tabArray.push(i);
}
me.removeTabs(tabArray);
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set('TabSet_closeAllTabs', ksAction_closeAllTabs);
var ksAction_ActivateRightTab = function() {
@@ -121,6 +122,7 @@
if(typeof me.getSelectedTab().pane.focusTab === 'function') {
me.getSelectedTab().pane.focusTab();
}
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set('TabSet_ActivateRightTab',
ksAction_ActivateRightTab);
var ksAction_ActivateLeftTab = function() {
@@ -128,6 +130,7 @@
if(typeof me.getSelectedTab().pane.focusTab === 'function') {
me.getSelectedTab().pane.focusTab();
}
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set('TabSet_ActivateLeftTab',
ksAction_ActivateLeftTab);
this.Super('draw', arguments);
diff -r f5fee3e94663 -r 845b0a3581ec
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon May 23 01:53:08 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon May 23 01:56:50 2011 +0200
@@ -1239,6 +1239,7 @@
if (!me.disabled) {
me.action();
}
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set(this.keyboardShortcutId, ksAction);
}
diff -r f5fee3e94663 -r 845b0a3581ec
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Mon May 23 01:53:08 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Mon May 23 01:56:50 2011 +0200
@@ -423,17 +423,19 @@
enableKeyBoardShortCuts: function() {
var grid = this;
var editInGridAction = function(){
- if (grid.getSelectedRecords().length === 1) {
+ if (grid.getSelectedRecords().length === 1) {
grid.endEditing();
grid.startEditing(grid.getRecordIndex(grid.getSelectedRecords()[0]));
}
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set('Grid_EditInGrid', editInGridAction);
var editInFormAction = function(){
- if (grid.getSelectedRecords().length === 1) {
+ if (grid.getSelectedRecords().length === 1) {
grid.endEditing();
grid.view.editRecord(grid.getSelectedRecords()[0]);
}
+ return false; //To avoid keyboard shortcut propagation
};
OB.KeyboardManager.KS.set('Grid_EditInForm', editInFormAction);
},
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
