You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/04/18 23:49:52 UTC
[28/37] spec commit: fixed html errors, and various html tweaks,
doctype, javascript:
fixed html errors, and various html tweaks, doctype, javascript:
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/33b55bf3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/33b55bf3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/33b55bf3
Branch: refs/heads/master
Commit: 33b55bf3f39a81929dd547b3d9a64b269242d4e9
Parents: 85dd586
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed Apr 4 17:02:04 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Mon Apr 16 16:05:50 2012 -0700
----------------------------------------------------------------------
autotest/pages/accelerometer.html | 54 +++++++++++++++++++++++++
autotest/pages/all.html | 69 ++++++++++++++++++++++++++++++++
autotest/pages/battery.html | 56 ++++++++++++++++++++++++++
autotest/pages/camera.html | 56 ++++++++++++++++++++++++++
autotest/pages/capture.html | 54 +++++++++++++++++++++++++
autotest/pages/compass.html | 57 ++++++++++++++++++++++++++
autotest/pages/contacts.html | 57 ++++++++++++++++++++++++++
autotest/pages/device.html | 57 ++++++++++++++++++++++++++
autotest/pages/geolocation.html | 57 ++++++++++++++++++++++++++
autotest/pages/media.html | 57 ++++++++++++++++++++++++++
autotest/pages/network.html | 57 ++++++++++++++++++++++++++
autotest/pages/notification.html | 57 ++++++++++++++++++++++++++
autotest/pages/platform.html | 57 ++++++++++++++++++++++++++
autotest/pages/storage.html | 57 ++++++++++++++++++++++++++
misc/index.html | 6 +++
misc/page2.html | 4 ++
16 files changed, 812 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/accelerometer.html
----------------------------------------------------------------------
diff --git a/autotest/pages/accelerometer.html b/autotest/pages/accelerometer.html
index 266f1bf..25add29 100644
--- a/autotest/pages/accelerometer.html
+++ b/autotest/pages/accelerometer.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -50,6 +51,8 @@
</div>
</body>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Accelerometer API Specs</title>
@@ -71,6 +74,57 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Accelerometer API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Accelerometer API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/all.html
----------------------------------------------------------------------
diff --git a/autotest/pages/all.html b/autotest/pages/all.html
index 33ec8c5..d12345c 100644
--- a/autotest/pages/all.html
+++ b/autotest/pages/all.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -63,6 +64,8 @@
</div>
</body>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: API Specs</title>
@@ -119,5 +122,71 @@
<body>
<a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
</body>
+<<<<<<< HEAD
>>>>>>> converted all (commented out file for now)
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: All API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
+ <script type="text/javascript" src="../tests/battery.tests.js"></script>
+ <script type="text/javascript" src="../tests/capture.tests.js"></script>
+ <script type="text/javascript" src="../tests/compass.tests.js"></script>
+ <script type="text/javascript" src="../tests/contacts.tests.js"></script>
+ <script type="text/javascript" src="../tests/camera.tests.js"></script>
+ <script type="text/javascript" src="../tests/device.tests.js"></script>
+ <script type="text/javascript" src="../tests/file.tests.js"></script>
+ <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
+ <script type="text/javascript" src="../tests/media.tests.js"></script>
+ <script type="text/javascript" src="../tests/network.tests.js"></script>
+ <script type="text/javascript" src="../tests/notification.tests.js"></script>
+ <script type="text/javascript" src="../tests/platform.tests.js"></script>
+ <script type="text/javascript" src="../tests/storage.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: All API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
</html>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/battery.html
----------------------------------------------------------------------
diff --git a/autotest/pages/battery.html b/autotest/pages/battery.html
index 89b7766..49c9511 100644
--- a/autotest/pages/battery.html
+++ b/autotest/pages/battery.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -50,6 +51,8 @@
</div>
</body>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Battery API Specs</title>
@@ -92,7 +95,60 @@
<body>
<a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
</body>
+<<<<<<< HEAD
>>>>>>> added jasmine runner and ported battery tests
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Battery API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/battery.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Battery API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
</html>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/camera.html
----------------------------------------------------------------------
diff --git a/autotest/pages/camera.html b/autotest/pages/camera.html
index f2a01f3..52b2a87 100644
--- a/autotest/pages/camera.html
+++ b/autotest/pages/camera.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -50,6 +51,8 @@
</div>
</body>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Camera API Specs</title>
@@ -93,7 +96,60 @@
<body>
<a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
</body>
+<<<<<<< HEAD
>>>>>>> converted camera tests
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Camera API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/camera.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Camera API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
</html>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/capture.html
----------------------------------------------------------------------
diff --git a/autotest/pages/capture.html b/autotest/pages/capture.html
index abe2f2b..5b08e46 100644
--- a/autotest/pages/capture.html
+++ b/autotest/pages/capture.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -50,6 +51,8 @@
</div>
</body>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Capture API Specs</title>
@@ -71,6 +74,57 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/capture.tests.js"></script>
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Capture API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/capture.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Capture API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/compass.html
----------------------------------------------------------------------
diff --git a/autotest/pages/compass.html b/autotest/pages/compass.html
index 84a6b3d..1305d6b 100644
--- a/autotest/pages/compass.html
+++ b/autotest/pages/compass.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -51,6 +52,8 @@
</body>
</html>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Compass API Specs</title>
@@ -72,7 +75,61 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/compass.tests.js"></script>
+<<<<<<< HEAD
>>>>>>> converted some more tests to jasmine
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Compass API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/compass.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Compass API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/contacts.html
----------------------------------------------------------------------
diff --git a/autotest/pages/contacts.html b/autotest/pages/contacts.html
index 1d93515..967bc0e 100644
--- a/autotest/pages/contacts.html
+++ b/autotest/pages/contacts.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -51,6 +52,8 @@
</body>
</html>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Contacts API Specs</title>
@@ -72,7 +75,61 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/contacts.tests.js"></script>
+<<<<<<< HEAD
>>>>>>> converted some more tests to jasmine
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Contacts API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/contacts.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Contacts API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/device.html
----------------------------------------------------------------------
diff --git a/autotest/pages/device.html b/autotest/pages/device.html
index 3373ce9..1e8c23f 100644
--- a/autotest/pages/device.html
+++ b/autotest/pages/device.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -51,6 +52,8 @@
</body>
</html>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Device API Specs</title>
@@ -72,7 +75,61 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/device.tests.js"></script>
+<<<<<<< HEAD
>>>>>>> converted some more tests to jasmine
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Device API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/device.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Device API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/geolocation.html
----------------------------------------------------------------------
diff --git a/autotest/pages/geolocation.html b/autotest/pages/geolocation.html
index e87fba5..cba0386 100644
--- a/autotest/pages/geolocation.html
+++ b/autotest/pages/geolocation.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -51,6 +52,8 @@
</body>
</html>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Geolocation API Specs</title>
@@ -72,7 +75,61 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/geolocation.tests.js"></script>
+<<<<<<< HEAD
>>>>>>> converted some more tests to jasmine
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Geolocation API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Geolocation API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/media.html
----------------------------------------------------------------------
diff --git a/autotest/pages/media.html b/autotest/pages/media.html
index b788d74..2be19bc 100644
--- a/autotest/pages/media.html
+++ b/autotest/pages/media.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -51,6 +52,8 @@
</body>
</html>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Media API Specs</title>
@@ -72,7 +75,61 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/media.tests.js"></script>
+<<<<<<< HEAD
>>>>>>> converted some more tests to jasmine
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Media API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/media.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Media API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/network.html
----------------------------------------------------------------------
diff --git a/autotest/pages/network.html b/autotest/pages/network.html
index b8fc3b0..76c352e 100644
--- a/autotest/pages/network.html
+++ b/autotest/pages/network.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -51,6 +52,8 @@
</body>
</html>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Network API Specs</title>
@@ -72,7 +75,61 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/network.tests.js"></script>
+<<<<<<< HEAD
>>>>>>> converted some more tests to jasmine
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Network API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/network.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Network API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/notification.html
----------------------------------------------------------------------
diff --git a/autotest/pages/notification.html b/autotest/pages/notification.html
index 423b7b1..2bd5c07 100644
--- a/autotest/pages/notification.html
+++ b/autotest/pages/notification.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -51,6 +52,8 @@
</body>
</html>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Notification API Specs</title>
@@ -72,7 +75,61 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/notification.tests.js"></script>
+<<<<<<< HEAD
>>>>>>> converted some more tests to jasmine
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Notification API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/notification.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Notification API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/platform.html
----------------------------------------------------------------------
diff --git a/autotest/pages/platform.html b/autotest/pages/platform.html
index 032a5bb..86e36c6 100644
--- a/autotest/pages/platform.html
+++ b/autotest/pages/platform.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -51,6 +52,8 @@
</body>
</html>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Platform API Specs</title>
@@ -72,7 +75,61 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/platform.tests.js"></script>
+<<<<<<< HEAD
>>>>>>> converted some more tests to jasmine
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Platform API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/platform.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Platform API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/autotest/pages/storage.html
----------------------------------------------------------------------
diff --git a/autotest/pages/storage.html b/autotest/pages/storage.html
index 8bbacd2..901eca9 100644
--- a/autotest/pages/storage.html
+++ b/autotest/pages/storage.html
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -51,6 +52,8 @@
</body>
</html>
=======
+=======
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<head>
<title>Cordova: Storage API Specs</title>
@@ -72,7 +75,61 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/storage.tests.js"></script>
+<<<<<<< HEAD
>>>>>>> converted some more tests to jasmine
+=======
+=======
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+ <title>Cordova: Storage API Specs</title>
+
+ <!-- Load QUnit -->
+ <link rel="stylesheet" type="text/css" href="../qunit.css" />
+ <script type="text/javascript" src="../qunit.js"></script>
+
+ <!-- Source -->
+ <script type="text/javascript" src="../../phonegap.js"></script>
+
+ <!-- Load Test Runner -->
+ <script type="text/javascript" src="../test-runner.js"></script>
+
+ <!-- Tests -->
+ <script type="text/javascript" src="../tests/storage.tests.js"></script>
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function() {
+ console.log('running tests');
+ var tests = new Tests();
+
+ // Each group of tests are declared as a function in the object `Tests`.
+ // A group of tests are identified by a name that contains the word 'Tests'.
+ //
+ // Load each group of tests into QUnit
+ for (var t in tests) {
+ if (t.indexOf('Tests') > -1) {
+ tests[t]();
+ }
+ }
+
+ // Start the QUnit test suite
+ QUnit.start();
+ }, false);
+ </script>
+ </head>
+ <body>
+ <div class="backBtn" onclick="backHome();">Back</div>
+ <h1 id="qunit-header">Cordova: Storage API Specs</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <div id="qunit-fixture">
+ <!-- Populated by tests -->
+ </div>
+ </body>
+</html>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<script type="text/javascript">
document.addEventListener('deviceready', function () {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/misc/index.html
----------------------------------------------------------------------
diff --git a/misc/index.html b/misc/index.html
index faf61ca..ce47b74 100755
--- a/misc/index.html
+++ b/misc/index.html
@@ -43,9 +43,15 @@
</div>
<h2>Action</h2>
<div class="btn large" onclick="document.location='tel:5551212';" >Call 411</div>
+<<<<<<< HEAD
<a href="mailto:bob@abc.org?subject=My Subject&body=This is the body.%0D%0ANew line." class="btn large">Send Mail</a>
<a href="sms:5125551234?body=The SMS message." class="btn large">Send SMS</a>
<a href="http://www.google.com" class="btn large">Load Web Site</a>
+=======
+ <a href="mailto:bob@abc.org?subject=My Subject&body=This is the body.%0D%0ANew line." class="btn large">Send Mail</div>
+ <a href="sms:5125551234?body=The SMS message." class="btn large">Send SMS</div>
+ <a href="http://www.google.com" class="btn large">Load Web Site</div>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
<!-- Need new URL -->
<!-- a href="http://handle.library.cornell.edu/control/authBasic/authTest/" class="btn large">Basic Auth: test/this</a -->
<a href="page2.html" hrefbad="page2.html?me=test" class="btn large">Load another PhoneGap page</a>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/33b55bf3/misc/page2.html
----------------------------------------------------------------------
diff --git a/misc/page2.html b/misc/page2.html
index 9d16a8f..c38e2c7 100755
--- a/misc/page2.html
+++ b/misc/page2.html
@@ -20,6 +20,10 @@
<h4>Width: <span id="width"> </span>, Height: <span id="height">
</span>, Color Depth: <span id="colorDepth"></span></h4>
</div>
+<<<<<<< HEAD
<div ><button class="backBtn" onclick="backHome();">Back</button></div>
+=======
+ <div ><button onclick="history.back();">Back</button></div>
+>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
</body>
</html>