Merge pull request #425 from swisnl/prepare-2.2.1

Prepare 2.2.1 release

README.md

@@ -111,15 +111,22 @@ Font-Awesome icons used from [encharm/Font-Awesome-SVG-PNG](https://github.com/e
 
 #### Changed
 
+* Removed old integration tests, framework on which they were built is abandoned.
+* Enable jQuery 3 tests in TravisCI
+
 #### Fixed
 
+* jQuery 3 support was fixed again, was a result of jQuery UI (Fixes #407)
 * Add checks for null before using opt.$menu and root.$menu. Fixes #352 (thanks @andreasrosdal)
+* Small fix for color or ``input`` option on hover
 
 #### Documentation
 
+* Documentation added for cm_seperator (thanks @nelson6e65)
 * Fix typo in items options documentation (thanks @nelson6e65)
 * Fix typo in animation: fadeOut (thanks @avi-meslati-sp)
 * Fix typo in docs code: `show` is used twice (thanks @kgeorgiou)
+* Fix in async documentation.
 
 ### 2.2.0 ###
 

dist/jquery.contextMenu.css

@@ -2,7 +2,7 @@
 /*!
  * jQuery contextMenu - Plugin for simple contextMenu handling
  *
- * Version: v2.2.1-dev
+ * Version: v2.2.1
  *
  * Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
  * Web: http://swisnl.github.io/jQuery-contextMenu/
@@ -12,7 +12,7 @@
  * Licensed under
  *   MIT License http://www.opensource.org/licenses/mit-license
  *
- * Date: 2016-06-17T13:49:48.330Z
+ * Date: 2016-07-15T18:34:01.535Z
  */
 @font-face {
   font-family: "context-menu-icons";

dist/jquery.contextMenu.js

@@ -1,7 +1,7 @@
 /*!
- * jQuery contextMenu v2.2.1-dev - Plugin for simple contextMenu handling
+ * jQuery contextMenu v2.2.1 - Plugin for simple contextMenu handling
  *
- * Version: v2.2.1-dev
+ * Version: v2.2.1
  *
  * Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
  * Web: http://swisnl.github.io/jQuery-contextMenu/
@@ -12,7 +12,7 @@
  *   MIT License http://www.opensource.org/licenses/mit-license
  *   GPL v3 http://opensource.org/licenses/GPL-3.0
  *
- * Date: 2016-07-10T20:49:32.381Z
+ * Date: 2016-07-15T18:34:01.739Z
  */
 
 (function (factory) {
@@ -337,7 +337,7 @@
                         // show menu
 		                var menuContainer = (e.data.appendTo === null ? $('body') : $(e.data.appendTo));
 		                var srcElement = e.target || e.srcElement || e.originalTarget;
-                    op.show.call($this, e.data, e.pageX, e.pageY);
+                        op.show.call($this, e.data, e.pageX, e.pageY);
                     }
                 }
             },

gulpfile.js

@@ -158,25 +158,11 @@ gulp.task('build-icons', function () {
         .pipe(gulp.dest(icons.fontOutputPath));
 });
 
-
-/**
- * Update paths in integration tests that are generated by the documentation
- * generator so they use the local source.
- */
-gulp.task('integration-test-paths', function(){
-    return gulp.src('test/integration/html/*.html').
-    pipe(plugins.replace('http\:\/\/swisnl\.github\.io\/jQuery\-contextMenu\/dist\/', '\.\.\/\.\.\/\.\.\/src\/')).
-    pipe(plugins.replace('\/src\/jquery.contextMenu.css', '\/dist\/jquery.contextMenu.css')).
-    pipe(plugins.replace('http\:\/\/swisnl\.github\.io\/jQuery-contextMenu\/js\/jquery\.ui\.position\.min\.js', '\.\.\/\.\.\/\.\.\/src\/jquery\.ui\.position\.min\.js')).
-    pipe(gulp.dest('test/integration/html/'));
-});
-
-
 gulp.task('watch', ['js', 'css'], function () {
   gulp.watch(scripts.src, ['js']);
   gulp.watch(styles.all, ['css']);
 });
 
-gulp.task('build', ['build-icons', 'css', 'js', 'integration-test-paths']);
+gulp.task('build', ['build-icons', 'css', 'js']);
 
 gulp.task('default', ['watch']);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "jquery-contextmenu",
   "title": "jQuery.contextMenu()",
-  "version": "2.2.1-dev",
+  "version": "2.2.1",
   "author": {
     "name": "Björn Brala",
     "url": "http://www.swis.nl"

src/sass/icons/_variables.scss

@@ -1,5 +1,5 @@
 // DON'T MANUALLY EDIT THIS FILE; run `gulp build-icons` instead.
-$context-menu-icons-cachebust: "1ugwy";
+$context-menu-icons-cachebust: "2tuhk";
 $context-menu-icons: (
 add: "EA01",
 copy: "EA02",