You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/12/05 01:59:17 UTC
[05/11] git commit: Added ubuntu support
Added ubuntu support
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/d2b644e5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/d2b644e5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/d2b644e5
Branch: refs/heads/master
Commit: d2b644e5d519638d22eeae7c3f58a59cf26af916
Parents: e5101ba a8f79e1
Author: Steven Gill <st...@gmail.com>
Authored: Mon Dec 2 16:28:32 2013 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Dec 2 16:28:32 2013 -0800
----------------------------------------------------------------------
plugin.xml | 8 +++
src/ubuntu/InAppBrowser.qml | 69 +++++++++++++++++++++++++
src/ubuntu/close.png | Bin 0 -> 461 bytes
src/ubuntu/inappbrowser.cpp | 106 +++++++++++++++++++++++++++++++++++++++
src/ubuntu/inappbrowser.h | 61 ++++++++++++++++++++++
5 files changed, 244 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/d2b644e5/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index a630d66,5febd9d..e656ee7
--- a/plugin.xml
+++ b/plugin.xml
@@@ -30,19 -24,14 +30,27 @@@
<source-file src="src/android/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" />
<source-file src="src/android/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
</platform>
++<<<<<<< HEAD
+
+ <!-- amazon-fireos -->
+ <platform name="amazon-fireos">
+ <config-file target="res/xml/config.xml" parent="/*">
+ <feature name="InAppBrowser">
+ <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
+ </feature>
+ </config-file>
+
+ <source-file src="src/amazon/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" />
+ <source-file src="src/amazon/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
+ </platform>
+ <!-- ubuntu -->
+ <platform name="ubuntu">
+ <header-file src="src/ubuntu/inappbrowser.h" />
+ <source-file src="src/ubuntu/inappbrowser.cpp" />
+ <resource-file src="src/ubuntu/InAppBrowser.qml" />
+ <resource-file src="src/ubuntu/close.png" />
+ </platform>
<!-- ios -->
<platform name="ios">