incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [20/37] spec commit: converted capture tests
Date Wed, 18 Apr 2012 21:49:52 GMT
converted capture 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/b4b0f935
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/b4b0f935
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/b4b0f935

Branch: refs/heads/master
Commit: b4b0f93589f59538f11e03cc0f142cb5a98c5b7e
Parents: 1a0de18
Author: Gord Tanner <gtanner@gmail.com>
Authored: Mon Apr 2 22:57:23 2012 -0400
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Apr 16 16:06:39 2012 -0700

----------------------------------------------------------------------
 autotest/pages/capture.html |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/b4b0f935/autotest/pages/capture.html
----------------------------------------------------------------------
diff --git a/autotest/pages/capture.html b/autotest/pages/capture.html
index 5b08e46..de32511 100644
--- a/autotest/pages/capture.html
+++ b/autotest/pages/capture.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, &nbsp;
javascript:
+=======
+=======
+>>>>>>> converted capture tests
+>>>>>>> converted capture tests
 <head>
   <title>Cordova: Capture API Specs</title>
 
@@ -74,6 +79,7 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/capture.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 capture tests
 </html>
 >>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp;
javascript:
 


Mime
View raw message