cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhigg...@apache.org
Subject git commit: CB-6035 - Move js-module so it is not loaded on unsupported platforms
Date Thu, 13 Feb 2014 20:03:03 GMT
Updated Branches:
  refs/heads/dev cd31b3a64 -> 39e64c988


CB-6035 - Move js-module so it is not loaded on unsupported platforms

BlackBerry 10 has a native implementation which does not require the plugin.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/39e64c98
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/39e64c98
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/39e64c98

Branch: refs/heads/dev
Commit: 39e64c988afb38a081fae7e3d71d18424a3cfbf4
Parents: cd31b3a
Author: Bryan Higgins <bhiggins@blackberry.com>
Authored: Thu Feb 13 15:00:18 2014 -0500
Committer: Bryan Higgins <bhiggins@blackberry.com>
Committed: Thu Feb 13 15:00:18 2014 -0500

----------------------------------------------------------------------
 plugin.xml | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/39e64c98/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 9ff4add..57396a7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -14,13 +14,12 @@
     <engines>
       <engine name="cordova" version=">=3.1.0" /><!-- Needs cordova/urlutil -->
     </engines>
-
-    <js-module src="www/InAppBrowser.js" name="InAppBrowser">
-        <clobbers target="window.open" />
-    </js-module>
     
-    <!--  -->
+    <!-- android -->
     <platform name="android">
+        <js-module src="www/inappbrowser.js" name="inappbrowser">
+            <clobbers target="window.open" />
+        </js-module>
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="InAppBrowser"> 
                 <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
@@ -50,6 +49,9 @@
     
     <!-- amazon-fireos -->
     <platform name="amazon-fireos">
+        <js-module src="www/inappbrowser.js" name="inappbrowser">
+            <clobbers target="window.open" />
+        </js-module>
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="InAppBrowser"> 
                 <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
@@ -62,6 +64,9 @@
 
     <!-- ubuntu -->
     <platform name="ubuntu">
+        <js-module src="www/inappbrowser.js" name="inappbrowser">
+            <clobbers target="window.open" />
+        </js-module>
         <header-file src="src/ubuntu/inappbrowser.h" />
         <source-file src="src/ubuntu/inappbrowser.cpp" />
         <resource-file src="src/ubuntu/InAppBrowser.qml" />
@@ -69,7 +74,10 @@
     </platform>
 
     <!-- ios -->
-    <platform name="ios">    
+    <platform name="ios">
+        <js-module src="www/inappbrowser.js" name="inappbrowser">
+            <clobbers target="window.open" />
+        </js-module>  
         <config-file target="config.xml" parent="/*">
             <feature name="InAppBrowser">
                 <param name="ios-package" value="CDVInAppBrowser" /> 
@@ -82,15 +90,11 @@
 	    <framework src="CoreGraphics.framework" />
     </platform>
 
-    <!-- blackberry10 -->
-<!--    <platform name="blackberry10">
-        <config-file target="www/config.xml" parent="/widget">
-            <feature name="InAppBrowser" value="InAppBrowser"/>
-        </config-file>
-    </platform>
--->
     <!-- wp7 -->
     <platform name="wp7">
+        <js-module src="www/inappbrowser.js" name="inappbrowser">
+            <clobbers target="window.open" />
+        </js-module>
         <config-file target="config.xml" parent="/*">
             <feature name="InAppBrowser">
                 <param name="wp-package" value="InAppBrowser"/>
@@ -102,6 +106,9 @@
 
     <!-- wp8 -->
     <platform name="wp8">
+        <js-module src="www/inappbrowser.js" name="inappbrowser">
+            <clobbers target="window.open" />
+        </js-module>
         <config-file target="config.xml" parent="/*">
             <feature name="InAppBrowser">
                 <param name="wp-package" value="InAppBrowser"/>
@@ -113,6 +120,9 @@
 
     <!-- windows8 -->
     <platform name="windows8">
+        <js-module src="www/inappbrowser.js" name="inappbrowser">
+            <clobbers target="window.open" />
+        </js-module>
         <js-module src="www/windows8/InAppBrowserProxy.js" name="InAppBrowserProxy">
             <merges target="" />
         </js-module>


Mime
View raw message