Skip to content

Commit a8d2cb5

Browse files
tecklundtecklund
committed
updating select2 to latest release
1 parent 636e4ec commit a8d2cb5

File tree

12 files changed

+1334
-1673
lines changed

12 files changed

+1334
-1673
lines changed

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ scalacOptions in (Compile, doc) ++= Seq(
1515
"-doc-title", "Lift ComboBox Module 2.5-RC-0.6"
1616
)
1717

18-
docDirectory in Compile <<= (baseDirectory / "api")
18+
//docDirectory in Compile <<= (baseDirectory / "api")
1919

2020
libraryDependencies ++= Seq(
2121
"net.liftweb" %% "lift-webkit" % "2.5-RC2",

‎src/main/resources/toserve/combobox/LICENSE

Lines changed: 9 additions & 476 deletions
Large diffs are not rendered by default.

‎src/main/resources/toserve/combobox/README.md

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,49 @@
11
Select2
2-
=================
2+
=======
33

4-
Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results. Look and feel of Select2 is based on the excellent [Chosen](http://harvesthq.github.com/chosen/) library.
4+
Select2 is a jQuery-based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.
55

6-
To get started -- checkout http://ivaynberg.github.com/select2!
6+
To get started, checkout examples and documentation at http://ivaynberg.github.com/select2
77

8-
What Does Select2 Support That Chosen Does Not?
9-
-------------------------------------------------
8+
Use cases
9+
---------
1010

11-
* Working with large datasets: Chosen requires the entire dataset to be loaded as `option` tags in the DOM, which limits
12-
it to working with small-ish datasets. Select2 uses a function to find results on-the-fly, which allows it to partially
13-
load results.
14-
* Paging of results: Since Select2 works with large datasets and only loads a small amount of matching results at a time
15-
it has to support paging. Select2 will call the search function when the user scrolls to the bottom of currently loaded
16-
result set allowing for the 'infinite scrolling' of results.
17-
* Custom markup for results: Chosen only supports rendering text results because that is the only markup supported by
18-
`option` tags. Select2 provides an extension point which can be used to produce any kind of markup to represent results.
19-
* Ability to add results on the fly: Select2 provides the ability to add results from the search term entered by the user, which allows it to be used for
20-
tagging.
11+
* Enhancing native selects with search.
12+
* Enhancing native selects with a better multi-select interface.
13+
* Loading data from JavaScript: easily load items via ajax and have them searchable.
14+
* Nesting optgroups: native selects only support one level of nested. Select2 does not have this restriction.
15+
* Tagging: ability to add new items on the fly.
16+
* Working with large, remote datasets: ability to partially load a dataset based on the search term.
17+
* Paging of large datasets: easy support for loading more pages when the results are scrolled to the end.
18+
* Templating: support for custom rendering of results and selections.
2119

22-
Browser Compatibility
23-
--------------------
24-
* IE 8+ (7 mostly works except for [issue with z-index](https://github.com/ivaynberg/select2/issues/37))
20+
Browser compatibility
21+
---------------------
22+
* IE 8+
2523
* Chrome 8+
26-
* Firefox 3.5+
24+
* Firefox 10+
2725
* Safari 3+
2826
* Opera 10.6+
2927

3028
Integrations
3129
------------
3230

33-
* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / Apache Wicket)
31+
* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / [Apache Wicket](http://wicket.apache.org))
3432
* [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails)
3533
* [AngularUI](http://angular-ui.github.com/#directives-select2) ([AngularJS](angularjs.org))
3634
* [Django](https://github.com/applegrew/django-select2)
35+
* [Symfony](https://github.com/19Gerhard85/sfSelect2WidgetsPlugin)
36+
* [Bootstrap](https://github.com/t0m/select2-bootstrap-css) (CSS skin)
37+
* [Yii](https://github.com/tonybolzan/yii-select2)
38+
39+
Internationalization (i18n)
40+
---------------------------
41+
42+
Select2 supports multiple languages by simply including the right
43+
language JS file (`select2_locale_it.js`, `select2_locale_nl.js`, etc.).
44+
45+
Missing a language? Just copy `select2_locale_en.js.template`, translate
46+
it, and make a pull request back to Select2 here on GitHub.
3747

3848
Bug tracker
3949
-----------
@@ -42,7 +52,6 @@ Have a bug? Please create an issue here on GitHub!
4252

4353
https://github.com/ivaynberg/select2/issues
4454

45-
4655
Mailing list
4756
------------
4857

@@ -53,22 +62,22 @@ select2@googlegroups.com
5362
https://groups.google.com/d/forum/select2
5463

5564

56-
Copyright and License
65+
Copyright and license
5766
---------------------
5867

5968
Copyright 2012 Igor Vaynberg
6069

61-
This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
62-
General Public License version 2 (the "GPL License"). You may choose either license to govern your
63-
use of this software only upon the condition that you accept all of the terms of either the Apache
64-
License or the GPL License.
70+
This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
71+
General Public License version 2 (the "GPL License"). You may choose either license to govern your
72+
use of this software only upon the condition that you accept all of the terms of either the Apache
73+
License or the GPL License.
6574

6675
You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at:
6776

6877
http://www.apache.org/licenses/LICENSE-2.0
6978
http://www.gnu.org/licenses/gpl-2.0.html
7079

71-
Unless required by applicable law or agreed to in writing, software distributed under the Apache License
72-
or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
73-
either express or implied. See the Apache License and the GPL License for the specific language governing
74-
permissions and limitations under the Apache License and the GPL License.
80+
Unless required by applicable law or agreed to in writing, software distributed under the Apache License
81+
or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
82+
either express or implied. See the Apache License and the GPL License for the specific language governing
83+
permissions and limitations under the Apache License and the GPL License.

‎src/main/resources/toserve/combobox/component.json renamed to ‎src/main/resources/toserve/combobox/bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "select2",
3-
"version": "3.3.1",
4-
"main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "spinner.gif"],
3+
"version": "3.4.5",
4+
"main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"],
55
"dependencies": {
6-
"jquery": "~1.4.4"
6+
"jquery": ">= 1.7.1"
77
}
88
}

‎src/main/resources/toserve/combobox/release.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ timestamp=$(date)
2222
tokens="s/@@ver@@/$ver/g;s/\@@timestamp@@/$timestamp/g"
2323
remote="github"
2424

25+
echo "Pulling from origin"
26+
27+
git pull
28+
2529
echo "Updating Version Identifiers"
2630

27-
sed -E -e "s/\"version\": \"([0-9\.]+)\",/\"version\": \"$ver\",/g" -i "" component.json select2.jquery.json
28-
git add component.json
31+
sed -E -e "s/\"version\": \"([0-9\.]+)\",/\"version\": \"$ver\",/g" -i "" bower.json select2.jquery.json
32+
git add bower.json
2933
git add select2.jquery.json
3034
git commit -m "modified version identifiers in descriptors for release $ver"
3135
git push
@@ -37,7 +41,7 @@ echo "Tokenizing..."
3741

3842
find . -name "$js" | xargs -I{} sed -e "$tokens" -i "" {}
3943
find . -name "$css" | xargs -I{} sed -e "$tokens" -i "" {}
40-
sed -e "s/latest/$ver/g" -i "" component.json
44+
sed -e "s/latest/$ver/g" -i "" bower.json
4145

4246
git add "$js"
4347
git add "$css"
@@ -49,11 +53,8 @@ cat LICENSE | sed "$tokens" >> "$mini"
4953
echo "*/" >> "$mini"
5054

5155
curl -s \
52-
-d compilation_level=SIMPLE_OPTIMIZATIONS \
53-
-d output_format=text \
54-
-d output_info=compiled_code \
5556
--data-urlencode "js_code@$js" \
56-
http://closure-compiler.appspot.com/compile \
57+
http://marijnhaverbeke.nl/uglifyjs \
5758
>> "$mini"
5859

5960
git add "$mini"

‎src/main/resources/toserve/combobox/select2-bootstrap.css

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
.form-control .select2-choice {
2+
border: 0;
3+
border-radius: 2px;
4+
}
5+
6+
.form-control .select2-choice .select2-arrow {
7+
border-radius: 0 2px 2px 0;
8+
}
9+
10+
.form-control.select2-container {
11+
height: auto !important;
12+
padding: 0px;
13+
}
14+
15+
.form-control.select2-container.select2-dropdown-open {
16+
border-color: #5897FB;
17+
border-radius: 3px 3px 0 0;
18+
}
19+
20+
.form-control .select2-container.select2-dropdown-open .select2-choices {
21+
border-radius: 3px 3px 0 0;
22+
}
23+
24+
.form-control.select2-container .select2-choices {
25+
border: 0 !important;
26+
border-radius: 3px;
27+
}
28+
29+
.control-group.warning .select2-container .select2-choice,
30+
.control-group.warning .select2-container .select2-choices,
31+
.control-group.warning .select2-container-active .select2-choice,
32+
.control-group.warning .select2-container-active .select2-choices,
33+
.control-group.warning .select2-dropdown-open.select2-drop-above .select2-choice,
34+
.control-group.warning .select2-dropdown-open.select2-drop-above .select2-choices,
35+
.control-group.warning .select2-container-multi.select2-container-active .select2-choices {
36+
border: 1px solid #C09853 !important;
37+
}
38+
39+
.control-group.warning .select2-container .select2-choice div {
40+
border-left: 1px solid #C09853 !important;
41+
background: #FCF8E3 !important;
42+
}
43+
44+
.control-group.error .select2-container .select2-choice,
45+
.control-group.error .select2-container .select2-choices,
46+
.control-group.error .select2-container-active .select2-choice,
47+
.control-group.error .select2-container-active .select2-choices,
48+
.control-group.error .select2-dropdown-open.select2-drop-above .select2-choice,
49+
.control-group.error .select2-dropdown-open.select2-drop-above .select2-choices,
50+
.control-group.error .select2-container-multi.select2-container-active .select2-choices {
51+
border: 1px solid #B94A48 !important;
52+
}
53+
54+
.control-group.error .select2-container .select2-choice div {
55+
border-left: 1px solid #B94A48 !important;
56+
background: #F2DEDE !important;
57+
}
58+
59+
.control-group.info .select2-container .select2-choice,
60+
.control-group.info .select2-container .select2-choices,
61+
.control-group.info .select2-container-active .select2-choice,
62+
.control-group.info .select2-container-active .select2-choices,
63+
.control-group.info .select2-dropdown-open.select2-drop-above .select2-choice,
64+
.control-group.info .select2-dropdown-open.select2-drop-above .select2-choices,
65+
.control-group.info .select2-container-multi.select2-container-active .select2-choices {
66+
border: 1px solid #3A87AD !important;
67+
}
68+
69+
.control-group.info .select2-container .select2-choice div {
70+
border-left: 1px solid #3A87AD !important;
71+
background: #D9EDF7 !important;
72+
}
73+
74+
.control-group.success .select2-container .select2-choice,
75+
.control-group.success .select2-container .select2-choices,
76+
.control-group.success .select2-container-active .select2-choice,
77+
.control-group.success .select2-container-active .select2-choices,
78+
.control-group.success .select2-dropdown-open.select2-drop-above .select2-choice,
79+
.control-group.success .select2-dropdown-open.select2-drop-above .select2-choices,
80+
.control-group.success .select2-container-multi.select2-container-active .select2-choices {
81+
border: 1px solid #468847 !important;
82+
}
83+
84+
.control-group.success .select2-container .select2-choice div {
85+
border-left: 1px solid #468847 !important;
86+
background: #DFF0D8 !important;
87+
}

0 commit comments

Comments
 (0)