details: /erp/devel/pi/rev/d08bdcb628d6
changeset: 9451:d08bdcb628d6
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Dec 29 17:06:52 2010 +0100
summary: Fixes issue 15542: API Change: the script tags in manual windows
using the selector have changed
diffstat:
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponentProvider.java
| 2 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponentProvider.java
| 2 +-
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponentProvider.java
| 2 +-
modules/org.openbravo.userinterface.selector/src-wad/org/openbravo/userinterface/selector/wad/WADSelector.java
| 19 +---------
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponentProvider.java
| 8 +++-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/classic-skin-variable.js
| 20 ++++++++++
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-default-settings.js
| 20 ----------
modules/org.openbravo.userinterface.smartclient/src/org/openbravo/userinterface/smartclient/SmartClientComponentProvider.java
| 7 +++-
8 files changed, 36 insertions(+), 44 deletions(-)
diffs (154 lines):
diff -r 340f54dec87e -r d08bdcb628d6
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponentProvider.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponentProvider.java
Wed Dec 29 17:05:37 2010 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponentProvider.java
Wed Dec 29 17:06:52 2010 +0100
@@ -54,7 +54,7 @@
}
@Override
- public List<ComponentResource> getGlobalResources() {
+ public List<ComponentResource> getGlobalComponentResources() {
final List<ComponentResource> globalResources = new
ArrayList<ComponentResource>();
globalResources.add(createStaticResource("web/org.openbravo.client.myob/js/ob-myopenbravo.js",
false));
diff -r 340f54dec87e -r d08bdcb628d6
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponentProvider.java
---
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponentProvider.java
Wed Dec 29 17:05:37 2010 +0100
+++
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponentProvider.java
Wed Dec 29 17:06:52 2010 +0100
@@ -43,7 +43,7 @@
}
@Override
- public List<ComponentResource> getGlobalResources() {
+ public List<ComponentResource> getGlobalComponentResources() {
final List<ComponentResource> globalResources = new
ArrayList<ComponentResource>();
globalResources.add(createStaticResource(
"web/org.openbravo.client.querylist/js/ob-querylist-widget.js",
false));
diff -r 340f54dec87e -r d08bdcb628d6
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponentProvider.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponentProvider.java
Wed Dec 29 17:05:37 2010 +0100
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponentProvider.java
Wed Dec 29 17:06:52 2010 +0100
@@ -79,7 +79,7 @@
* @return an empty String (no global resources)
* @see org.openbravo.client.kernel.ComponentProvider#getGlobalResources()
*/
- public List<ComponentResource> getGlobalResources() {
+ public List<ComponentResource> getGlobalComponentResources() {
final List<ComponentResource> globalResources = new
ArrayList<ComponentResource>();
globalResources.add(createStaticResource(
"web/org.openbravo.service.datasource/js/ob-datasource-utilities.js",
true));
diff -r 340f54dec87e -r d08bdcb628d6
modules/org.openbravo.userinterface.selector/src-wad/org/openbravo/userinterface/selector/wad/WADSelector.java
---
a/modules/org.openbravo.userinterface.selector/src-wad/org/openbravo/userinterface/selector/wad/WADSelector.java
Wed Dec 29 17:05:37 2010 +0100
+++
b/modules/org.openbravo.userinterface.selector/src-wad/org/openbravo/userinterface/selector/wad/WADSelector.java
Wed Dec 29 17:06:52 2010 +0100
@@ -41,24 +41,7 @@
}
public void initialize() {
-
- addCSSImport("Stylesheets",
"../../../../../web/../org.openbravo.client.kernel/OBCLKER_Kernel/StyleSheetResources?_skinVersion=2.50_emulation&_mode=classic");
-
- addImport("Default",
-
"../../../../../web/org.openbravo.userinterface.selector/js/ob-default-settings.js");
-
- addImport("Isomorphic",
-
"../../../../../web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js");
-
- addImport("StaticResources",
-
"../../../../../web/../org.openbravo.client.kernel/OBCLKER_Kernel/StaticResources?_skinVersion=2.50_emulation&_mode=classic");
-
- addImport("Selector",
-
"../../../../../web/org.openbravo.userinterface.selector/js/ob-selector-widget.js");
-
- addImport("SelectorAsLink",
-
"../../../../../web/org.openbravo.userinterface.selector/js/ob-selector-link-widget.js");
-
+ addImport("StaticResources",
"../../../../../web/../org.openbravo.client.kernel/OBCLKER_Kernel/StaticResources");
generateJSCode();
}
diff -r 340f54dec87e -r d08bdcb628d6
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponentProvider.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponentProvider.java
Wed Dec 29 17:05:37 2010 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponentProvider.java
Wed Dec 29 17:06:52 2010 +0100
@@ -54,8 +54,12 @@
* @return an empty String (no global resources)
* @see org.openbravo.client.kernel.ComponentProvider#getGlobalResources()
*/
- public List<ComponentResource> getGlobalResources() {
- ArrayList<ComponentResource> resources = new
ArrayList<ComponentResource>();
+ public List<ComponentResource> getGlobalComponentResources() {
+ final ArrayList<ComponentResource> resources = new
ArrayList<ComponentResource>();
+ resources.add(createStaticResource(
+ "web/org.openbravo.userinterface.selector/js/ob-selector-widget.js",
true, false));
+ resources.add(createStaticResource(
+
"web/org.openbravo.userinterface.selector/js/ob-selector-link-widget.js", true,
false));
return resources;
}
diff -r 340f54dec87e -r d08bdcb628d6
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/classic-skin-variable.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/classic-skin-variable.js
Wed Dec 29 17:06:52 2010 +0100
@@ -0,0 +1,20 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2009-2010 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+// Empty file, included for backward compatibility
+var isomorphicDir='../web/org.openbravo.userinterface.smartclient/isomorphic/';
\ No newline at end of file
diff -r 340f54dec87e -r d08bdcb628d6
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-default-settings.js
---
a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-default-settings.js
Wed Dec 29 17:05:37 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo Public License
- * Version 1.1 (the "License"), being the Mozilla Public License
- * Version 1.1 with a permitted attribution clause; you may not use this
- * file except in compliance with the License. You may obtain a copy of
- * the License at http://www.openbravo.com/legal/license.html
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009-2010 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ************************************************************************
- */
-// Contains default settings which should be set before other javascript
-var isomorphicDir='../web/org.openbravo.userinterface.smartclient/isomorphic/';
\ No newline at end of file
diff -r 340f54dec87e -r d08bdcb628d6
modules/org.openbravo.userinterface.smartclient/src/org/openbravo/userinterface/smartclient/SmartClientComponentProvider.java
---
a/modules/org.openbravo.userinterface.smartclient/src/org/openbravo/userinterface/smartclient/SmartClientComponentProvider.java
Wed Dec 29 17:05:37 2010 +0100
+++
b/modules/org.openbravo.userinterface.smartclient/src/org/openbravo/userinterface/smartclient/SmartClientComponentProvider.java
Wed Dec 29 17:06:52 2010 +0100
@@ -61,11 +61,16 @@
* @return a set of global resources
* @see org.openbravo.client.kernel.ComponentProvider#getGlobalResources()
*/
- public List<ComponentResource> getGlobalResources() {
+ public List<ComponentResource> getGlobalComponentResources() {
final List<ComponentResource> globalResources = new
ArrayList<ComponentResource>();
globalResources.add(createStyleSheetResource(
"web/org.openbravo.userinterface.smartclient/openbravo/skins/"
+ KernelConstants.SKIN_VERSION_PARAMETER +
"/smartclient/skin_styles.css", true));
+
+ // note ISC_Combined.js is only added for the classic mode
+ globalResources.add(createStaticResource(
+
"web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js", true,
false));
+
globalResources.add(createStaticResource(
"web/org.openbravo.userinterface.smartclient/openbravo/skins/"
+ KernelConstants.SKIN_VERSION_PARAMETER +
"/smartclient/load_skin.js", true));
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
