Merge tag 'r0.3.0'

Conflicts:
	src/tizen/SplashScreenProxy.js
This commit is contained in:
Ian Clelland 2014-04-23 14:48:08 -04:00
commit 0838b1d3a7
6 changed files with 84 additions and 4 deletions

5
NOTICE Normal file
View File

@ -0,0 +1,5 @@
Apache Cordova
Copyright 2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

View File

@ -49,3 +49,11 @@
### 0.2.7 (Feb 05, 2014) ### 0.2.7 (Feb 05, 2014)
* [CB-3562] Fix aspect ratio on landscape-only iPhone applications * [CB-3562] Fix aspect ratio on landscape-only iPhone applications
* CB-4051 fix for splashscreen rotation problem * CB-4051 fix for splashscreen rotation problem
### 0.3.0 (Apr 17, 2014)
* Add Tizen support to plugin
* CB-6422: [windows8] use cordova/exec/proxy
* CB-4051: [ios] - Re-fix - Splashscreen rotation problem (closes #13)
* CB-6460: Update license headers
* CB-6465: Add license headers to Tizen code
* Add NOTICE file

View File

@ -1,8 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?> <?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.
-->
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="org.apache.cordova.splashscreen" id="org.apache.cordova.splashscreen"
version="0.2.7"> version="0.3.0">
<name>Splashscreen</name> <name>Splashscreen</name>
<description>Cordova Splashscreen Plugin</description> <description>Cordova Splashscreen Plugin</description>
<license>Apache 2.0</license> <license>Apache 2.0</license>
@ -97,4 +115,10 @@
</js-module> </js-module>
</platform> </platform>
<!-- tizen -->
<platform name="tizen">
<js-module src="src/tizen/SplashScreenProxy.js" name="SplashScreenProxy">
<runs />
</js-module>
</platform>
</plugin> </plugin>

View File

@ -138,7 +138,7 @@
if (CDV_IsIPhone5()) { if (CDV_IsIPhone5()) {
imageName = [imageName stringByAppendingString:@"-568h"]; imageName = [imageName stringByAppendingString:@"-568h"];
} else if (CDV_IsIPad() || isOrientationLocked) { } else if (CDV_IsIPad() && isOrientationLocked) {
switch (orientation) { switch (orientation) {
case UIInterfaceOrientationLandscapeLeft: case UIInterfaceOrientationLandscapeLeft:
case UIInterfaceOrientationLandscapeRight: case UIInterfaceOrientationLandscapeRight:

View File

@ -0,0 +1,43 @@
/*
*
* 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.
*
*/
( function() {
win = null;
module.exports = {
show: function() {
if ( win === null ) {
win = window.open('splashscreen.html');
}
},
hide: function() {
if ( win !== null ) {
win.close();
win = null;
}
}
};
require("cordova/tizen/commandProxy").add("SplashScreen", module.exports);
})();

View File

@ -102,5 +102,5 @@ channel.onCordovaReady.subscribe(function (evt) {
}, false); }, false);
}); });
require("cordova/windows8/commandProxy").add("SplashScreen", SplashScreen); require("cordova/exec/proxy").add("SplashScreen", SplashScreen);