Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Angular1.2 #56

Merged
merged 13 commits into from
Nov 19, 2013
Merged

Angular1.2 #56

merged 13 commits into from
Nov 19, 2013

Conversation

CyborgMaster
Copy link

Getting ui-sortable to work with the new way angular does ng-repeat.

thgreasi added a commit to thgreasi/ui-sortable that referenced this pull request Nov 19, 2013
* Formating changes
* Renamed injected log to $log
* Replaced apply function with inlined anonymus
thgreasi added a commit that referenced this pull request Nov 19, 2013
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)
@thgreasi
Copy link
Contributor

Couldn't auto merge as you see despite all the effort to minimize the diff's.
Meld made the manual merge and also managed to create a small "code changes map".

  • 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 we just need to wait for extra reviewers and we can merge it to master.
Congrats @CyborgMaster and thanks for your patience, effort and collaboration.

@thgreasi thgreasi closed this Nov 19, 2013
@thgreasi thgreasi reopened this Nov 19, 2013
thgreasi added a commit that referenced this pull request Nov 19, 2013
@thgreasi thgreasi merged commit 121728b into angular-ui:angular1.2 Nov 19, 2013
@CyborgMaster
Copy link
Author

Glad I could help. I'm happy we were able to get it pushed through. Now I can change my bower dependencies back to the official repo. Who are the extra reviewers for this? I would love to get this into master (I'm pretty sure it's backwards compatible), and cut a new release on bower so I don't have to have a branch specified in my bowerfile.

thgreasi added a commit that referenced this pull request Dec 28, 2013
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)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants