This repository was archived by the owner on Sep 8, 2020. It is now read-only.
Merge angular1.2 branch into master. #116
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ular 1.2 ng-repeat comments. angular-ui#48
…t's class, not the default ui-sortable-placeholder class. angular-ui#48
…uld be working now).
… provided in the options
Angular1.2
Changed angular version requirements to 1.x from 1.0.x.
Prettified to 2 indents to reduce diff with PR
Reverted bower to angular 1.0.x so that build passes.
* Added scope.apply to stop callbacks
Summary of code changes (in code order): * Removed apply() in favor of inlined anonymous functions * Removed ngModel.$render * Added scope.$watch for attrs.ngModel * Added callbacks.activate to store elements of ngRepeat and positions * Added callbacks.receive to record a receive * Minor changes to callbacks.stop that now utilizes values saved earlier * Major changes to callbacks.update * Minor changes to scope.$watch(attrs.uiSortable), (can be backported)
Now uses exact match of palceholder class attribute. That's to handle the case that the placeholder class equals the sortable's items class.
As per the case mentioned in angular-ui#61. Created jquery.sumilate.dragandrevert to reduce complexiy.
Conflicts: .gitignore CONTRIBUTING.md README.md bower.json gruntFile.js src/sortable.js test/sortable.spec.js test/test.conf.js
Merged angular1.2 branch to master
|
Closes #61. |
|
One shall not just look at the +- numbers, since the result codebase equals the angular1.2 branch. |
thgreasi
added a commit
that referenced
this pull request
Feb 18, 2014
Merge angular1.2 branch into master.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.