angular-dialog-service icon indicating copy to clipboard operation
angular-dialog-service copied to clipboard

add resolve option for custom modal

Open cgoessen opened this issue 10 years ago • 7 comments
trafficstars

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.

  • remove as not needed after a modalInstance dismiss

cgoessen avatar Sep 11 '15 06:09 cgoessen

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

niemyjski avatar Feb 23 '16 19:02 niemyjski

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.

cgoessen avatar Feb 24 '16 13:02 cgoessen

Thank you

niemyjski avatar Feb 24 '16 13:02 niemyjski

Looks like there still are some conflicts

niemyjski avatar Jan 24 '18 17:01 niemyjski

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

niemyjski avatar Mar 15 '18 11:03 niemyjski

I'll see what I can do.

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

cgoessen avatar Mar 15 '18 13:03 cgoessen

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

niemyjski avatar Mar 16 '18 13:03 niemyjski