Merge branch 'dev'

Revert "Merge branch 'tizen' of http://github.com/siovene/cordova-plugin-splashscreen "
This reverts commit 4da6ca883c, reversing changes made to 3c2813f505.
2026-02-16 00:00:04 +08:00 · 2014-02-05 18:12:13 -08:00 · 2014-01-27 17:32:09 -08:00 · 2014-01-27 17:00:15 -08:00
2 changed files with 1 additions and 29 deletions
--- a/plugin.xml
+++ b/plugin.xml
@@ -54,7 +54,7 @@

 	    <header-file src="src/ios/CDVSplashScreen.h" />
 	    <source-file src="src/ios/CDVSplashScreen.m" />
-
+	    
 	    <framework src="CoreGraphics.framework" />
    </platform>

@@ -97,10 +97,4 @@
        </js-module>
    </platform>

-    <!-- tizen -->
-    <platform name="tizen">
-        <js-module src="src/tizen/SplashScreenProxy.js" name="SplashScreenProxy">
-            <runs />
-        </js-module>
-    </platform>
 </plugin>
--- a/src/tizen/SplashScreenProxy.js
+++ b/src/tizen/SplashScreenProxy.js
@@ -1,22 +0,0 @@
-( 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);
-
-})();
Author	SHA1	Message	Date
Steven Gill	3d553eb51a	Merge branch 'dev'	2014-02-05 18:12:13 -08:00
Anis Kadri	6cb0a8cf0c	Revert "Merge branch 'tizen' of http://github.com/siovene/cordova-plugin-splashscreen " This reverts commit `4da6ca883c`, reversing changes made to `3c2813f505`.	2014-01-27 17:32:09 -08:00
Anis Kadri	4da6ca883c	Merge branch 'tizen' of http://github.com/siovene/cordova-plugin-splashscreen	2014-01-27 17:00:15 -08:00