github/cordova-plugin-screen-orientation
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-screen-orientation.git synced 2026-05-31 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Jesse MacFadyen
2016-12-12 11:23:29 -08:00
parent 9f477a5517 f2f2dbde72
commit ab23405417
24 changed files with 688 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin.xml
+29 -45
View File
@@ -1,25 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="cordova-plugin-screen-orientation"
version="1.4.3-dev">
version="2.0.0-dev">
<name>Screen Orientation</name>
<description>Adds Screen Orientation API lock and unlock functions to the global screen object in android, iOS, WP8, W8.1, and BB10.</description>
<license>MIT</license>
@@ -34,30 +33,25 @@
<platform name="ios">
<config-file target="config.xml" parent="/*">
<feature name="YoikScreenOrientation">
<param name="ios-package" value="YoikScreenOrientation" />
<feature name="CDVOrientation">
<param name="ios-package" value="CDVOrientation" />
</feature>
</config-file>
<js-module src="www/screenorientation.ios.js" name="screenorientation.ios">
<merges target="cordova.plugins.screenorientation" />
</js-module>
<header-file src="src/ios/YoikScreenOrientation.h" />
<source-file src="src/ios/YoikScreenOrientation.m" />
<header-file src="src/ios/CDVViewController+UpdateSupportedOrientations.h" />
<source-file src="src/ios/CDVViewController+UpdateSupportedOrientations.m" />
<header-file src="src/ios/CDVOrientation.h" />
<source-file src="src/ios/CDVOrientation.m" />
</platform>
<platform name="android">
<source-file src="src/android/YoikScreenOrientation.java" target-dir="src/net/yoik/cordova/plugins/screenorientation/" />
<source-file src="src/android/CDVOrientation.java" target-dir="src/cordova/plugins/screenorientation/" />
<config-file target="res/xml/config.xml" parent="/*">
<feature name="YoikScreenOrientation">
<param name="android-package" value="net.yoik.cordova.plugins.screenorientation.YoikScreenOrientation" />
<feature name="CDVOrientation">
<param name="android-package" value="cordova.plugins.screenorientation.CDVOrientation" />
</feature>
</config-file>
<js-module src="www/screenorientation.android.js" name="screenorientation.android">
<merges target="cordova.plugins.screenorientation" />
</js-module>
</platform>
<platform name="blackberry10">
@@ -70,21 +64,11 @@
</js-module>
</platform>
<platform name="wp8">
<config-file target="config.xml" parent="/*">
<feature name="YoikScreenOrientation">
<param name="wp-package" value="YoikScreenOrientation"/>
</feature>
</config-file>
<js-module src="www/screenorientation.wp8.js" name="screenorientation.wp8">
<merges target="cordova.plugins.screenorientation" />
</js-module>
<source-file src="src/wp/YoikScreenOrientation.cs" />
</platform>
<platform name="windows">
<js-module src="www/screenorientation.windows.js" name="screenorientation.windows">
<merges target="cordova.plugins.screenorientation" />
<js-module src="src/windows/CDVOrientationProxy.js" name="CDVOrientationProxy">
<merges target="" />
</js-module>
</platform>