cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [04/13] [CB-3307] Rename cordova-ios.js -> cordova.js
Date Mon, 13 May 2013 18:50:25 GMT
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e9f5e678/CordovaLibTests/CordovaLibApp/www/index.html
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CordovaLibApp/www/index.html b/CordovaLibTests/CordovaLibApp/www/index.html
index 1cac0a4..17f1319 100644
--- a/CordovaLibTests/CordovaLibApp/www/index.html
+++ b/CordovaLibTests/CordovaLibApp/www/index.html
@@ -32,7 +32,7 @@
 	<link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="iphone.css"
type="text/css" />		
 	-->
 	<!-- If your application is targeting iOS BEFORE 4.0 you MUST put json2.js from http://www.JSON.org/json2.js
into your www directory and include it here -->
-	<script type="text/javascript" charset="utf-8" src="cordova.ios.js"></script>
+	<script type="text/javascript" charset="utf-8" src="cordova.js"></script>
     <script type="text/javascript">
 
 

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e9f5e678/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj b/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj
index 219eb53..c759571 100644
--- a/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj
+++ b/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj
@@ -272,7 +272,7 @@
 				303A4064152124BB00182201 /* Sources */,
 				303A4065152124BB00182201 /* Frameworks */,
 				303A4066152124BB00182201 /* Resources */,
-				30F8AE1615212883006625B3 /* Copy cordova.ios.js into www directory */,
+				30F8AE1615212883006625B3 /* Copy cordova.js into www directory */,
 			);
 			buildRules = (
 			);
@@ -371,7 +371,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		30F8AE1615212883006625B3 /* Copy cordova.ios.js into www directory */ = {
+		30F8AE1615212883006625B3 /* Copy cordova.js into www directory */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -379,12 +379,12 @@
 			inputPaths = (
 				"",
 			);
-			name = "Copy cordova.ios.js into www directory";
+			name = "Copy cordova.js into www directory";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp ../CordovaLib/cordova.ios.js \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/www/cordova.ios.js\"";
+			shellScript = "cp ../CordovaLib/cordova.js \"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/www/cordova.js\"";
 			showEnvVarsInLog = 0;
 		};
 		686357A7141002F100DF4CF2 /* ShellScript */ = {

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e9f5e678/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
index d617f09..7f5a5d9 100755
--- a/bin/create
+++ b/bin/create
@@ -83,9 +83,7 @@ fi
 cp -r "$BINDIR/templates/project/" "$PROJECT_PATH"
 
 # Copy in the JS.
-cp "$CORDOVALIB_DIR/cordova.ios.js" "$PROJECT_PATH/www/cordova-$CDV_VER.js"
-# Change the filename reference in the html from cordova.ios.js -> cordova-VERSION.js.
-/usr/bin/sed -i "" "s/src[ 	]*=[ 	]*[\\'\"]cordova.ios.js[\\'\"]/src=\"cordova-${CDV_VER}.js\"/g"
"$PROJECT_PATH/www/index.html"
+cp "$CORDOVALIB_DIR/cordova.js" "$PROJECT_PATH/www/cordova.js"
 
 # I've tried to be thorough in my documentation of the manual actions below...
 # on first brush it would seem that the right solution would be to brute force

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e9f5e678/bin/templates/project/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/index.html b/bin/templates/project/www/index.html
index 8bc9055..e84fbd7 100644
--- a/bin/templates/project/www/index.html
+++ b/bin/templates/project/www/index.html
@@ -33,7 +33,7 @@
                 <p class="event received">Device is Ready</p>
             </div>
         </div>
-        <script type="text/javascript" src="cordova.ios.js"></script>
+        <script type="text/javascript" src="cordova.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
         <script type="text/javascript">
             app.initialize();


Mime
View raw message