You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bc...@apache.org on 2012/04/25 16:37:18 UTC
spec commit: Fixing HTML tags again.
Updated Branches:
refs/heads/master 4fdc417fa -> d6b8a5874
Fixing HTML tags again.
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/d6b8a587
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/d6b8a587
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/d6b8a587
Branch: refs/heads/master
Commit: d6b8a5874d58660885e59262b9428d3adf94317e
Parents: 4fdc417
Author: Bryce Curtis <cu...@gmail.com>
Authored: Wed Apr 25 09:37:07 2012 -0500
Committer: Bryce Curtis <cu...@gmail.com>
Committed: Wed Apr 25 09:37:07 2012 -0500
----------------------------------------------------------------------
misc/index.html | 6 ------
misc/page2.html | 4 ----
2 files changed, 0 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/d6b8a587/misc/index.html
----------------------------------------------------------------------
diff --git a/misc/index.html b/misc/index.html
index ce47b74..faf61ca 100755
--- a/misc/index.html
+++ b/misc/index.html
@@ -43,15 +43,9 @@
</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/d6b8a587/misc/page2.html
----------------------------------------------------------------------
diff --git a/misc/page2.html b/misc/page2.html
index c38e2c7..9d16a8f 100755
--- a/misc/page2.html
+++ b/misc/page2.html
@@ -20,10 +20,6 @@
<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>
Re: spec commit: Fixing HTML tags again.
Posted by Filip Maj <fi...@adobe.com>.
Totally my bad. I went through a hairy rebase when I merged in jasmine and
obviously missed those. Sorry!
On 4/25/12 7:37 AM, "bcurtis@apache.org" <bc...@apache.org> wrote:
>Updated Branches:
> refs/heads/master 4fdc417fa -> d6b8a5874
>
>
>Fixing HTML tags again.
>
>
>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/commi
>t/d6b8a587
>Tree:
>http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/
>d6b8a587
>Diff:
>http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/
>d6b8a587
>
>Branch: refs/heads/master
>Commit: d6b8a5874d58660885e59262b9428d3adf94317e
>Parents: 4fdc417
>Author: Bryce Curtis <cu...@gmail.com>
>Authored: Wed Apr 25 09:37:07 2012 -0500
>Committer: Bryce Curtis <cu...@gmail.com>
>Committed: Wed Apr 25 09:37:07 2012 -0500
>
>----------------------------------------------------------------------
> misc/index.html | 6 ------
> misc/page2.html | 4 ----
> 2 files changed, 0 insertions(+), 10 deletions(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/
>d6b8a587/misc/index.html
>----------------------------------------------------------------------
>diff --git a/misc/index.html b/misc/index.html
>index ce47b74..faf61ca 100755
>--- a/misc/index.html
>+++ b/misc/index.html
>@@ -43,15 +43,9 @@
> </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/
>d6b8a587/misc/page2.html
>----------------------------------------------------------------------
>diff --git a/misc/page2.html b/misc/page2.html
>index c38e2c7..9d16a8f 100755
>--- a/misc/page2.html
>+++ b/misc/page2.html
>@@ -20,10 +20,6 @@
> <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>
>