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
[22/37] spec commit: converted accel tests
converted accel tests
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/70be8ec8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/70be8ec8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/70be8ec8
Branch: refs/heads/master
Commit: 70be8ec839b0b0ce2312ac6dc1483dd4b308a3a6
Parents: 0a24c60
Author: Gord Tanner <gt...@gmail.com>
Authored: Mon Apr 2 22:33:51 2012 -0400
Committer: Fil Maj <ma...@gmail.com>
Committed: Mon Apr 16 16:06:35 2012 -0700
----------------------------------------------------------------------
autotest/pages/accelerometer.html | 34 ++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/70be8ec8/autotest/pages/accelerometer.html
----------------------------------------------------------------------
diff --git a/autotest/pages/accelerometer.html b/autotest/pages/accelerometer.html
index 25add29..1a5ad05 100644
--- a/autotest/pages/accelerometer.html
+++ b/autotest/pages/accelerometer.html
@@ -2,6 +2,7 @@
<html>
<<<<<<< HEAD
<<<<<<< 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;" />
@@ -53,6 +54,10 @@
=======
=======
>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+=======
+=======
+>>>>>>> converted accel tests
+>>>>>>> converted accel tests
<head>
<title>Cordova: Accelerometer API Specs</title>
@@ -74,6 +79,7 @@
<!-- Tests -->
<script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
+<<<<<<< HEAD
=======
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
@@ -123,6 +129,30 @@
<!-- Populated by tests -->
</div>
</body>
+=======
+
+ <script type="text/javascript">
+ document.addEventListener('deviceready', function () {
+ var jasmineEnv = jasmine.getEnv();
+ jasmineEnv.updateInterval = 1000;
+
+ var htmlReporter = new jasmine.HtmlReporter();
+
+ jasmineEnv.addReporter(htmlReporter);
+
+ jasmineEnv.specFilter = function(spec) {
+ return htmlReporter.specFilter(spec);
+ };
+
+ jasmineEnv.execute();
+ }, false);
+ </script>
+</head>
+
+<body>
+ <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+>>>>>>> converted accel tests
</html>
>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
@@ -133,6 +163,7 @@
var htmlReporter = new jasmine.HtmlReporter();
+<<<<<<< HEAD
jasmineEnv.addReporter(htmlReporter);
jasmineEnv.specFilter = function(spec) {
@@ -149,3 +180,6 @@
</body>
>>>>>>> converted accel tests
</html>
+=======
+
+>>>>>>> converted accel tests