Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ $.contextMenu is published under the [MIT license](http://www.opensource.org/lic
### Unreleased ###

* __The Next version will change the default names of the icon classes in order to stop CSS conflicts with frameworks which define the class 'icon'.__ In order to keep the icon names the same as before this change you can change the defaults on the classnames for the icons ([docs on classNames option](http://swisnl.github.io/jQuery-contextMenu/docs.html#options-classNames)). The classnames will probably be "context-menu-icon-*" as proposed earlier by @rodneyrehm.

* Added gulp command (integration-test-paths) to change the paths in the integration tests to the correct path after they are overwritten by the documentation generator.
* Make sure the contextmenu is not outside the client area by (thanks to @arai-a)
* Update jQuery dependecy so that it will not result in double installation of jQuery when using npm (thanks to @fredericlb)

### 1.9.1 (October 11th 2015) ###

Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.contextMenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Licensed under
* MIT License http://www.opensource.org/licenses/mit-license

* Date: 2015-10-11T18:22:59.127Z
* Date: 2015-10-24T12:55:05.846Z
*/

.context-menu-list {
Expand Down
6 changes: 5 additions & 1 deletion dist/jquery.contextMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* MIT License http://www.opensource.org/licenses/mit-license
* GPL v3 http://opensource.org/licenses/GPL-3.0
*
* Date: 2015-10-11T18:23:00.141Z
* Date: 2015-10-24T12:55:06.758Z
*/

(function (factory) {
Expand Down Expand Up @@ -183,6 +183,10 @@
offset.left -= width;
}

if (offset.left < 0) {
offset.left = 0;
}

opt.$menu.css(offset);
},
// position the sub-menu
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.contextMenu.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/jquery.contextMenu.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/jquery.contextMenu.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jquery.contextMenu.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion documentation/couscous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ menu:
items:
introduction:
text: Introduction
absoluteUrl: /
relativeUrl: /
items:
author:
text: Author
Expand Down
2 changes: 1 addition & 1 deletion documentation/website/default.twig
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="{{ baseUrl }}/dist/jquery.contextMenu.min.js" type="text/javascript"></script>

<script src="{{ baseUrl }}/js/jquery.ui.position.min.js" type="text/javascript"></script>
<script src="{{ baseUrl }}/dist/jquery.ui.position.min.js" type="text/javascript"></script>

<script src="{{ baseUrl }}/js/main.js" type="text/javascript"></script>

Expand Down
Loading