Mercurial > dive4elements > river
changeset 8212:f47573689fac superdev
Do not inherit smartgwt include the javascript directly in FLYS.html
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 05 Sep 2014 19:30:50 +0200 |
| parents | f01fc10e2184 |
| children | |
| files | gwt-client/src/main/java/org/dive4elements/river/client/FLYS.gwt.xml gwt-client/src/main/webapp/FLYS.html |
| diffstat | 2 files changed, 25 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/FLYS.gwt.xml Fri Sep 05 19:29:11 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/FLYS.gwt.xml Fri Sep 05 19:30:50 2014 +0200 @@ -14,12 +14,11 @@ <inherits name="org.dive4elements.artifacts.common.Common"/> - <!-- Inherit the smartgwt Enterprise Theme. --> + <inherits name="com.smartgwt.SmartGwtNoScript"/> + <!-- Inherit the smartgwt Enterprise Theme. <inherits name="com.smartgwt.SmartGwtNoTheme" /> - <!--inherits name="com.smartclient.theme.enterprise.Enterprise"/> <inherits name="com.smartclient.theme.enterprise.EnterpriseResources"/--> - <!-- Works again with smart-gwt2.5 patch from maven repository--> <inherits name="com.smartclient.theme.enterpriseblue.EnterpriseBlue"/> <inherits name="com.smartclient.theme.enterpriseblue.EnterpriseBlueResources"/> @@ -41,4 +40,11 @@ <source path='shared'/> <extend-property name="locale" values="de,en"/> + + <!-- Super dev mode --> + <extend-configuration-property name="document.compatMode" value="BackCompat"/> + <add-linker name="xsiframe" /> + <set-configuration-property name="devModeRedirectEnabled" value="true" /> + <set-configuration-property name='xsiframe.failIfScriptTag' value='FALSE'/> + <!-- End super-dev mode settings --> </module>
--- a/gwt-client/src/main/webapp/FLYS.html Fri Sep 05 19:29:11 2014 +0200 +++ b/gwt-client/src/main/webapp/FLYS.html Fri Sep 05 19:30:50 2014 +0200 @@ -20,7 +20,20 @@ <!-- Any title is fine --> <!-- --> <title>FLYS-3</title> - + + <!-- Including stuff superdefmode complained about --> + <script type="text/javascript" language="javascript" src="flys/sc/modules/ISC_Core.js"/> + <script type="text/javascript" language="javascript" src="flys/sc/modules/ISC_Foundation.js"/> + <script type="text/javascript" language="javascript" src="flys/sc/modules/ISC_Containers.js"/> + <script type="text/javascript" language="javascript" src="flys/sc/modules/ISC_Grids.js"/> + <script type="text/javascript" language="javascript" src="flys/sc/modules/ISC_History.js"/> + <script type="text/javascript" language="javascript" src="flys/sc/modules/ISC_Forms.js"/> + <script type="text/javascript" language="javascript" src="flys/sc/modules/ISC_RichTextEditor.js"/> + <script type="text/javascript" language="javascript" src="flys/sc/modules/ISC_Calendar.js"/> + <script type="text/javascript" language="javascript" src="flys/sc/modules/ISC_DataBinding.js"/> + <script type="text/javascript" language="javascript" src="flys/sc/skins/EnterpriseBlue/load_skin.js"/> + <script type="text/javascript" language="javascript" src="flys/js/gwt-openlayers/util.js"/> + <!-- --> <!-- This script loads your compiled module. --> <!-- If you add any GWT meta tags, they must --> @@ -30,6 +43,8 @@ <!-- TODO We should NOT include OpenLayers from remote. --> <script type="text/javascript" language="javascript" src="OpenLayers-2.11/OpenLayers.js"></script> + + </head> <!-- -->