Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Fix tolerance for null or undefined values #1035

Closed
wants to merge 23 commits into from
Closed

Fix tolerance for null or undefined values #1035

wants to merge 23 commits into from

Conversation

homerjam
Copy link
Contributor

fixes #967

@homerjam
Copy link
Contributor Author

Any chance of merging this?

@wesleycho
Copy link
Contributor

Changes to dist need to be removed, and this needs to be squashed and rebased.

@homerjam
Copy link
Contributor Author

Hi @wesleycho is there any chance you could help/explain how to go about this? I'm a bit of a casual git user 😊 (generally I use sourcetree - in case that helps?)

@wesleycho
Copy link
Contributor

In this case, git reset --hard a926f70; git pull --rebase origin master; git push -f should do the trick - do those commands separately though so you can step through things.

kshutkin and others added 23 commits March 27, 2016 18:59
@kshutkin @homerjam
Single select with tagging support
31b84d7
@JeromeLam @homerjam
Add "ui-select-dropdown" class to identify the dropdown container.
0d532f2
@JeromeLam @homerjam
Support changing the direction of the dropdown if there isn't enough …
422dd00 
…space to render it.
@JeromeLam @homerjam
Style the up direction of the dropdown.
f9c7618
@JeromeLam @homerjam
Update version of angular to latest 1.2.x in examples.
ba8acf9
@JeromeLam @homerjam
Fix Select2 style for demo.html.
002fea9
@JeromeLam @homerjam
Fix typo in Select2 style for demo.html.
fe83924
@homerjam
- add "group filter" feature
ab727ed
@homerjam
- fix removing test
7a53659
@homerjam
- remove debug flag
b8da2ba
@homerjam
- remove debug flag
9241067
@homerjam
fix tests
46538ea
@loverajoel @homerjam
Stop propagation when pressing ENTER key from dropdown
a237386
@homerjam
added test : 'should allow creating tag in single select mode with ta…
aa259be 
…gging enabled'
@homerjam
preparing for pull request
69587f0
@homerjam
added test: 'should allow creating tag on ENTER in multiple select mo…
ec7893f 
…de with tagging enabled, no labels'
@loverajoel @homerjam
Stop propagation when pressing ESC key from dropdown
c24c351
@Vitaliy-Yarovuy @homerjam
create demo for "group-filter"
0d844a0
@homerjam
restore /dist holder
34c66ce
@homerjam
remove changes from /dist directory
4cef5ca
@homerjam
chore(build): v0.12.0
d2f27fd
@homerjam
Update bower.json
4ac8fc2
@homerjam
Fix tolerance for null or undefined values
c1a65bf
@homerjam
Copy link
Contributor Author

Thanks. Does the above look right?

@wesleycho
Copy link
Contributor

Looks like something was busted in the process - might be better to start fresh by killing the branch locally, updating master with current master, branch off and redo changes then force push up.

@homerjam homerjam closed this Mar 27, 2016
@homerjam homerjam deleted the patch-1 branch March 27, 2016 18:20
@homerjam
Copy link
Contributor Author

I made a mistake and deleted my branch - have resubmitted here

@homerjam homerjam mentioned this pull request Mar 27, 2016
Closed
user378230 added a commit to user378230/ui-select that referenced this pull request Jul 7, 2016
@user378230
fix(uiSelectMultiple): tolerate null/undefined model value
e8a8e34 
Originally authored by homerjam

Closes angular-ui#967 and angular-ui#1686
Supersedes angular-ui#1035 angular-ui#1529 angular-ui#1687
@user378230 user378230 mentioned this pull request Jul 7, 2016
Merged
user378230 added a commit to user378230/ui-select that referenced this pull request Jul 7, 2016
@user378230
fix(uiSelectMultiple): tolerate null/undefined view value
7d0974b 
Previously view value was checked and corrected if undefined, but then
overwritten with the invalid value again.

This is a minor commit to ensure the updated value isn't overwritten
again.

Originally authored by homerjam

Closes angular-ui#967 and angular-ui#1686
Supersedes angular-ui#1035 angular-ui#1529 angular-ui#1687
user378230 added a commit that referenced this pull request Jul 7, 2016
@user378230
fix(uiSelectMultiple): tolerate null/undefined view value
0c29b64 
Previously view value was checked and corrected if undefined, but then
overwritten with the invalid value again.

This is a minor commit to ensure the updated value isn't overwritten
again.

Originally authored by homerjam

Closes #967 and #1686
Supersedes #1035 #1529 #1687
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
needs: rebasing needs: squash needs: work
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Possible error with ngModel.$render with null/undefined values
6 participants
@homerjam @wesleycho @kshutkin @JeromeLam @loverajoel @Vitaliy-Yarovuy