Skip to content

Commit 6f44a18

Browse files
committed
Merge pull request #298 from swisnl/fix-documentation-test-paths
Fix documentation test paths with gulp
2 parents 1bda267 + 59d26c2 commit 6f44a18

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+150
-135
lines changed

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ $.contextMenu is published under the [MIT license](http://www.opensource.org/lic
103103
### Unreleased ###
104104

105105
* __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.
106-
106+
* 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.
107+
* Make sure the contextmenu is not outside the client area by (thanks to @arai-a)
108+
* Update jQuery dependecy so that it will not result in double installation of jQuery when using npm (thanks to @fredericlb)
107109

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

dist/jquery.contextMenu.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Licensed under
1212
* MIT License http://www.opensource.org/licenses/mit-license
1313
14-
* Date: 2015-10-11T18:22:59.127Z
14+
* Date: 2015-10-24T12:55:05.846Z
1515
*/
1616

1717
.context-menu-list {

dist/jquery.contextMenu.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* MIT License http://www.opensource.org/licenses/mit-license
1313
* GPL v3 http://opensource.org/licenses/GPL-3.0
1414
*
15-
* Date: 2015-10-11T18:23:00.141Z
15+
* Date: 2015-10-24T12:55:06.758Z
1616
*/
1717

1818
(function (factory) {
@@ -183,6 +183,10 @@
183183
offset.left -= width;
184184
}
185185

186+
if (offset.left < 0) {
187+
offset.left = 0;
188+
}
189+
186190
opt.$menu.css(offset);
187191
},
188192
// position the sub-menu

dist/jquery.contextMenu.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.contextMenu.min.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.contextMenu.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.contextMenu.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

documentation/couscous.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ menu:
2727
items:
2828
introduction:
2929
text: Introduction
30-
absoluteUrl: /
30+
relativeUrl: /
3131
items:
3232
author:
3333
text: Author

documentation/website/default.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
1818
<script src="{{ baseUrl }}/dist/jquery.contextMenu.min.js" type="text/javascript"></script>
1919

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

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

0 commit comments

Comments
 (0)