Skip to content

Commit 94dbe27

Browse files
authored
Merge pull request #425 from swisnl/prepare-2.2.1
Prepare 2.2.1 release
2 parents 7fd2f1e + 2a41ace commit 94dbe27

14 files changed

+24
-31
lines changed

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,22 @@ Font-Awesome icons used from [encharm/Font-Awesome-SVG-PNG](https://github.com/e
111111

112112
#### Changed
113113

114+
* Removed old integration tests, framework on which they were built is abandoned.
115+
* Enable jQuery 3 tests in TravisCI
116+
114117
#### Fixed
115118

119+
* jQuery 3 support was fixed again, was a result of jQuery UI (Fixes #407)
116120
* Add checks for null before using opt.$menu and root.$menu. Fixes #352 (thanks @andreasrosdal)
121+
* Small fix for color or ``input`` option on hover
117122

118123
#### Documentation
119124

125+
* Documentation added for cm_seperator (thanks @nelson6e65)
120126
* Fix typo in items options documentation (thanks @nelson6e65)
121127
* Fix typo in animation: fadeOut (thanks @avi-meslati-sp)
122128
* Fix typo in docs code: `show` is used twice (thanks @kgeorgiou)
129+
* Fix in async documentation.
123130

124131
### 2.2.0 ###
125132

dist/font/context-menu-icons.eot

0 Bytes
Binary file not shown.

dist/font/context-menu-icons.ttf

0 Bytes
Binary file not shown.

dist/font/context-menu-icons.woff

4 Bytes
Binary file not shown.

dist/font/context-menu-icons.woff2

16 Bytes
Binary file not shown.

dist/jquery.contextMenu.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*!
33
* jQuery contextMenu - Plugin for simple contextMenu handling
44
*
5-
* Version: v2.2.1-dev
5+
* Version: v2.2.1
66
*
77
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
88
* Web: http://swisnl.github.io/jQuery-contextMenu/
@@ -12,7 +12,7 @@
1212
* Licensed under
1313
* MIT License http://www.opensource.org/licenses/mit-license
1414
*
15-
* Date: 2016-06-17T13:49:48.330Z
15+
* Date: 2016-07-15T18:34:01.535Z
1616
*/
1717
@font-face {
1818
font-family: "context-menu-icons";

dist/jquery.contextMenu.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
2-
* jQuery contextMenu v2.2.1-dev - Plugin for simple contextMenu handling
2+
* jQuery contextMenu v2.2.1 - Plugin for simple contextMenu handling
33
*
4-
* Version: v2.2.1-dev
4+
* Version: v2.2.1
55
*
66
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
77
* Web: http://swisnl.github.io/jQuery-contextMenu/
@@ -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: 2016-07-10T20:49:32.381Z
15+
* Date: 2016-07-15T18:34:01.739Z
1616
*/
1717

1818
(function (factory) {
@@ -337,7 +337,7 @@
337337
// show menu
338338
var menuContainer = (e.data.appendTo === null ? $('body') : $(e.data.appendTo));
339339
var srcElement = e.target || e.srcElement || e.originalTarget;
340-
op.show.call($this, e.data, e.pageX, e.pageY);
340+
op.show.call($this, e.data, e.pageX, e.pageY);
341341
}
342342
}
343343
},

dist/jquery.contextMenu.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.contextMenu.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.contextMenu.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.contextMenu.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -158,25 +158,11 @@ gulp.task('build-icons', function () {
158158
.pipe(gulp.dest(icons.fontOutputPath));
159159
});
160160

161-
162-
/**
163-
* Update paths in integration tests that are generated by the documentation
164-
* generator so they use the local source.
165-
*/
166-
gulp.task('integration-test-paths', function(){
167-
return gulp.src('test/integration/html/*.html').
168-
pipe(plugins.replace('http\:\/\/swisnl\.github\.io\/jQuery\-contextMenu\/dist\/', '\.\.\/\.\.\/\.\.\/src\/')).
169-
pipe(plugins.replace('\/src\/jquery.contextMenu.css', '\/dist\/jquery.contextMenu.css')).
170-
pipe(plugins.replace('http\:\/\/swisnl\.github\.io\/jQuery-contextMenu\/js\/jquery\.ui\.position\.min\.js', '\.\.\/\.\.\/\.\.\/src\/jquery\.ui\.position\.min\.js')).
171-
pipe(gulp.dest('test/integration/html/'));
172-
});
173-
174-
175161
gulp.task('watch', ['js', 'css'], function () {
176162
gulp.watch(scripts.src, ['js']);
177163
gulp.watch(styles.all, ['css']);
178164
});
179165

180-
gulp.task('build', ['build-icons', 'css', 'js', 'integration-test-paths']);
166+
gulp.task('build', ['build-icons', 'css', 'js']);
181167

182168
gulp.task('default', ['watch']);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jquery-contextmenu",
33
"title": "jQuery.contextMenu()",
4-
"version": "2.2.1-dev",
4+
"version": "2.2.1",
55
"author": {
66
"name": "Björn Brala",
77
"url": "http://www.swis.nl"

src/sass/icons/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// DON'T MANUALLY EDIT THIS FILE; run `gulp build-icons` instead.
2-
$context-menu-icons-cachebust: "1ugwy";
2+
$context-menu-icons-cachebust: "2tuhk";
33
$context-menu-icons: (
44
add: "EA01",
55
copy: "EA02",

0 commit comments

Comments
 (0)