RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-23 13:36:01 +03:00
Code Issues Projects Releases Wiki Activity
605 Commits 7 Branches 46 Tags 12 MiB
f60c40d484
Commit Graph

451 Commits

Author SHA1 Message Date
vitalets
3570ab523e add third param to matcher in local 2013-01-16 22:09:31 +04:00
vitalets
f63a10ccb1 ready for single 2013-01-16 21:29:17 +04:00
Igor Vaynberg
fa908972b4 Merge pull request #610 from MaxxSoftware/master 
Firefox Tab and Enter keys issue.
 2013-01-16 08:45:11 -08:00
Igor Vaynberg
fcea1523fd Merge pull request #703 from jelte12345/master 
Fixed my own XSS pull request to actually work
 2013-01-14 09:52:40 -08:00
_pants
7bdad56837 allow passing a function for maximumSelectionSize 2013-01-12 11:37:57 -05:00
Jelte Fennema
c0dd741a79 Fixed testing mistake 2013-01-12 17:29:48 +01:00
Igor Vaynberg
353672832d Merge pull request #691 from jelte12345/master 
Fix XSS injection
 2013-01-11 16:39:48 -08:00
Le Wang
a1273b639a add loadMorePadding option 
- Trigger load before scrolling to the very bottom.
- When scrolling very fast, unless we pre-load entries, the page itself
  will scroll.
 2013-01-10 17:02:00 +08:00
Frédéric Camblor
a770ade670 Allow to pass a callback as ajax.url 2013-01-08 18:54:14 +01:00
Igor Vaynberg
b4f6462bb2 Merge pull request #643 from akinnee/master 
Added an option: select highlighted option on blur, "selectOnBlur: false"
 2013-01-08 09:02:23 -08:00
Jelte Fennema
a65c08097e Make the escapeMarkup function escape html tags and some other characters and apply it to usefull places 2013-01-08 11:35:58 +01:00
Igor Vaynberg
8e9a231847 add [option disabled='disabled'] support. fixes #480 fixes #157 2013-01-04 09:16:48 -08:00
Igor Vaynberg
7a797300a5 Merge pull request #652 from tispratik/master 
Be able to limit each input to a maximum length
 2012-12-27 20:56:14 -08:00
Igor Vaynberg
df5a03f0b6 Merge pull request #594 from omab/master 
Results sorting on populateResults function
 2012-12-27 08:37:54 -08:00
Pratik Khadloya
007fd8c3f5 Be able to limit each input to a maximum length 2012-12-14 13:49:01 -08:00
Grzegorz Klimek
0d6ba97144 Update select2.js 
jQuery("input#someId").attr("tabIndex") don't work well in new jQuery 1.8+.
When you try this on field  that don't have tabIndex attr you get undefined 
(but document.getElementById("someId").tabIndex returns '0').
This is why Select2 element onBlur stay whit attr tabindex='-1' 
and you can't navigate form with 'tab' key.
This simple ' || 0' fix this bug.
 2012-12-13 10:39:34 +01:00
Alex Kinnee
fa6313afa4 Added the option to select highlighted upon blur, false by default. Original functionality is maintained by default. 2012-12-12 13:54:47 -05:00
tom
b33c86e5e4 Fixes >1 multi-select dropdown being open at the same time 
Bug was reproduced on latest FF/Chrome/Safari, but IE exibits correct
behavior with or without the fix.

See: http://jsfiddle.net/tmD7c/2/
 2012-12-10 12:46:27 -05:00
Chris Rueber
86952b4ed9 Update select2.js 
Adding case to fix placeholder not being displayed when element not visible.
 2012-12-08 11:36:07 -06:00
Julien Muetton
09d29585a0 Triggers change when value is set programaticaly. 
``` js
$('#select').select2().
    on('change', function () {
        alert('change');
    }).
    val(['foo']);
```

Now shows an alert window.
 2012-12-03 09:59:15 +01:00
MaxxSoftware
327e00b0ba Firefox Tab and Enter keys issue. 
When item is selected by enter, the list is reopened.
Also pressing tab on focused element with drop list cause immediate reopening with empty search result list.
 2012-11-28 12:45:14 +06:00
Conor Branagan
57638ab392 update this.context with data context on query calls 2012-11-21 15:51:31 -05:00
Matías Aguirre
53eaf1fbe1 Results sorting option. Refs #95 2012-11-21 14:12:01 -02:00
Igor Vaynberg
2eb28a60aa allow override of createSearchChoice in tags. fixes #567 2012-11-15 09:56:05 -08:00
MaxxSoftware
ac7de2a756 Update select2.js 2012-11-15 17:26:19 +06:00
MaxxSoftware
1560a3918a Update select2.js 
DropDown displayed on the left of select-container if not fit right.
 2012-11-15 17:16:55 +06:00
Igor Vaynberg
aa686aa47e Merge pull request #541 from brendanheywood/master 
Fixed bug with closeOnSelecet is false
 2012-11-02 08:57:15 -07:00
Brendan Heywood
6c59b1e99c Only select the first suitable item if nothing is already selected 2012-11-01 18:00:38 +10:00
Brendan Heywood
291f595a03 Fixed scrolling bug when closeOnSelect is false 2012-10-31 16:35:34 +10:00
tom
ca98ce5564 trivial change: pluralize formatInputTooShort function 2012-10-24 23:48:00 -04:00
Igor Vaynberg
4a363c4b30 Merge pull request #503 from todd-givainc/master 
Feature: Locked Items
 2012-10-24 13:48:46 -07:00
Kevin Warrington
77ea616d0c fix issue #517 2012-10-22 17:00:03 -06:00
Todd Rafferty
1d4ea633aa Goofed, changed disabled to locked. 2012-10-16 14:41:03 -03:00
Todd Rafferty
43939f08a4 Create locked items that can't be removed. 
This patch creates multi select items that can't be removed.
 2012-10-16 14:33:35 -03:00
Igor Vaynberg
3ed91862fa fixed dropdown positioning when select2 has margins. fixes #501 2012-10-16 10:22:25 -07:00
Igor Vaynberg
c4e00c6926 Merge pull request #485 from lisandropuzzolo/patch-1 
Update select2.js
 2012-10-10 13:35:15 -07:00
Kevin Brown
f5ac9bf90c Fixed anchor hrefs 
Fixes #482: Mobile Safari issues
 2012-10-10 17:24:58 -03:00
lisandropuzzolo
da414577e8 Update select2.js 
Fixed line 2154 to allow Select2 work with multiple levels hireachal data.
 2012-10-10 12:07:53 -03:00
Igor Vaynberg
26a3d5342b update license in js header 2012-10-03 11:30:12 -07:00
Igor Vaynberg
732ad030a0 fix tab index issues. fixes #408 2012-10-02 10:09:31 -07:00
Kevin Brown
c4c1cbabde Fixed placeholder detection. Fixes #424. 2012-09-24 18:35:13 -03:00
Igor Vaynberg
98976946d6 pass element attr to initSelection for selects upon init 2012-09-24 09:22:36 -07:00
Igor Vaynberg
fccc84cd11 relax formatSearching check. #434 2012-09-21 08:19:31 -07:00
Jacob Haslehurst
3fcfbed03a formatSearching can be disabled 
formatSearching can be disabled by returning null from the function which allows the searching message to be disabled.
 2012-09-21 16:12:27 +10:00
brettmas
c577158599 original option not available to formatSelection on init 
The original option isn't available to formatSelection when initializing the selection from a select[multiple]
 2012-09-21 02:39:58 +10:00
Igor Vaynberg
2027c0cebf trigger blur handlers on source element when select2 is blurred 2012-09-19 19:37:58 -07:00
Igor Vaynberg
93ed30d67a mange disabled attr on source element. fixes #427 2012-09-19 19:33:46 -07:00
Igor Vaynberg
a145378848 postprocess results always if closeOnSelect is false. fixes #348 2012-09-18 08:42:23 -07:00
Igor Vaynberg
f18caa5957 jquery 1.8.x fixes. fixes #388 2012-09-17 19:52:42 -07:00
Igor Vaynberg
2cb435680b fixes #366 2012-09-17 19:34:50 -07:00
Igor Vaynberg
bdd746844d tweak formatSelection for #400 2012-09-17 19:25:21 -07:00
Igor Vaynberg
f7e78f6ed9 label for support for id's with brackets, eg id='name[first]'. fixes #422 2012-09-17 18:43:26 -07:00
Igor Vaynberg
4b1204c5de improve keyboard handling. fixes #389 2012-09-13 16:38:20 -07:00
Igor Vaynberg
908c3583d7 bind abbr handler before mousedown. fixes #386 2012-09-13 14:42:53 -07:00
Igor Vaynberg
ab7ab5b3f7 allow clearing on backspace as well as delete. fixes #396 2012-09-13 00:09:17 -07:00
Igor Vaynberg
6690cc449c fix clearing when using jquery 1.6. fixes #386 2012-09-12 16:20:52 -07:00
Jean Boussier
7bc63dd264 Get rid of 2 useless jQuery.delegate event handler 2012-09-12 14:57:35 -04:00
Jean Boussier
3387853d9c Keep a cached reference to jQueryfied document 2012-09-12 14:50:17 -04:00
Jean Boussier
720bdb8c4f Store last mouse position in a variable instead of document datastore 
It's hundred times faster. See http://jsperf.com/data-vs-variable
 2012-09-12 14:47:25 -04:00
Igor Vaynberg
96657a16aa fix for dropdown closing as soon as its opened in IE8. fixes #369. fixes #354 2012-09-10 17:05:11 -07:00
Igor Vaynberg
b4371aa253 remove executable permission from files 2012-09-10 10:40:44 -07:00
Kevin Chung
7be0e509ff Remove references to jQuery.Events, replace with the closure dollar variable. 2012-09-09 19:35:34 -07:00
Kevin Chung
770924ca8d Fix empty Select2 input from throwing an error when attempting to selecting a value. 2012-09-09 19:06:14 -07:00
Mark DiMarco
7c2dba8fe0 safer check for result.children 
`("children" in result) && result.children.length` fails if children is explicitly null.
 2012-09-06 16:55:04 -05:00
Igor Vaynberg
281f314fd7 fix performance issue in firefox. fixes #382 2012-09-06 09:17:24 -07:00
Igor Vaynberg
cb44a86649 Merge pull request #374 from tzarger/master 
Fix for ValidationEngine & hiding errors on change.
 2012-09-05 10:33:05 -07:00
Brent Burgoyne
5580dbbc4c Fixed drop down alignment issue when body has an offset and is not position static 2012-09-05 11:14:12 -06:00
Igor Vaynberg
e5a2824fae Merge pull request #377 from pmirshad/master 
Tabbing out doesn't put placeholder back on input tags with multiple=true and no value selected
 2012-09-04 17:25:45 -07:00
Gavin Wahl
1b2765fced Pluralize 'items' in formatSelectionTooBig 2012-09-04 16:23:52 -06:00
pmirshad
9fe2453079 Adding event argument to the bound function 2012-09-05 01:52:55 +05:30
pmirshad
5cf5deb267 Fix placeholder missing on tab out on input tags 
Tabbing out of input tags with multiple set as true and no value
selected will result in the default placeholder not being shown.
This patch fixes the issue by calling clearSearch() on blur of
MultiSelect2 and preventing the bubbling of the blur event to the
abstract class.

Test case with version 3.2: http://jsfiddle.net/pmirshad/PqP2L/1/
 2012-09-05 01:50:34 +05:30
Troy Zarger
039f6b5de9 Fix for ValidationEngine &hiding errors on change. 
Copying class attribute to container causes and issue with the JQuery
ValidationEngine. In order to prevent double validation checking, a
simple replace call to copy all but the actual validation[] class.

Also, added a blurOnChange default setting, to allow people to trigger
and blur() event in case of using JQuery ValidationEngine  in order to
immediately hide the validation error message when selecting an option.
 2012-09-04 00:43:25 -04:00
Igor Vaynberg
222fa7e415 fix data helper when used with compound choices without a text attribute. fixes #370 2012-08-31 13:41:56 -07:00
Igor Vaynberg
7baa3b9e93 make escapeMarkup configurable. closes #355 2012-08-27 09:48:02 -07:00
Sławek Ehlert
55cc11f9b7 forgot to remove log 
Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
 2012-08-27 09:27:07 -07:00
Sławek Ehlert
852a515d04 make escapeMarkup optional 
Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
 2012-08-27 09:27:07 -07:00
Igor Vaynberg
3b55a65c4d renamed this var. #359 2012-08-27 09:20:31 -07:00
Kyle Gibson
de867bbba1 Pass along arguments sent to debounce 
Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
 2012-08-27 09:19:40 -07:00
Kevin Chung
22b32614ea Reevaluate dropdownCss when positioning dropdown 2012-08-23 15:28:24 -07:00
TedLiang
02d6f9f5db escape special characters in containerId selector 2012-08-18 20:40:48 +10:00
TedLiang
3276e22ab6 escape special characters in containerId selector 2012-08-18 16:42:59 +10:00
TedLiang
881d2fabd3 consistent containid for better integration with form validation. 2012-08-18 15:32:28 +10:00
Igor Vaynberg
c65355edee fixed focussing in IE8. fixes #342 2012-08-16 23:36:26 -07:00
Igor Vaynberg
e4fbf91915 ignore replies that come in after select2 has been closed. fixes #299 2012-08-16 23:04:29 -07:00
Igor Vaynberg
afd353788b allow opts.dropdownCss to override css even after position. fixes #328 2012-08-16 22:54:14 -07:00
Igor Vaynberg
7b60524b35 do not open when clicked on a search choice. fixes #336 2012-08-16 22:25:10 -07:00
Igor Vaynberg
045bff7fe4 Merge pull request #341 from ryfeng/master 
Recursive Match for local query
 2012-08-16 22:15:12 -07:00
Igor Vaynberg
69567cd2cb Merge branch 'master' of github.com:ivaynberg/select2 2012-08-16 22:11:29 -07:00
ryfeng
476d5ace9a recursive match in local() 2012-08-17 02:11:16 -03:00
Igor Vaynberg
cf01ec6cb5 remove shrinking animation on choice remove because it causes jitter. fixes #326 2012-08-16 22:11:14 -07:00
19Gerhard85
d5b6d5fa78 Update select2.js 2012-08-16 18:11:47 +03:00
Igor Vaynberg
8bab0b6f70 always set the val on element so initSelection has access to it. fixes #337 2012-08-16 00:09:00 -07:00
19Gerhard85
35d61952f6 Fixed Bug: IE fires onbeforeunload event 2012-08-14 18:27:57 +03:00
Igor Vaynberg
816af4425b fix cursor position in select when opened with a char key press. fixes #323 2012-08-13 15:27:08 -07:00
Igor Vaynberg
4f6bf6cc81 added openOnEnter option. fixes #319 2012-08-13 14:51:56 -07:00
Igor Vaynberg
b7a3f957e3 dont open the dropdown on meta keys. fixes #314 2012-08-13 14:45:21 -07:00
sambomartin
31cc5ed40a Update select2.js 
Added 'traditional' ajax parameter
 2012-08-13 19:57:50 +02:00
Thierry Régagnon
9fd6f12380 Fix typing mistake: "fasle" instead of "false" 2012-08-09 12:49:03 +02:00
Igor Vaynberg
289226cf6c add a tokenizer so choices can be automatically created and selected while user is typing or pasting into the field. fixes #101 #81 #292 2012-08-08 19:33:24 -07:00
Maurus Cuelenaere
c2fa04529b Fix minimumResultsForSearch by recursively counting items 
Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
 2012-08-08 16:48:47 -07:00
Igor Vaynberg
4d3f8b6332 insert select2 container before element instead of after. better bootstrap compat. fixes #278 2012-08-07 22:31:36 -07:00
Igor Vaynberg
1ef57f86af added formatResultCssClass, fixes #288 2012-08-07 22:23:41 -07:00
Igor Vaynberg
ec31e105d8 remove the pesky BOM. fixes #306 2012-08-07 14:42:58 -07:00
Igor Vaynberg
e7dee23c08 reapply styles specified in dropdownCss option when dropdown is opened to ensure they do not get removed. fixes #305 2012-08-07 08:44:25 -07:00
Igor Vaynberg
220e50fd92 fix select2-more-result positioning. fixes #303 2012-08-07 08:21:18 -07:00
Igor Vaynberg
d92a572694 close on scroll and resize. fixes #149 2012-08-06 23:44:39 -07:00
Igor Vaynberg
921bf06434 fix and clean the new formatSearching() method. closes #301 2012-08-06 20:35:59 -07:00
bhoop
b593d06d58 Update select2.js 
Add a "Searching" label state for AJAX data
 2012-08-06 17:42:05 -03:00
Igor Vaynberg
3a1dcd14f3 remove default width of 25px from multiselect's search input 2012-08-05 13:02:39 -07:00
Igor Vaynberg
a7d0849d23 close any opened select2s when the window is scrolled or resized. fixes #296 and potentially #149 2012-08-04 11:28:02 -07:00
Igor Vaynberg
bc9867af0b change enter and delete key behaviors. fixes #295 2012-08-03 21:50:12 -07:00
Igor Vaynberg
15b654a170 support readonly attribute by disabling select2. fixes #293 2012-08-03 06:19:22 -07:00
Igor Vaynberg
b422d4efef fixed markup escaping. fixes #290 2012-08-02 21:50:02 -07:00
Igor Vaynberg
bef4af91f8 fixed opening and closing of dropdown when an element is removed from selection. fixes #287 2012-08-02 15:05:33 -07:00
Igor Vaynberg
84eb5b33fc fix for some selects not closing. fixes #286 2012-08-02 15:01:33 -07:00
Igor Vaynberg
dc339391f8 allow disabling of some messages by specifying a null formatter. fixes #280, #182 2012-07-30 13:49:34 +03:00
Igor Vaynberg
e2ea6faac7 allow url to be specified via data-ajax-url attribute. fixes #275 2012-07-30 13:32:29 +03:00
Kevin Brown
61603dacc0 Changed event handlers. Fixes #70 
Changed to mouseup for displaying options.
Changed to mousedown for selecting options.

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
 2012-07-29 07:28:11 +03:00
Igor Vaynberg
f2460a826e support null, undefined, false for data() to unselect. fixes #273 2012-07-27 19:00:17 +03:00
Igor Vaynberg
08bf83f1a4 renamed selection limit option and formatting function to better align with existing naming. #274 #59 2012-07-27 16:32:14 +03:00
Kevin Brown
4344fa054e Added support for limiting selection 
Fixes #59

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
 2012-07-27 16:04:24 +03:00
Igor Vaynberg
94e004ef8c respect source element's tabindex 2012-07-27 00:52:14 +03:00
Igor Vaynberg
38b9e935f0 do not hide search field when disabled because it also hides the placeholder. fixes #272 2012-07-27 00:46:32 +03:00
Igor Vaynberg
ab1a8b93bf some code cleanup. fixes #269 2012-07-26 08:59:51 +03:00
Igor Vaynberg
00058ab315 fix markup escaping. fixes #268 2012-07-26 08:47:10 +03:00
Igor Vaynberg
bb51eb7120 double escape markup populated via html() and append(). fixes #269 2012-07-25 14:08:25 +03:00
Igor Vaynberg
3e42cae401 after triggering change also trigger click to help some validation frameworks. closes #259. closes #262. 2012-07-25 08:11:42 +03:00
Igor Vaynberg
b3089218dc fix tracking of results under mouse. fixes #258 2012-07-25 00:55:53 +03:00
Igor Vaynberg
e620b54271 improved tabbing and tabindex support as well as minor focus management tweaks. fixes things broken by #256 2012-07-24 17:07:14 +03:00
Igor Vaynberg
5d496bd470 Merge branch 'master' of github.com:ivaynberg/select2 2012-07-24 15:10:45 +03:00
Igor Vaynberg
f06aae38fb better handling of tags that are not just strings. fixes #256 2012-07-24 15:10:31 +03:00
Kevin Brown
c58cd12829 Reworks search field. Fixes #239 
Uses the correct EOLs now, fixes iPad keyboard issue.
 2012-07-23 12:04:50 -04:00
Igor Vaynberg
116528908a clean up val. now it only accepts ids and only when initselection is set 2012-07-21 14:27:49 +03:00
Dean Sofer
ad8fd257aa Added truth checks to avoid unnecessarily firing initSelection. 
Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
 2012-07-21 12:14:17 +03:00
Dean Sofer
d54fd4dd0e Passing a string to select2('val') with initSelection causes it to be used. 
Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
 2012-07-21 12:14:17 +03:00
Igor Vaynberg
b672d760ac allow a custom function for computing the width. fixes #252 2012-07-20 21:24:34 +03:00
Igor Vaynberg
3fc1bc6f35 focus select2 on a click to a related label. fixes #198 2012-07-20 21:15:11 +03:00
Igor Vaynberg
37ff4bbf36 added close event. fixes #246 2012-07-20 17:28:15 +03:00
Igor Vaynberg
33fd9dc810 another tweak for positioning of dropdown and scrollbars. fixes #228 again 2012-07-20 17:12:58 +03:00
Igor Vaynberg
0d5be21e09 fix bug with determing the width. fixes #242 2012-07-20 00:56:37 +03:00
Igor Vaynberg
a718dc45a0 fix multiselects in IEs. fixes #241 2012-07-20 00:53:03 +03:00
Igor Vaynberg
1771c3ba61 fix bug where space was ignored in single selects. fixes #233 2012-07-19 11:13:02 +03:00
Igor Vaynberg
1fc09825ed tweak dropdown position. fixes #228 2012-07-19 11:08:09 +03:00
Igor Vaynberg
96c0166535 more flexible width strategies. fixes #237 2012-07-19 10:55:46 +03:00
Kevin Miller
17ffe5772e container receives width style when hidden input has one or via opt 
Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
 2012-07-19 01:12:43 +03:00
Igor Vaynberg
6c330eb53b fixes IE8 bug where the dropdown wouldnt open. it would actually open and close immediately because the body would get a focusin event even after the focus was set on the search field by select2. worked fine in IE9 2012-07-19 01:06:16 +03:00
Igor Vaynberg
633a6dc901 mark elements as selected when closeOnSelect is false so they cannot be selected again. fixes #229 2012-07-18 10:26:49 +03:00
Igor Vaynberg
ad9fac45ae make sure data() returns null instead of undefined when unset. this will prevent chaining which may seem weid. fixes #230 2012-07-18 09:56:02 +03:00
Igor Vaynberg
de0d11a82b position the dropdown after hiding selected elements so when above it doesnt float away from the control 2012-07-18 00:51:17 +03:00
Igor Vaynberg
39aa17a790 fixed above/below dropdown opening bug 2012-07-18 00:26:49 +03:00