You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/04/20 23:33:30 UTC
[12/16] changed test project to use updated tests + jasmine
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/d62a7909/tests/MobileSpecUnitTests/www/misc/index.html
----------------------------------------------------------------------
diff --git a/tests/MobileSpecUnitTests/www/misc/index.html b/tests/MobileSpecUnitTests/www/misc/index.html
index 023678d..ce47b74 100644
--- a/tests/MobileSpecUnitTests/www/misc/index.html
+++ b/tests/MobileSpecUnitTests/www/misc/index.html
@@ -43,12 +43,18 @@
</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?me=test" class="btn large">Load another PhoneGap page</a>
+ <a href="page2.html" hrefbad="page2.html?me=test" class="btn large">Load another PhoneGap page</a>
<h2>Android Only</h2>
<a href="geo:0,0?q=11400 Burnet Rd, Austin, TX" class="btn large">Map IBM</a>
<a href="market://search?q=google" class="btn large">Search Android market</a>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/d62a7909/tests/MobileSpecUnitTests/www/misc/page2.html
----------------------------------------------------------------------
diff --git a/tests/MobileSpecUnitTests/www/misc/page2.html b/tests/MobileSpecUnitTests/www/misc/page2.html
index ee6c398..c38e2c7 100644
--- a/tests/MobileSpecUnitTests/www/misc/page2.html
+++ b/tests/MobileSpecUnitTests/www/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>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/d62a7909/tests/MobileSpecUnitTests/www/phonegap.js
----------------------------------------------------------------------
diff --git a/tests/MobileSpecUnitTests/www/phonegap.js b/tests/MobileSpecUnitTests/www/phonegap.js
index 044a06b..bba5600 100644
--- a/tests/MobileSpecUnitTests/www/phonegap.js
+++ b/tests/MobileSpecUnitTests/www/phonegap.js
@@ -1,6 +1,6 @@
-document.write('<script type="text/javascript" charset="utf-8" src="../../cordova.wp7.js"></script>');
-document.write('<script type="text/javascript" charset="utf-8" src="../cordova.wp7.js"></script>');
-document.write('<script type="text/javascript" charset="utf-8" src="cordova.wp7.js"></script>');
+document.write('<script type="text/javascript" charset="utf-8" src="../../cordova-1.6.1.js"></script>');
+document.write('<script type="text/javascript" charset="utf-8" src="../cordova-1.6.1.js"></script>');
+document.write('<script type="text/javascript" charset="utf-8" src="cordova-1.6.1.js"></script>');
function backHome() {