Skip to content

Revert non-ajax support #402

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

Merged
martin-g merged 2 commits into from
May 8, 2015
Merged

Revert non-ajax support #402

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
d46d150
Revert non-ajax support from commit 1f7aaeb
tgoetz May 4, 2015
e1b0039
Update readme.md
bitstorm May 4, 2015
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
42 changes: 0 additions & 42 deletions ...arent/select2-parent/select2-examples/src/main/java/org/wicketstuff/select2/HomePage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,28 +43,6 @@ <h1>Single-Select <small>Ajax result loading. Paging with infinite scrolling. Mi
</div>
</div>
</section>

<section>
<div class="page-header">
<h1>Single-Select <small>Non-ajax result loading.</small></h1>
</div>
<div class="row">
<div class="span12">
<p>
Country currently selected: <strong><span
wicket:id="country-non-ajax"></span> </strong>
</p>
<form wicket:id="single-non-ajax">
<input wicket:id="country-non-ajax" type="hidden"
style="width: 300px;" />
<div class="form-actions">
<button type="submit" class="btn">Submit</button>
</div>
</form>
</div>
</div>
</section>

<section>
<div class="page-header">
<h1>Multi-Select <small>Ajax result loading. Paging with infinite scrolling. Minimum input length. Drag &amp; Drop</small></h1>
Expand All @@ -85,26 +63,6 @@ <h1>Multi-Select <small>Ajax result loading. Paging with infinite scrolling. Min
</div>
</div>
</section>
<section>
<div class="page-header">
<h1>Multi-Select <small>Non-ajax result loading.</small></h1>
</div>
<div class="row">
<div class="span12">
<p>
Countries currently selected: <strong><span
wicket:id="countries-non-ajax"></span> </strong>
</p>
<form wicket:id="multi-non-ajax">
<input wicket:id="countries-non-ajax"
type="hidden" style="width: 300px;" />
<div class="form-actions">
<button type="submit" class="btn">Submit</button>
</div>
</form>
</div>
</div>
</section>
</div>
</body>
</html>
40 changes: 2 additions & 38 deletions ...arent/select2-parent/select2-examples/src/main/java/org/wicketstuff/select2/HomePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.PropertyModel;

Expand All @@ -37,14 +36,12 @@ public class HomePage extends WebPage
@SuppressWarnings("unused")
private Country country = Country.US;
@SuppressWarnings("unused")
private List<Country> countries = new ArrayList<>(Arrays.asList(new Country[] { Country.US,
Country.CA }));
private List<Country> countries = new ArrayList<>(Arrays.asList(
new Country[] { Country.US, Country.CA }));

public HomePage()
{

// single-select example

add(new Label("country", new PropertyModel<>(this, "country")));

Form<?> form = new Form<Void>("single");
Expand All @@ -55,18 +52,7 @@ public HomePage()
country.getSettings().setMinimumInputLength(1);
form.add(country);

add(new Label("country-non-ajax", new PropertyModel<>(this, "country")));

Form<?> nonAjaxform = new Form<Void>("single-non-ajax");
add(nonAjaxform);
Select2Choice<Country> nonAjaxCountry = new Select2Choice<>("country-non-ajax",
new PropertyModel<Country>(this, "country"), Arrays.asList(Country.values()),
new CountriesRenderer());
nonAjaxCountry.getSettings().setMinimumInputLength(1);
nonAjaxform.add(nonAjaxCountry);

// multi-select example

add(new Label("countries", new PropertyModel<>(this, "countries")));

Form<?> multi = new Form<Void>("multi");
Expand All @@ -77,17 +63,6 @@ public HomePage()
countries.getSettings().setMinimumInputLength(1);
countries.add(new DragAndDropBehavior());
multi.add(countries);

add(new Label("countries-non-ajax", new PropertyModel<>(this, "countries")));
Form<?> nonAjaxMulti = new Form<Void>("multi-non-ajax");
add(nonAjaxMulti);

countries = new Select2MultiChoice<>("countries-non-ajax",
new PropertyModel<Collection<Country>>(this, "countries"),
Arrays.asList(Country.values()), new CountriesRenderer());
countries.getSettings().setMinimumInputLength(1);
countries.add(new DragAndDropBehavior());
nonAjaxMulti.add(countries);
}

/**
Expand All @@ -105,11 +80,8 @@ public HomePage()
*/
private static List<Country> queryMatches(String term, int page, int pageSize)
{

List<Country> result = new ArrayList<>();

term = term.toUpperCase();

final int offset = page * pageSize;

int matched = 0;
Expand Down Expand Up @@ -175,12 +147,4 @@ public Collection<Country> toChoices(Collection<String> ids)
}
}

private static class CountriesRenderer extends ChoiceRenderer<Country>
{

public CountriesRenderer()
{
super("displayName");
}
}
}
Loading