midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-369 Master Detail layout improvements. More correct patch for jquery issue under firefox. Now works fine under firefox and chrome.

This commit is contained in:
Heng Sin Low 2012-10-10 17:43:03 +08:00
parent 273887a8f6
commit 748a09c3be
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.adempiere.ui.zk/WEB-INF/zk.xml
View File

@ -12,7 +12,7 @@
</listener-class> </listener-class>
</listener> </listener>
<!-- uncomment following to debug event flow --> <!-- uncomment following to debug server event flow -->
<!-- listener> <!-- listener>
<listener-class>org.adempiere.webui.util.LogEventInterceptor</listener-class> <listener-class>org.adempiere.webui.util.LogEventInterceptor</listener-class>
</listener --> </listener -->
@ -23,9 +23,9 @@
<log-base></log-base> <log-base></log-base>
</log> </log>
<!-- change to false to use compress js which is much smaller --> <!-- false to use compress js which is much smaller. change to true if you need to debug -->
<client-config> <client-config>
<debug-js>true</debug-js> <debug-js>false</debug-js>
<processing-prompt-delay>500</processing-prompt-delay> <processing-prompt-delay>500</processing-prompt-delay>
</client-config> </client-config>
@ -46,9 +46,10 @@
</system-config> </system-config>
--> -->
<system-config> <!-- uncomment the following for selenium testing -->
<!-- system-config>
<id-generator-class>org.adempiere.webui.AdempiereIdGenerator</id-generator-class> <id-generator-class>org.adempiere.webui.AdempiereIdGenerator</id-generator-class>
</system-config> </system-config -->
<!-- <!--
polling - org.zkoss.zkex.ui.impl.PollingServerPush polling - org.zkoss.zkex.ui.impl.PollingServerPush
@ -56,10 +57,10 @@
--> -->
<device-config> <device-config>
<device-type>ajax</device-type> <device-type>ajax</device-type>
<!-- <server-push-class>org.zkoss.zk.ui.impl.PollingServerPush</server-push-class> -->
<server-push-class>fi.jawsy.jawwa.zk.atmosphere.AtmosphereServerPush</server-push-class> <server-push-class>fi.jawsy.jawwa.zk.atmosphere.AtmosphereServerPush</server-push-class>
</device-config> </device-config>
<!-- true for better performance and lower resource usage -->
<system-config> <system-config>
<disable-event-thread>true</disable-event-thread> <disable-event-thread>true</disable-event-thread>
</system-config> </system-config>

28
org.adempiere.ui.zk/js/jquery-patch.js vendored
View File

@ -2,24 +2,34 @@
(function(undefined) { (function(undefined) {
var rupper = /([A-Z]|^ms)/g; var rupper = /([A-Z]|^ms)/g;
if ( document.defaultView && document.defaultView.getComputedStyle ) { if ( document.defaultView && document.defaultView.getComputedStyle ) {
var old = document.defaultView.getComputedStyle;
getComputedStyle = function( elem, name ) { getComputedStyle = function( elem, name ) {
var ret, defaultView, computedStyle; var ret, defaultView, computedStyle;
//added try catch for firefox if ( !(defaultView = elem.ownerDocument.defaultView) ) {
try { return undefined;
name = name.replace( rupper, "-$1" ).toLowerCase(); }
if ( !(defaultView = elem.ownerDocument.defaultView) ) {
return undefined;
}
if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) { if (name == undefined || name == null) {
try {
return old(elem, null);
} catch (err) {
return "";
}
}
name = name.replace( rupper, "-$1" ).toLowerCase();
try {
if ( (computedStyle = old( elem, null )) ) {
ret = computedStyle.getPropertyValue( name ); ret = computedStyle.getPropertyValue( name );
if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) { if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
ret = jQuery.style( elem, name ); ret = jQuery.style( elem, name );
} }
} }
} catch (err) {} } catch (err) {
return "";
}
return ret; return ret;
}; };