search

m-e-conroy / angular-dialog-service

A complete AngularJS service with controllers and templates for generating application modals and dialogs for use with Angular-UI-Bootstrap and Twitter Bootstrap
MIT License
618 stars 228 forks source link

add resolve option for custom modal #138

Open cgoessen opened 9 years ago

cgoessen commented 9 years ago

I've added 'resolve' as the last param and kept data for legacy support. My use case is to use the same controller for full page and modal, which requires to have a few promises resolved in both.

niemyjski commented 8 years ago

@cgoessen Can you please resolve the merge conflicts. @m-e-conroy can you take a look at this.

cgoessen commented 8 years ago

hi, I rebased my branch from the new upstream but I can't test it at the moment: https://github.com/cgoessen/angular-dialog-service/tree/rebase-upstream

I'll update my pull request when I know it works.

niemyjski commented 8 years ago

Thank you

niemyjski commented 6 years ago

Looks like there still are some conflicts

niemyjski commented 6 years ago

Can you please resolve any conflicts so we can review and get this merged in.

cgoessen commented 6 years ago

I'll see what I can do.

I don't have the project on which I was working on at that time.

niemyjski commented 6 years ago

Guess we can close this then or merge it in if the conflicts are resolved? Sorry about that.