cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [11/16] cordova-plugin-screen-orientation git commit: Resolve merge conflicts
Date Tue, 13 Dec 2016 23:48:39 GMT
Resolve merge conflicts


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/commit/ab234054
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/tree/ab234054
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/diff/ab234054

Branch: refs/heads/master
Commit: ab23405417ba8ae6451d69e16584182232a2f28c
Parents: 9f477a5 f2f2dbd
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Mon Dec 12 11:23:29 2016 -0800
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Mon Dec 12 11:23:29 2016 -0800

----------------------------------------------------------------------
 .gitignore                                      |  29 ++++
 .npmignore                                      |   2 +
 README.md                                       |  42 ++---
 demo/config.xml                                 |  26 +++
 demo/www/css/index.css                          | 115 +++++++++++++
 demo/www/img/logo.png                           | Bin 0 -> 21814 bytes
 demo/www/index.html                             |  58 +++++++
 demo/www/js/index.js                            |  96 +++++++++++
 package.json                                    |   2 +-
 plugin.xml                                      |  74 ++++-----
 src/android/CDVOrientation.java                 |  97 +++++++++++
 src/android/YoikScreenOrientation.java          | 101 -----------
 src/ios/CDVOrientation.h                        |  31 ++++
 src/ios/CDVOrientation.m                        |  65 ++++++++
 ...ViewController+UpdateSupportedOrientations.h |  28 ----
 ...ViewController+UpdateSupportedOrientations.m |  32 ----
 src/ios/YoikScreenOrientation.h                 |  36 ----
 src/ios/YoikScreenOrientation.m                 | 120 --------------
 src/windows/CDVOrientation.cs                   |  58 +++++++
 src/wp/YoikScreenOrientation.cs                 | 140 ----------------
 tests/plugin.xml                                |  31 ++++
 tests/tests.js                                  |  36 ++++
 www/screenorientation.android.js                |  29 ----
 www/screenorientation.ios.js                    |  56 -------
 www/screenorientation.js                        | 166 ++++++++++++-------
 www/screenorientation.windows.js                |  54 ------
 www/screenorientation.wp8.js                    |  29 ----
 27 files changed, 791 insertions(+), 762 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/blob/ab234054/README.md
----------------------------------------------------------------------
diff --cc README.md
index 58d2918,a632e6f..fe022b0
--- a/README.md
+++ b/README.md
@@@ -123,17 -99,13 +99,27 @@@ The __screen.orientation__ property wil
  
  Wraps the com.blackberry.app plugin functions, auto installed as a dependancy.
  
++<<<<<<< HEAD
 +## WP8 Notes
 +
 +Windows phone does not support specification or primary and secondary orientations.  If
called with a specific orientation the plugin will just apply the landscape or portait orientation.
 +
 +## W8.1 Notes
 +
 +Windows 8.1 Applicaitons (runtime/metro applications) will only display orientation changes
if the device has some sort of accelerometer.  The internal state of the "orientation" will
still be kept, but the actual screen won't rotate unless the device supports it.
 +
 +# Legacy Changelog
 +
 +See [RELEASENOTES.md](RELEASENOTES.md) for the automated changelog.
++=======
+ # Changelog
+ 
+ ## 2.0.0
+ * Common javascript for iOS, Android and Windows.
+ 
+ ## 1.4.2
+ * [#101](https://github.com/gbenvenuti/cordova-plugin-screen-orientation/pull/101) make
iOS rotate as needed when lockOrientation is called
++>>>>>>> f2f2dbde729b9d3ac5884de6ee80ae354a3bf5ef
  
  ## 1.4.1
  * [#89](https://github.com/gbenvenuti/cordova-plugin-screen-orientation/pull/89) Fix for
cordova >= 3.6.3

http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/blob/ab234054/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index c4aa0f9,b777d6f..9ecc897
--- a/plugin.xml
+++ b/plugin.xml
@@@ -18,8 -18,8 +18,7 @@@
  
  <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>
@@@ -31,35 -31,30 +30,30 @@@
      <js-module src="www/screenorientation.js" name="screenorientation">
          <clobbers target="cordova.plugins.screenorientation" />
      </js-module>
 -    
 +
      <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">
          <dependency id="com.blackberry.app" />
          <config-file target="www/config.xml" parent="/widget">
@@@ -69,23 -64,13 +63,13 @@@
              <merges target="cordova.plugins.screenorientation" />
          </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>
 -    
 +
  </plugin>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message