Skip to content
This repository was archived by the owner on Mar 24, 2018. It is now read-only.

Tagging support #1

Open
wants to merge 108 commits into
base: tagging-support
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
38f4cff
Fix the bug where the input for entering select items had its width a…
robinmitra Sep 11, 2014
0547aab
Merge branch 'input-width-fix-for-async-selected-items'
robinmitra Sep 11, 2014
95156b7
Update match-multiple.tpl.html
FoxBuchele Sep 16, 2014
92ec843
Update select.css
FoxBuchele Sep 16, 2014
db61ed8
Update select.js
FoxBuchele Sep 18, 2014
60b3367
Update package.json
georeith Sep 25, 2014
3b1b737
chore(bower): remove cruft from bower package
Sep 27, 2014
e7b7fdf
update view aswell
jimmywarting Sep 30, 2014
64b6509
Fixed issues with asynchronous data sources (for example $resource)
tvervest Oct 5, 2014
ba547ac
Merge branch 'async-resource-fix'
tvervest Oct 6, 2014
afe56df
Merge branch 'tagging-support'
tvervest Oct 6, 2014
f353e3b
Add callback for removal of items from multi-select
vitosamson Oct 6, 2014
920b2b6
fix(multiple): setViewValue compatible with 1.3-rc.1+
dimirc Sep 15, 2014
64dc9af
fix(select2): prevent changing url when clicking remove in multiple mode
dimirc Oct 6, 2014
e8a6e54
Merge pull request #189 from robinmitra/master
dimirc Oct 6, 2014
a9e9f14
Merge pull request #199 from buchelew/patch-1
dimirc Oct 6, 2014
f28934b
Merge pull request #193 from angular-ui/fix-multiple-setviewvalue
dimirc Oct 6, 2014
149a226
chore(build): v0.8.0
dimirc Oct 6, 2014
4b4d2f2
Merge pull request #196 from VolusionDev/master
dimirc Oct 7, 2014
1a9e85b
Merge pull request #233 from boneskull/master
dimirc Oct 7, 2014
a67131e
Merge pull request #223 from georeith/patch-1
dimirc Oct 7, 2014
2c7d3fe
Merge commit 'a67131e2d8b77f4d3e825e382819d8708e9055de'
tvervest Oct 7, 2014
9ccfcc9
added initialisation value for tagging
tvervest Oct 7, 2014
4147543
fix(multiple): prevent filtering unselected values
dimirc Oct 7, 2014
97d0243
chore(build): v0.8.1
dimirc Oct 7, 2014
a692a48
Fix case where undefined custom objects return isActive === true
Oct 8, 2014
03c4827
Fix case where undefined custom objects return isActive === true
Oct 8, 2014
0d2399e
Rollback whitespace changes
Oct 8, 2014
98ab013
Merge pull request #262 from vitosamson/master
dimirc Oct 8, 2014
0791676
Merge pull request #240 from jimmywarting/patch-1
dimirc Oct 8, 2014
676aa6a
chore(build): angular min version to ~1.2.18
dimirc Oct 8, 2014
96d69d7
All these combitions will now work:
jmcpeak Oct 8, 2014
299dacc
fix(match): prevent exception when resetting value with BACKSPACE
dimirc Oct 8, 2014
7e8e589
feat(choices): prevent calling $select.isActive/isDisabled when dropd…
dimirc Oct 8, 2014
069c39a
fix(keys): should select active item and go to next control when pres…
dimirc Oct 9, 2014
d2c6493
fix(keys): prevent dropdown to open with cmd key
dimirc Oct 9, 2014
a73be72
Merge pull request #286 from angular-ui/fix-select-with-tab
dimirc Oct 9, 2014
d8017a2
Merge pull request #273 from angular-ui/perf_choices_active_disabled
dimirc Oct 9, 2014
8845afd
Merge pull request #272 from jmcpeak/master
dimirc Oct 9, 2014
f6c0e1f
fix(choices): reset activeMatchIndex on blur
dimirc Oct 9, 2014
4ebad63
chore(build): v0.8.2
dimirc Oct 9, 2014
8477dcb
Remove bootstrap plunker demo from README
dimirc Oct 9, 2014
e3df778
fix(multiselect): run $formatters when changing model directly
dimirc Oct 10, 2014
cfe13b4
fix(multiselect): input width should recalculate correctly when avail…
dimirc Oct 10, 2014
42e469e
Allow angular version 1.3+
justinsa Oct 14, 2014
7a28434
Merge pull request #301 from justinsa/master
dimirc Oct 14, 2014
845a71f
Merge pull request #291 from angular-ui/fix-multiselect-width
dimirc Oct 14, 2014
331f2a9
Merge pull request #290 from angular-ui/fix-multiselect-modelsync
dimirc Oct 14, 2014
b044b41
chore(build): v0.8.3
dimirc Oct 14, 2014
d69dc3d
excluded dist files #241
Oct 16, 2014
e25153c
Adding ability to have a callback for highlighting an item
Oct 16, 2014
d53fdb6
#319 fix for lock selections
Oct 16, 2014
f1a7cf2
removed version change for package.json
Oct 17, 2014
3bd3d4b
Updating lock to be an expression
Oct 17, 2014
908cc89
If 'search-enabled' attribute is missing, use value, defined in 'uiSe…
aputivlskiy Oct 17, 2014
d24f9bf
Merge branch 'master' of github.com:angular-ui/ui-select
Oct 17, 2014
2eaf5aa
Merge branch 'master' into tagging-support
Oct 17, 2014
8fa93b7
Rebuild source files post merge
Oct 17, 2014
7be4c73
Re-introduce check to prevent unintentional "all active" return for n…
Oct 17, 2014
3a3ad19
moving to select choice
Oct 17, 2014
9d89d47
Add auto-tokenization functionality and associated demo.
Oct 17, 2014
516857c
Compiled assets
Oct 17, 2014
9d0abc4
Move changes to appropriate files and make build pass
Oct 17, 2014
2580e08
Cleaning up logging, unused code
Oct 17, 2014
b9810d4
Changed the choices.tpl to fix bug with IE groups
kentcooper Oct 18, 2014
ec93414
Code cleanup to pass jshint
Oct 20, 2014
b61bf9c
Recompile CSS
Oct 20, 2014
a1d9e63
Added tests to check behaviour of searchEnabled option of default con…
Oct 20, 2014
eeea710
Fix over-selection in dropdown
Oct 20, 2014
fb04dca
Merge pull request #329 from kentcooper/fix-ie-groups
dimirc Oct 20, 2014
9f13358
Merge pull request #325 from ravensteel/master
dimirc Oct 20, 2014
e6a04b4
Finish up demos, make tests pass, introduce distinction between taggi…
Oct 21, 2014
6793747
Finalizes over-selection problem for `taggingLabel === false` being h…
Oct 21, 2014
9c8d13f
Clarify some things in the demo
Oct 22, 2014
9a1db97
Cleanup
Oct 27, 2014
1590532
Removing dist files per @dimirc request
Oct 27, 2014
ed88969
Move ctrl.open check to top
Oct 27, 2014
9cf0870
fix(choices): prevent unnecessary watches when dropdown is closed
dimirc Oct 29, 2014
293647a
Merge pull request #353 from angular-ui/fix-choices-lesswatches
dimirc Oct 29, 2014
e277a1c
Merge pull request #317 from hthabet/fix_placeholderWhenSearchFalse
dimirc Oct 29, 2014
aef5a80
Added closeOnSelect attribute
tradiff Nov 2, 2014
c6dcd05
General cleanup, including some bad logic
Nov 3, 2014
c306275
Ensure a default setting for taggingTokens.isActivated is explicitly …
Nov 7, 2014
3a9f4fa
Fix for backspace allowing removal of locked selections
Nov 13, 2014
6e2bc85
reverting dist files
Nov 13, 2014
a5b66d7
Fix for failing test ( not really broke )
Nov 14, 2014
3be92eb
Merge pull request #321 from phxdatasec/feat-lock
amcdnl Nov 14, 2014
aec79c8
Adding test for highlight
Nov 14, 2014
6fb7e74
Merge fix
amcdnl Nov 14, 2014
0762368
Merge pull request #320 from phxdatasec/feat-highlight
amcdnl Nov 14, 2014
e0b5845
Fix for #397
Nov 14, 2014
3991091
Merge branch 'master' of github.com:angular-ui/ui-select
Nov 14, 2014
67ebfe6
Merge pull request #399 from phxdatasec/feat-globalResetOption
amcdnl Nov 14, 2014
6be81d5
Catch up with upstream `master`
Nov 14, 2014
45f4f52
Merge branch 'master' of github.com:angular-ui/ui-select
Nov 14, 2014
52a1a78
Upstream merge again...? Not sure why
Nov 14, 2014
46b40d9
Fix wrong test spec assertion and missing $filter injectable
Nov 14, 2014
3321c50
Add missing `dist` files to ensure tests pass
Nov 14, 2014
e257625
Revert "Add missing `dist` files to ensure tests pass"
Nov 14, 2014
a2f0b28
explicittly set tagging default on controller
Nov 14, 2014
6849d9a
Fix for broken test
amcdnl Nov 14, 2014
ff227e2
merge from upstream/master
tradiff Nov 14, 2014
f0190de
Merge pull request #362 from TravisTX/feat-closeOnSelect
amcdnl Nov 18, 2014
7ee06b3
cleanup
Nov 21, 2014
f29d57f
Merge branch 'master' of github.com:angular-ui/ui-select
Nov 21, 2014
1915b1c
Rebase again
Nov 21, 2014
e417d20
Restore ctrl.$filter since it's best pinned to ctrl, fix issue with c…
Nov 25, 2014
5d8fb7e
Fix incorrect initial -1 activeIndex when `taggingLabel !== false`
Nov 25, 2014
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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ AngularJS-native version of [Select2](http://ivaynberg.github.io/select2/) and [

- [Demo](http://plnkr.co/edit/a3KlK8dKH3wwiiksDSn2?p=preview)
- [Demo Multiselect](http://plnkr.co/edit/juqoNOt1z1Gb349XabQ2?p=preview)
- [Bootstrap theme](http://plnkr.co/edit/QCwSM75ilH2Vh6D9aMA4?p=preview)

Check [examples](https://github.com/angular-ui/ui-select/blob/master/examples).

Expand Down
13 changes: 8 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ui-select",
"version": "0.7.0",
"version": "0.8.3",
"homepage": "https://github.com/angular-ui/ui-select",
"authors": [
"AngularUI"
Expand All @@ -13,14 +13,17 @@
"node_modules",
"bower_components",
"src",
"test"
"test",
"gulpfile.js",
"karma.conf.js",
"examples"
],
"dependencies": {
"angular": "~1.2"
"angular": ">=1.2.18"
},
"devDependencies": {
"jquery": "~1.11",
"angular-sanitize": "~1.2",
"angular-mocks": "~1.2"
"angular-sanitize": ">=1.2.18",
"angular-mocks": ">=1.2.18"
}
}
163 changes: 0 additions & 163 deletions dist/select.css

This file was deleted.

6 changes: 0 additions & 6 deletions dist/select.css.min.css

This file was deleted.

Loading