From 9ec46a9d1bfa20c6bb808735deb173c2add0ef70 Mon Sep 17 00:00:00 2001 From: "Martin@MBP" Date: Wed, 25 Dec 2013 09:40:35 +0100 Subject: [PATCH] build 1.2.4 --- .gitignore | 2 -- CHANGELOG.md | 8 +++++++- Gruntfile.js | 33 ++++++--------------------------- jquery.ui-contextmenu.js | 2 +- jquery.ui-contextmenu.min.js | 4 ++-- package.json | 12 +++++------- ui-contextmenu.jquery.json | 2 +- 7 files changed, 22 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 46fa677..2f5829a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,5 @@ /node_modules .DS_Store npm-debug.log - .sizecache.json - sauce_connect.log diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d8dbfc..00e61e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ -# 1.2.4 / unreleased +# 1.2.5 / unreleased +* + +# 1.2.4 / 2013-12-25 + +* [BUGFIX] Fixed #44 'Double click on .hasmenu currentTarget empy' * [BUGFIX] Fixed #46 'Not working on XHTML page' (poofeg) +* Added test matrix for different platforms. # 1.2.3 / 2013-10-19 diff --git a/Gruntfile.js b/Gruntfile.js index a1980ab..e0ec5ac 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,19 +6,6 @@ module.exports = function (grunt) { grunt.initConfig({ pkg: grunt.file.readJSON("package.json"), - compare_size: { - files: [ - "jquery.ui-contextmenu.min.js", - "jquery.ui-contextmenu.js" - ], - options: { - compress: { - gz: function (fileContents) { - return require("gzip-js").zip(fileContents, {}).length; - } - } - } - }, connect: { demo: { options: { @@ -110,23 +97,15 @@ module.exports = function (grunt) { grunt.registerTask("server", ["connect:demo"]); grunt.registerTask("test", ["jshint", "qunit"]); - - // - // See - // https://saucelabs.com/docs/javascript-unit-testing-tutorial - // - grunt.registerTask("saucelabs", ["test", - "connect:sauce", - "saucelabs-qunit"]); - - grunt.registerTask("travis", [//"test", - "saucelabs"]); + grunt.registerTask("sauce", ["connect:sauce", + "saucelabs-qunit"]); + grunt.registerTask("travis", ["test", + "sauce"]); grunt.registerTask("default", ["test"]); grunt.registerTask("build", ["exec:tabfix", "test", - "uglify", - "compare_size" - // "saucelabs" + // "sauce", + "uglify" ]); grunt.registerTask("upload", ["build", "exec:upload"]); diff --git a/jquery.ui-contextmenu.js b/jquery.ui-contextmenu.js index c343372..e6fbad2 100644 --- a/jquery.ui-contextmenu.js +++ b/jquery.ui-contextmenu.js @@ -18,7 +18,7 @@ $.widget("moogle.contextmenu", { - version: "1.2.2", + version: "1.2.4", options: { delegate: null, // selector hide: { effect: "fadeOut", duration: "fast"}, diff --git a/jquery.ui-contextmenu.min.js b/jquery.ui-contextmenu.min.js index 2b2c789..04fec81 100644 --- a/jquery.ui-contextmenu.min.js +++ b/jquery.ui-contextmenu.min.js @@ -1,2 +1,2 @@ -/*! jQuery UI context menu plugin - v1.2.3-1 - 2013-12-24 | https://github.com/mar10/jquery-ui-contextmenu | Copyright (c) 2013 Martin Wendt; Licensed MIT */ -(function(e,t,n,i){"use strict";function s(e){return e&&e.match(/^#/)?e.substring(1):e||""}var o="onselectstart"in n.createElement("div");e.widget("moogle.contextmenu",{version:"1.2.2",options:{delegate:null,hide:{effect:"fadeOut",duration:"fast"},ignoreParentSelect:!0,menu:null,position:null,preventSelect:!1,show:{effect:"slideDown",duration:"fast"},taphold:!1,beforeOpen:e.noop,blur:e.noop,close:e.noop,create:e.noop,createMenu:e.noop,focus:e.noop,open:e.noop,select:e.noop},_create:function(){var t,i,s=this.options;this.$headStyle=null,this.$menu=null,this.menuIsTemp=!1,this.currentTarget=null,s.preventSelect&&(i=(e(this.element).is(n)?e("body"):this.element).uniqueId().attr("id"),this.$headStyle=e("