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

"disabled" feature #379

Merged
merged 2 commits into from
Feb 8, 2013
Merged

"disabled" feature #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f13a51
"disabled" feature
recurve Feb 7, 2013
373cd81
Forgot to add "disabled" to .api file in recent commit.
recurve Feb 8, 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
2 changes: 1 addition & 1 deletion Frameworks/Core/ERExtensions/Components/ERXRadioButtonMatrix.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
<validation message="'item' must be bound to a settable value">
<unsettable name="item"/>
</validation>
<binding name="disabled"/>
<binding defaults="Boolean" name="disabled"/>
</wo>
</wodefinitions>
2 changes: 1 addition & 1 deletion ...xtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<webobject name=RadioButtonRepetition><table border=0 cellpadding=0 cellspacing=0 class="ERXMatrixTable"><tr><td><webobject name=RadioButton></webobject></td><td class="ERXMatrixTableCell"><webobject name=Content></webobject></td></tr></table></webobject>
<webobject name=RadioButtonRepetition><table border=0 cellpadding=0 cellspacing=0 class="ERXMatrixTable"><tr><td><wo:if condition="$disabled"><webobject name="RadioButtonDisabled"/></wo:if><wo:else><webobject name="RadioButton"/></wo:else></td><td class="ERXMatrixTableCell"><webobject name=Content></webobject></td></tr></table></webobject>
9 changes: 9 additions & 0 deletions ...Extensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.wod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ RadioButton: WOGenericElement {
value = index;
}

RadioButtonDisabled: WOGenericElement {
elementName = "input";
name = uniqueID;
otherTagString = isCurrentItemSelected;
type = "radio";
value = index;
disabled = true;
}

RadioButtonRepetition: ERXTable {
cellpadding = cellpadding;
cellspacing = cellspacing;
Expand Down
8 changes: 4 additions & 4 deletions Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXRadioButtonMatrix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ public void setCurrentItem(Object aValue) {
public Number index() {
return index;
}

public boolean disabled() {
return booleanValueForBinding("disabled", false);
}

public void setIndex(Number newIndex) {
index = newIndex;
Expand Down Expand Up @@ -107,10 +111,6 @@ public String otherTagStringForRadioButton() {
return (isDisabled ? "disabled" : "") + (isDisabled && isChecked? " " : "") + (isChecked ? "checked" : "");
}

public boolean disabled() {
return booleanValueForBinding("disabled", false);
}

@Override
public void awake() {
super.awake();
Expand Down
2 changes: 1 addition & 1 deletion .../JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<webobject name=CheckBoxWrapper>
<webobject name=CheckBoxRepetition>
<table border=0 cellpadding=0 cellspacing=0><tr><td><webobject name=CheckBox></webobject></td><td><webobject name=Content></webobject></td></tr></table>
<table border=0 cellpadding=0 cellspacing=0><tr><td><webobject name = "isDisabledConditional"><webobject name="disabledCheckBox"></webobject></webobject><webobject name = "isEnabledConditional"><webobject name="CheckBox"></webobject></webobject></td><td><webobject name=Content></webobject></td></tr></table>
</webobject>
</webobject>
19 changes: 18 additions & 1 deletion ...e/JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.wod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@

isDisabledConditional : WOConditional {
condition = ^disabled;
}

isEnabledConditional : WOConditional {
condition = ^disabled;
negate = true;
}

CheckBox: WOGenericElement {
elementName = "input";
name = wrapperElementID;
Expand All @@ -7,6 +15,15 @@ CheckBox: WOGenericElement {
value = index;
}

disabledCheckBox: WOGenericElement {
elementName = "input";
name = wrapperElementID;
otherTagString = isCurrentItemChecked;
type = "checkbox";
value = index;
disabled = "disabled";
}

CheckBoxRepetition: WOTable {
cellpadding = 0;
cellspacing = 0;
Expand Down
7 changes: 4 additions & 3 deletions Frameworks/Core/JavaWOExtensions/Components/WOCheckboxMatrix.api
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml version="1.0" encoding="UTF-8"?>
<wodefinitions>
<wo class="WOCheckboxMatrix" wocomponentcontent="true">
<image path="WOCheckboxMatrix.tiff"/>
Expand All @@ -15,5 +15,6 @@
<validation message="'item' is a required binding">
<unbound name="item"/>
</validation>
</wo>
</wodefinitions>
<binding name="disabled"/>
</wo>
</wodefinitions>