details: https://code.openbravo.com/erp/devel/pi/rev/f9f85e0ce62c
changeset: 24368:f9f85e0ce62c
user: Rafa Alonso <rafael.alonso <at> openbravo.com>
date: Tue Sep 02 20:17:41 2014 +0200
summary: Related to issue 27362: If in development or the
Openbravo.property's 'test.environment' property is true...
- the debug flag is set to true
- the generated javascript will not be compressed (to help debugging in test
environments)
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
| 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diffs (31 lines):
diff -r 156f9b687d43 -r f9f85e0ce62c
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
Tue Sep 02 17:52:22 2014 +0000
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
Tue Sep 02 20:17:41 2014 +0200
@@ -30,6 +30,7 @@
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
+import org.openbravo.base.session.OBPropertiesProvider;
import org.openbravo.client.kernel.BaseComponentProvider.ComponentResource;
import
org.openbravo.client.kernel.BaseComponentProvider.ComponentResource.ComponentResourceType;
import org.openbravo.dal.core.OBContext;
@@ -243,7 +244,8 @@
*
* TODO: don't load the ob-debug.js file if not in use
*/
- if (isInDevelopment() || referer.indexOf("/ret-") > 0) {
+ if (isInDevelopment()
+ ||
OBPropertiesProvider.getInstance().getBooleanProperty("test.environment")) {
sb.insert(0, "var isDebug = true;\n\n");
}
sb.append("if (window.onerror && window.onerror.name === '"
@@ -264,7 +266,8 @@
// when changing development status, system needs to be restarted.
final String output;
// in classicmode the isc combined is included, compressing that gives
errors
- if (!isInDevelopment() && !isClassicMode()) {
+ if (!isInDevelopment() && !isClassicMode()
+ &&
!OBPropertiesProvider.getInstance().getBooleanProperty("test.environment")) {
output = JSCompressor.getInstance().compress(sb.toString());
} else {
output = sb.toString();
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
