move Cordova JS files under boilerplate Dapp.

This commit is contained in:
Yaroslav Dmytrotsa 2015-08-07 12:36:06 +03:00
parent 51931a7f14
commit 2619e46514
28 changed files with 9 additions and 5 deletions

View File

@ -124,12 +124,12 @@
<orderEntry type="library" exported="" name="persistence-api-1.0.2" level="project" /> <orderEntry type="library" exported="" name="persistence-api-1.0.2" level="project" />
<orderEntry type="library" exported="" name="netty-all-4.0.28.Final" level="project" /> <orderEntry type="library" exported="" name="netty-all-4.0.28.Final" level="project" />
<orderEntry type="library" exported="" name="multidex-1.0.1" level="project" /> <orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
<orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" /> <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
<orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
<orderEntry type="library" exported="" name="library-1.1" level="project" /> <orderEntry type="library" exported="" name="library-1.1" level="project" />
<orderEntry type="library" exported="" name="guava-18.0" level="project" /> <orderEntry type="library" exported="" name="guava-18.0" level="project" />
<orderEntry type="library" exported="" name="javassist-3.15.0-GA" level="project" />
<orderEntry type="library" exported="" name="jackson-annotations-2.5.0" level="project" /> <orderEntry type="library" exported="" name="jackson-annotations-2.5.0" level="project" />
<orderEntry type="library" exported="" name="javassist-3.15.0-GA" level="project" />
<orderEntry type="library" exported="" name="json-smart-1.3.1" level="project" /> <orderEntry type="library" exported="" name="json-smart-1.3.1" level="project" />
<orderEntry type="library" exported="" name="javax.annotation-10.0-b28" level="project" /> <orderEntry type="library" exported="" name="javax.annotation-10.0-b28" level="project" />
<orderEntry type="library" exported="" name="core-1.51.0.0" level="project" /> <orderEntry type="library" exported="" name="core-1.51.0.0" level="project" />

View File

@ -51,6 +51,7 @@ navigator.notification.alert(
); );
} }
</script> </script>
<script type="text/javascript" src="cordova/cordova.js"></script>
</head> </head>
<body> <body>
</body> </body>

View File

@ -40,6 +40,8 @@ public class WebViewFragment extends Fragment {
protected boolean keepRunning = true; protected boolean keepRunning = true;
protected boolean immersiveMode; protected boolean immersiveMode;
/*
Dapps must keep cordova JS files inside or we must place them on external HTTP server. If inject from file: - external scripts not have access to it.
private static String js_cordova = "" private static String js_cordova = ""
+"var script = document.createElement('script'); " +"var script = document.createElement('script'); "
+"script.setAttribute('type','text/javascript'); " +"script.setAttribute('type','text/javascript'); "
@ -47,6 +49,7 @@ public class WebViewFragment extends Fragment {
+"script.setAttribute('src','file:///android_asset/www/cordova.js'); " +"script.setAttribute('src','file:///android_asset/www/cordova.js'); "
+"(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(script);" +"(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(script);"
+""; +"";
*/
// protected View view; // protected View view;
@ -191,7 +194,7 @@ public class WebViewFragment extends Fragment {
} }
*/ */
} else if ("onPageFinished".equals(id)) { } else if ("onPageFinished".equals(id)) {
webView.getEngine().loadUrl("javascript: " + js_cordova, false); // webView.getEngine().loadUrl("javascript: " + js_cordova, false);
} else if ("exit".equals(id)) { } else if ("exit".equals(id)) {
getActivity().finish(); getActivity().finish();
} }

View File

@ -15,7 +15,7 @@
<content src="index.html" /> <content src="index.html" />
<access origin="*" /> <access origin="*" subdomains="true" />
<allow-intent href="http://*/*" /> <allow-intent href="http://*/*" />
<allow-intent href="https://*/*" /> <allow-intent href="https://*/*" />
@ -62,11 +62,11 @@
<!-- <!--
After enable it block and freez requests to our JSON-RPC After enable it block and freez requests to our JSON-RPC
-->
<feature name="Whitelist" > <feature name="Whitelist" >
<param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin"/> <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin"/>
<param name="onload" value="true" /> <param name="onload" value="true" />
</feature> </feature>
-->
<preference name="loglevel" value="DEBUG" /> <preference name="loglevel" value="DEBUG" />
<!-- <!--