1
0
mirror of synced 2024-11-25 14:26:03 +03:00
Commit Graph

626 Commits

Author SHA1 Message Date
Igor Vaynberg
273ec1438e Merge pull request #771 from phtrivier/issue-619
#619 : val takes an optional argument to avoid triggering 'change'
2013-01-31 14:24:45 -08:00
Igor Vaynberg
3f87728f7f fix highlighting bugs introduced by disabled option support. fixes #765 closes #775 2013-01-31 13:15:46 -08:00
Igor Vaynberg
7a006a7259 fix scroll event handling since it doesnt bubble. also add a shim behind the dropdown, this allows it to properly close even when used inside modals. sometimes modals will place their own shim that closes the modal and aborts the default mousedown event. in such cases the modal would close but the dropdown element would still float on the screen now detached and the only way to close it would be to make a selection 2013-01-31 10:52:18 -08:00
Igor Vaynberg
3f14f773f9 dont error out when 'x' is removed really fast multiple times. fixes #745 2013-01-30 22:39:03 -08:00
Igor Vaynberg
db39cdf584 remove dead code. fixes #772 2013-01-30 22:29:19 -08:00
Igor Vaynberg
ee01ab79ad fixes #770 2013-01-30 22:23:18 -08:00
Igor Vaynberg
c270d3e4a3 do not close the dropdown on resize or scroll, instead keep it positioned. fixes #753 #669 #719 2013-01-30 21:49:57 -08:00
phtrivier
cf095d9fee #619 : val takes an optional argument to avoid triggering 'change' 2013-01-30 10:21:40 +01:00
Igor Vaynberg
d0410144ba Merge pull request #768 from bcoughlan/master
Fix issue introduced by 20950e0.
2013-01-29 11:04:46 -08:00
Barry Coughlan
89d583736a Fix issue introduced by 20950e0f0c.
Selected items and other invisible items were not ignored by highlightUnderEvent when calculating index.
This caused highlighting of incorrect items when the list contained hidden items.
2013-01-29 18:45:33 +00:00
Igor Vaynberg
1aa4db12d7 Merge pull request #764 from socialceramics/postdestroy-dropdown-error
Adding defensive check during the document mousedown/touchend event handler.
2013-01-28 18:16:26 -08:00
Jason Purcell
56631aa09f adding defensive check for existence of select2 on the target element during the document mousedown/touchend events 2013-01-28 15:01:17 -05:00
Jason Purcell
67af5a43f1 ajax url function is now passed same arguments and called with same context as data option 2013-01-25 12:40:17 -05:00
Igor Vaynberg
434827d22c Merge pull request #747 from Kollibri/master
Fix issue with disabled options (Issue #733)
2013-01-24 08:42:06 -08:00
Igor Vaynberg
acc6f7923e optimize string comparisons. fixes #743 2013-01-24 08:31:43 -08:00
Igor Vaynberg
dc8fbba511 fixes #742 2013-01-24 08:20:46 -08:00
Amanda Myer
795bd884a6 Update select2.css 2013-01-24 11:11:44 -05:00
Amanda Myer
1c183ef23b Update select2.js 2013-01-24 11:09:30 -05:00
Amanda Myer
1949f4ce31 Update select2.css
Made disabled results show up disabled, and added a class "selected" for elements that have already been selected (by default, these elements are hidden).
2013-01-24 09:04:05 -05:00
Amanda Myer
20950e0f0c Update select2.js
Fixed issues with select2 and disabled options, most of it having to do with incorrectly determining the index of an option when disabled options were being displayed.
2013-01-24 08:59:09 -05:00
Igor Vaynberg
660c402737 Merge pull request #738 from arnar/master
Wrap tags correctly when passed as a function.
2013-01-23 14:30:37 -08:00
Arnar Birgisson
f49b1006aa Use tags correctly when set as a function. 2013-01-23 22:25:34 +01:00
Igor Vaynberg
17f9d78e26 Merge pull request #736 from tamias/label_no_element
Avoid error when label has no matching element
2013-01-23 11:13:31 -08:00
Ronald J Kimball
7ec1e753dc Avoid error when label has no matching element
$('#no_such_element').data("select2") returns null rather than
undefined (jQuery 1.9.0).
2013-01-23 13:53:15 -05:00
Igor Vaynberg
4e92c8b1b4 allow ajax.data to be undefined. fixes #732 2013-01-23 09:24:23 -08:00
Igor Vaynberg
7d8409393c fix parenthesis mismatches 2013-01-23 08:57:10 -08:00
Igor Vaynberg
c12a9d5e9c Merge pull request #735 from vlycser/patch-1
Update select2.js
2013-01-23 08:53:28 -08:00
Cristhian Valencia B.
81cfaa587a Update select2.js
missing parenthesis at line :1448 & :1845
2013-01-23 11:14:12 -05:00
Igor Vaynberg
ee17e4ec27 Merge pull request #727 from Schlogen/master
jQuery 1.9 Fixes
2013-01-22 14:50:36 -08:00
Schlogen
567cb7dbe7 Fix for jQuery 1.9 2013-01-22 17:00:38 -05:00
Igor Vaynberg
e89a851727 Merge pull request #715 from vitalets/default-initselection-hidden
Default initSelection() for hidden element
2013-01-16 11:40:26 -08:00
vitalets
88a86e5953 add default initselection for single and multi 2013-01-16 22:35:24 +04:00
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
Igor Vaynberg
5f2828098e Merge pull request #697 from agworld/add-load-more-padding-option
add loadMorePadding option
2013-01-10 08:47:05 -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
Igor Vaynberg
b562d1a0e5 Merge pull request #692 from 4sh/master
Allow to pass a callback as ajax.url configuration parameter
2013-01-08 10:44:58 -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
Igor Vaynberg
7f83d8276a Merge pull request #644 from kfiku/patch-1
Update select2.js
2012-12-13 09:05:31 -08:00