Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added 'id' bindings to jQueryMobile #359

Merged
merged 3 commits into from
Jan 16, 2013
Merged

Added 'id' bindings to jQueryMobile #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12f8f2a
Added 'id' binding to input elements
swklein Jan 16, 2013
14ae5b7
Merge remote-tracking branch 'upstream/integration' into integration
swklein Jan 16, 2013
730eb7f
Revert Movies.h2.db in JqueryMobileExample
swklein Jan 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMCheckbox.api
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<wodefinitions>
<wo class="ERQMCheckbox" wocomponentcontent="true">
<binding name="id"/>
<binding name="value"/>
<binding name="string"/>
<binding name="checked"/>
Expand Down
3 changes: 2 additions & 1 deletion Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputColor.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
<binding defaults="Boolean" name="hideLabel"/>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
</wo>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputDate.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputDateTime.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputDateTimeLocal.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputFlipSwitch.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
<binding name="theme"/>
<binding defaults="Boolean" name="mini"/>
<binding name="name"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputMail.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputMonth.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="id"/>
</wo>
</wodefinitions>
3 changes: 2 additions & 1 deletion Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputNumber.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
</wo>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputPassword.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputRange.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
<binding name="themeTrack"/>
<binding defaults="Boolean" name="mini"/>
<binding name="name"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputSearch.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
</validation>
<binding defaults="Boolean" name="mini"/>
<binding name="name"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputString.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
<binding defaults="Boolean" name="hideLabel"/>
<binding defaults="Boolean" name="mini"/>
<binding name="name"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputTel.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="countryNumber"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputText.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
<binding defaults="Boolean" name="hideLabel"/>
<binding defaults="Boolean" name="mini"/>
<binding name="name"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputTime.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputUrl.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMInputWeek.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
</validation>
<binding name="name"/>
<binding defaults="Boolean" name="mini"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMListViewElement.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
<binding name="linkResource"/>
<binding defaults="Boolean" name="isDialogCall"/>
<binding name="queryDictionary"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMListViewIcon.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<validation message="'imageResource' is a required binding.">
<unbound name="imageResource"/>
</validation>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMListViewImage.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<validation message="'imageResource' is a required binding.">
<unbound name="imageResource"/>
</validation>
<binding name="id"/>
</wo>
</wodefinitions>
3 changes: 2 additions & 1 deletion Frameworks/Ajax/ERJQueryMobile/Components/ERQMNavBar.api
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<wodefinitions>
<wo class="ERQMNavBar" wocomponentcontent="true"> </wo>
<wo class="ERQMNavBar" wocomponentcontent="true"> <binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMPopUpButton.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
<binding name="displayString"/>
<binding defaults="Boolean" name="disabled"/>
<binding name="noSelectionString"/>
<binding name="id"/>
</wo>
</wodefinitions>
1 change: 1 addition & 0 deletions Frameworks/Ajax/ERJQueryMobile/Components/ERQMSubmitButton.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
<binding defaults="Boolean" name="mini"/>
<binding name="actionClass"/>
<binding name="directActionName"/>
<binding name="id"/>
</wo>
</wodefinitions>
2 changes: 1 addition & 1 deletion ...works/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMListView.wo/ERQMListView.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<wo:genericContainer elementName="$elementName" data-role="listview" data-theme="$^theme" data-count-theme="$^countBubble-theme" data-inset="$^inset" data-filter="$^filter" data-split-icon="$^split-icon" data-split-theme="$^split-theme" data-divider-theme="$^divider-theme" data-filter-placeholder="$^filterString"><wo:content /></wo:genericContainer>
<wo:genericContainer elementName="$elementName" id="$javaScriptElementID" data-role="listview" data-theme="$^theme" data-count-theme="$^countBubble-theme" data-inset="$^inset" data-filter="$^filter" data-split-icon="$^split-icon" data-split-theme="$^split-theme" data-divider-theme="$^divider-theme" data-filter-placeholder="$^filterString"><wo:content /></wo:genericContainer>
4 changes: 2 additions & 2 deletions ...QueryMobile/Components/Nonlocalized.lproj/ERQMListViewElement.wo/ERQMListViewElement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<wo:if condition="$hasAutomaticDivider">
<wo:if condition="$autoDivider">
<li data-role="list-divider"><wo:str value="$firstLetter" /></li>
<wo:genericContainer elementName="li" data-role="list-divider" id="$javaScriptElementID" ><wo:str value="$firstLetter" /></wo:genericContainer>
</wo:if>
</wo:if>
<wo:genericContainer elementName="li" otherTagString="$html">
<wo:genericContainer elementName="li" otherTagString="$html" id="$javaScriptElementID" >
<wo:if condition="$hasAction">
<wo:ERXHyperlinkResource action="$^action" data-rel="$dataRel" queryDictionary = "$^queryDictionary">
<wo:content />
Expand Down
2 changes: 1 addition & 1 deletion ...ax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMListViewIcon.wo/ERQMListViewIcon.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<wo:image framework="$imageResource.framework" filename="$imageResource.fileName" class="ui-li-icon" alt="$^alt" />
<wo:image framework="$imageResource.framework" filename="$imageResource.fileName" class="ui-li-icon" alt="$^alt" id="$javaScriptElementID" />
2 changes: 1 addition & 1 deletion .../ERJQueryMobile/Components/Nonlocalized.lproj/ERQMListViewImage.wo/ERQMListViewImage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<wo:image framework="$imageResource.framework" filename="$imageResource.fileName" height="80" width="80" alt="$^alt" />
<wo:image framework="$imageResource.framework" filename="$imageResource.fileName" height="80" width="80" alt="$^alt" id="$javaScriptElementID" />
4 changes: 2 additions & 2 deletions Frameworks/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMNavBar.wo/ERQMNavBar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div data-role="navbar">
<wo:genericElement elementName = "div" id="$javaScriptElementID" data-role = "navbar">
<ul><wo:content /></ul>
</div>
</wo:genericElement>
4 changes: 2 additions & 2 deletions .../ERJQueryMobile/Components/Nonlocalized.lproj/ERQMNavBarElement.wo/ERQMNavBarElement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<li>
<wo:if condition="$hasAction"> <wo:hyperlink action="$^action" class="$selected" string="$^string" data-icon="$^icon" /> </wo:if>
<wo:else> <wo:ERXHyperlinkResource linkResource="$^linkResource" class="$selected" string="$^string" data-icon="$^icon" /> </wo:else>
<wo:if condition="$hasAction"> <wo:hyperlink action="$^action" class="$selected" string="$^string" data-icon="$^icon" id = "$javaScriptElementID" /> </wo:if>
<wo:else> <wo:ERXHyperlinkResource linkResource="$^linkResource" class="$selected" string="$^string" data-icon="$^icon" id = "$javaScriptElementID" /> </wo:else>
</li>
2 changes: 2 additions & 0 deletions ...jax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMSubmitButton.wo/ERQMSubmitButton.wod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ACTION : WOSubmitButton {
data-iconpos = ^iconpos;
otherTagString = miniVersion;
data-ajax = "false";
id = javaScriptElementID;
}


Expand All @@ -32,4 +33,5 @@ DIRECTACTION : WOSubmitButton {
data-inline = ^inline;
data-iconpos = ^iconpos;
otherTagString = miniVersion;
id = javaScriptElementID;
}
5 changes: 3 additions & 2 deletions ...eworks/Ajax/ERJQueryMobile/Sources/er/jquerymobile/components/ERQMInputBaseComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ public ERQMInputBaseComponent(WOContext aContext) {
//********************************************************************

public String javaScriptElementID() {
if(ERXStringUtilities.stringIsNullOrEmpty(elementID))
elementID = context().javaScriptElementID();
if(ERXStringUtilities.stringIsNullOrEmpty(elementID)) {
elementID = stringValueForBinding("id", context().javaScriptElementID());
}

return elementID;
}
Expand Down
Loading