details: /erp/devel/pi/rev/0f8274676fcf
changeset: 12425:0f8274676fcf
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed May 25 12:06:44 2011 +0200
summary: Fixes issue 16947: OPTIMIZE-15: Splitter bar does not work in all
states, Fixes issue 17345: Third level tabs are not shown when selected
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-tab.js
| 13 ++++++---
src/index.jsp
| 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diffs (52 lines):
diff -r 422fee967c21 -r 0f8274676fcf
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
Tue May 24 19:13:00 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-tab.js
Wed May 25 12:06:44 2011 +0200
@@ -303,8 +303,7 @@
mouseOver: function() {
if (this.tabSet.state === isc.OBStandardView.STATE_IN_MID) {
this.setCursor(isc.Canvas.ROW_RESIZE);
- }
- if (this.tabSet.state === isc.OBStandardView.STATE_TOP_MAX) {
+ } else {
this.setCursor(isc.Canvas.HAND);
}
},
@@ -365,7 +364,7 @@
}
} else if (this.state === isc.OBStandardView.STATE_BOTTOM_MAX) {
this.setState(isc.OBStandardView.STATE_MID);
- } else if (this.state === isc.OBStandardView.STATE_TOP_MAX) {
+ } else if (this.state === isc.OBStandardView.STATE_TOP_MAX || this.state
=== isc.OBStandardView.STATE_MID) {
this.doHandleDoubleClick();
}
},
@@ -515,10 +514,16 @@
},
tabSelected: function(tabNum, tabPane, ID, tab){
+ var event = isc.EventHandler.getLastEvent();
if (tabPane.refreshContents) {
tabPane.doRefreshContents(true, true);
}
- this.ignoreItemClick = true;
+ // if the event is a mouse event then let the item click not do max/min
+ // tabselected events are also fired when drawing
+ if (this.isDrawn() && event &&
isc.EventHandler.isMouseEvent(event.eventType) && tabPane.parentView &&
+ tabPane.parentView.state !== isc.OBStandardView.STATE_TOP_MAX &&
tabPane.parentView.state !== isc.OBStandardView.STATE_MID) {
+ this.ignoreItemClick = true;
+ }
},
initWidget: function(){
diff -r 422fee967c21 -r 0f8274676fcf src/index.jsp
--- a/src/index.jsp Tue May 24 19:13:00 2011 +0200
+++ b/src/index.jsp Wed May 25 12:06:44 2011 +0200
@@ -69,7 +69,7 @@
<html>
<head>
-<meta http-equiv="X-UA-Compatible" content="IE=7">
+<meta http-equiv="X-UA-Compatible" content="IE=8">
<meta http-equiv="Expires" content="Tue, 24 Apr 1979 00:00:01 GMT"/>
<meta http-equiv="Content-type" content="text/html;charset=utf-8"/>
<meta http-equiv="Pragma" content="no-cache" >
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
