Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ContextMenu and RightClick done properly. #148

Merged
merged 27 commits into from
Feb 7, 2018

Conversation

stueynz
Copy link
Contributor

@stueynz stueynz commented Jul 17, 2015

The context menu functionality from pull request 96 was a little too simplistic. Building context menu from a model was all very well & good, but we needed a few things:

  • Make it work without jQuery - just jqLite
  • Sub Context Menus
  • The ability to do all that angular goodness to the menu (& sub menu) - directives, bindings, to adjust the menu based on context.
  • Make sure the context will fit when you're at the bottom / right of the window - and maybe put sub-menu on left rather than right.

Oh and context-menu-id will work as a directive all on it's own of course.

Stuart McGrigor and others added 23 commits June 19, 2015 17:04
… fit in the normal place (to the right of parent menu item), and adjust popup menu location when we're cramped for space
@stueynz stueynz mentioned this pull request Jul 17, 2015
@boiawang
Copy link

good

@ramseyfeng
Copy link

When will this pull request be merged?

@yoavaa
Copy link
Contributor

yoavaa commented Dec 26, 2017

There are too many conflicts to simply merge. Can you help resolve all the conflicts?
I'd love to merge if I can, as this seems like a great feature. However, I do not have the time to do so.

@ramseyfeng
Copy link

Maybe the author @stueynz can help to resolve the conflicts.

@stueynz
Copy link
Contributor Author

stueynz commented Dec 29, 2017

Gosh it's been a while.... I'll drag it up to master in the coming week.

@stueynz
Copy link
Contributor Author

stueynz commented Feb 7, 2018

Ok this Pull Request should now be easy for WIX to include in the original project.

@ramseyfeng
Copy link

@stueynz Thanks! Will this be merged? @yoavaa

@yoavaa
Copy link
Contributor

yoavaa commented Feb 7, 2018

Hay, just tried to merge. It appears that sortByExpression does not work for some reason.
Can you check?

I can see a test failing on that.

@yoavaa yoavaa merged commit 8e4cc84 into wix-incubator:master Feb 7, 2018
@yoavaa
Copy link
Contributor

yoavaa commented Feb 7, 2018

Merged!!!

@ramseyfeng
Copy link

Thanks! 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants