Permalink
Browse files

[CB-3307] Change cordova-VERSION.js to cordova.js.

  • Loading branch information...
1 parent d8cfbf8 commit 027ec1da86511e85e25b3d4f38e2f3d7be31222b @agrieve agrieve committed May 8, 2013
Showing with 53 additions and 57 deletions.
  1. +1 −4 README.md
  2. +1 −1 accelerometer/index.html
  3. +1 −1 audio/index.html
  4. +1 −1 autotest/html/SpecView.js
  5. +1 −1 autotest/index.html
  6. +1 −1 autotest/pages/accelerometer.html
  7. +1 −1 autotest/pages/all.html
  8. +1 −1 autotest/pages/battery.html
  9. +1 −1 autotest/pages/bridge.html
  10. +1 −1 autotest/pages/camera.html
  11. +1 −1 autotest/pages/capture.html
  12. +1 −1 autotest/pages/compass.html
  13. +1 −1 autotest/pages/contacts.html
  14. +1 −1 autotest/pages/datauri.html
  15. +1 −1 autotest/pages/device.html
  16. +1 −1 autotest/pages/file.html
  17. +1 −1 autotest/pages/filetransfer.html
  18. +1 −1 autotest/pages/geolocation.html
  19. +1 −1 autotest/pages/globalization.html
  20. +1 −1 autotest/pages/media.html
  21. +1 −1 autotest/pages/network.html
  22. +1 −1 autotest/pages/notification.html
  23. +1 −1 autotest/pages/platform.html
  24. +1 −1 autotest/pages/storage.html
  25. +1 −1 battery/index.html
  26. +1 −1 benchmarks/arraybuffer.html
  27. +1 −1 benchmarks/autobench.html
  28. +1 −1 benchmarks/index.html
  29. +1 −1 benchmarks/uubench.js
  30. +1 −1 camera/index.html
  31. +1 −1 compass/index.html
  32. +1 −1 contacts/index.html
  33. +5 −6 cordova.js → cordova-incl.js
  34. +1 −1 events/index.html
  35. +1 −1 inappbrowser/index.html
  36. +1 −1 inappbrowser/local.html
  37. +2 −2 index.html
  38. +3 −3 lazyloadjs/index.html
  39. +1 −1 location/index.html
  40. +1 −1 misc/index.html
  41. +1 −1 misc/page2.html
  42. +1 −1 network/index.html
  43. +1 −1 notification/index.html
  44. +1 −1 splashscreen/index.html
  45. +1 −1 sql/index.html
  46. +1 −1 storage/index.html
View
@@ -5,10 +5,7 @@ These specs are designed to run inside the mobile device that implements it - _i
These set of tests is designed to be used with Cordova. You should initialize a fresh Cordova repository for a target platform and then toss these files into the www folder, replacing the
contents.
-Make sure you include cordova-\*.js in the www folder. You also need to edit cordova.js to reference the version of cordova-\*.js file you are testing.
-For example, to test with cordova-0.9.6.1, edit the VERSION variable in the cordova.js file as follows:
-
- var VERSION='0.9.6.1';
+Make sure you include cordova.js in the www folder (see the code in cordova-incl.js for clarification).
This is done so that you don't have to modify every HTML file when you want to test a new version of Cordova.
View
@@ -26,7 +26,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8">
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Audio Tests</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8">
@@ -76,4 +76,4 @@ jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = function() {
}
};
-jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);
View
@@ -29,7 +29,7 @@
<title>Cordova API Specs</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" src="../cordova.js"></script>
+ <script type="text/javascript" src="../cordova-incl.js"></script>
</head>
<body id="stage" class="theme">
<h1>Cordova API Specs</h1>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
View
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -35,7 +35,7 @@
<script type="text/javascript" src="../html/SpecView.js"></script>
<script type="text/javascript" src="../html/SuiteView.js"></script>
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -39,7 +39,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -36,7 +36,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
View
@@ -37,7 +37,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -37,7 +37,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
@@ -38,7 +38,7 @@
<script type="text/javascript" src="../html/TrivialReporter.js"></script>
<!-- Source -->
- <script type="text/javascript" src="../../cordova.js"></script>
+ <script type="text/javascript" src="../../cordova-incl.js"></script>
<!-- Load Test Runner -->
<script type="text/javascript" src="../test-runner.js"></script>
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8">
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script>
var exec = cordova.require('cordova/exec'),
@@ -25,7 +25,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8" src="uubench.js"></script>
<script type="text/javascript" charset="utf-8" src="licensecontents.js"></script>
<script>
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script>
var exec = cordova.require('cordova/exec'),
View
@@ -112,4 +112,4 @@ Suite.prototype.emit = function(type) {
uubench.Suite = Suite;
-})(typeof exports !== 'undefined' ? exports : window.uubench = {});
+})(typeof exports !== 'undefined' ? exports : window.uubench = {});
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8">
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8">
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8">
@@ -19,7 +19,6 @@
*
*/
-var VERSION='2.7.0';
var PLAT;
if (/Android/.exec(navigator.userAgent)) {
PLAT = 'android';
@@ -31,9 +30,9 @@ if (/Android/.exec(navigator.userAgent)) {
var scripts = document.getElementsByTagName('script');
var currentPath = scripts[scripts.length - 1].src;
-var platformCordovaPath = currentPath.replace("cordova.js", "cordova." + PLAT + ".js");
-var versionCordovaPath = currentPath.replace("cordova.js", "cordova-" + VERSION + ".js");
-var cordovaPath = versionCordovaPath;
+var platformCordovaPath = currentPath.replace("cordova-incl.js", "cordova." + PLAT + ".js");
+var normalCordovaPath = currentPath.replace("cordova-incl.js", "cordova.js");
+var cordovaPath = normalCordovaPath;
if (PLAT) {
// XHR to local file is an error on some platforms, windowsphone for one
@@ -44,7 +43,7 @@ if (PLAT) {
if (this.readyState == this.DONE && this.responseText.length > 0) {
if(parseInt(this.status) >= 400){
- cordovaPath = versionCordovaPath;
+ cordovaPath = normalCordovaPath;
}else{
cordovaPath = platformCordovaPath;
}
@@ -53,7 +52,7 @@ if (PLAT) {
xhr.send(null);
}
catch(e){
- cordovaPath = versionCordovaPath;
+ cordovaPath = normalCordovaPath;
} // access denied!
}
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8">
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8">
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
</head>
<body id="stage" class="theme">
<h1>InAppBrowser - Local URL</h1>
View
@@ -27,7 +27,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Cordova Mobile Spec</title>
<link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script>
</head>
@@ -52,7 +52,7 @@ <h4>User-Agent: <span id="user-agent"> </span></h4>
<a href="contacts/index.html" class="btn large">Contacts</a>
<a href="events/index.html" class="btn large">Events</a>
<a href="location/index.html" class="btn large">Location</a>
- <a href="lazyloadjs/index.html" class="btn large">Lazy Loading of cordova.js</a>
+ <a href="lazyloadjs/index.html" class="btn large">Lazy Loading of cordova-incl.js</a>
<a href="misc/index.html" class="btn large">Misc Content</a>
<a href="network/index.html" class="btn large">Network</a>
<a href="notification/index.html" class="btn large">Notification</a>
View
@@ -25,10 +25,10 @@
<head>
<meta name="viewport" content="width=device-width,height=device-height,user-scalable=no,initial-scale=1.0" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
- <title>Lazy-Loading of cordova.js test</title>
+ <title>Lazy-Loading of cordova-incl.js test</title>
<link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
<script>_doNotWriteCordovaScript = true</script>
- <script type="text/javascript" charset="utf-8" src="../cordova.js"></script>
+ <script type="text/javascript" charset="utf-8" src="../cordova-incl.js"></script>
<script type="text/javascript" charset="utf-8">
function init() {
document.addEventListener("deviceready", function() {
@@ -44,7 +44,7 @@
</script>
</head>
<body onload="init();" id="stage" class="theme">
- <h1>Lazy-Loading of cordova.js</h1>
+ <h1>Lazy-Loading of cordova-incl.js</h1>
<div id="info">
onDeviceReady has not yet fired.
</div>
Oops, something went wrong.

0 comments on commit 027ec1d

Please sign in to comment.