incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [26/37] spec commit: on wp7 sessionStorage does not exist until just before device ready
Date Wed, 18 Apr 2012 21:49:52 GMT
on wp7 sessionStorage does not exist until just before device ready


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/a5176662
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/a5176662
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/a5176662

Branch: refs/heads/master
Commit: a5176662b7e3a547df4b9d16468ec58008ffe0da
Parents: 545f923
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Thu Apr 5 16:32:19 2012 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Apr 16 16:05:58 2012 -0700

----------------------------------------------------------------------
 autotest/test-runner.js |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/a5176662/autotest/test-runner.js
----------------------------------------------------------------------
diff --git a/autotest/test-runner.js b/autotest/test-runner.js
index 49a5671..d64bb45 100644
--- a/autotest/test-runner.js
+++ b/autotest/test-runner.js
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 // Prevent QUnit from running when the DOM load event fires
 QUnit.config.autostart = false;
 if (window.sessionStorage != null) {
@@ -7,6 +8,16 @@ if (window.sessionStorage != null) {
 =======
 sessionStorage.clear();
 >>>>>>> updated test-runner and changed title of battery tests
+=======
+sessionStorage.clear();
+=======
+// Prevent QUnit from running when the DOM load event fires
+QUnit.config.autostart = false;
+if (window.sessionStorage != null) {
+    window.sessionStorage.clear();
+}
+>>>>>>> on wp7 sessionStorage does not exist until just before device
ready
+>>>>>>> on wp7 sessionStorage does not exist until just before device
ready
 
 // Timeout is 2 seconds to allow physical devices enough
 // time to query the response. This is important for some


Mime
View raw message