diff --git a/.gitignore b/.gitignore index f0844a2..242a85d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /.settings /node_modules -/test/issue-* +/test/triage/ .DS_Store npm-debug.log .sizecache.json diff --git a/CHANGELOG.md b/CHANGELOG.md index be29c0b..383fb44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ -# 1.13.0-0 / Unreleased - * +# 1.13.1-0 / Unreleased + * [BUGFIX] #109 Fix `setEntry(title)` for titles containing icons + * [BUGFIX] #110 Fix `setEntry({...})` for jQuery UI 1.12 # 1.13.0 / 2016-08-21 @@ -21,7 +22,7 @@ # 1.10.0 / 2015-06-27 -* [FEATURE] New option `tooltip`, adds a `title` attribute to the menu markup +* [FEATURE] New option `tooltip`, adds a `title` attribute to the menu markup # 1.9.0 / 2015-04-20 diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 060ee20..6de0e39 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -54,7 +54,8 @@ module.exports = (grunt) -> # overwrite : true # replacements: [ { # from : /@DATE/g - # to : "<%= grunt.template.today('yyyy-mm-dd\"T\"HH:MM') %>" + # # https://github.com/felixge/node-dateformat + # to : "<%= grunt.template.today('isoUtcDateTime') %>" # },{ # from : /buildType:\s*\"[a-zA-Z]+\"/g # to : "buildType: \"production\"" @@ -78,7 +79,7 @@ module.exports = (grunt) -> "http://localhost:9999/test/test-jquery-1.9-ui-1.10.html" ] build: process.env.TRAVIS_JOB_ID - throttled: 8 + throttled: 5 browsers: [ { browserName: "chrome", platform: "Windows 8.1" } { browserName: "firefox", platform: "Windows 8.1" } @@ -91,13 +92,17 @@ module.exports = (grunt) -> { browserName: "safari", version: "9", platform: "OS X 10.11" } ] testname: "jquery.ui-contextmenu qunit tests (jQuery UI 10)" + # statusCheckAttempts: 180 + recordVideo: false + videoUploadOnPass: false + ui_12: options: urls: [ "http://localhost:9999/test/test-jquery-3-ui-1.12.html" ] build: process.env.TRAVIS_JOB_ID - throttled: 8 + throttled: 5 browsers: [ { browserName: "chrome", platform: "Windows 8.1" } { browserName: "firefox", platform: "Windows 8.1" } @@ -107,6 +112,10 @@ module.exports = (grunt) -> { browserName: "safari", version: "9", platform: "OS X 10.11" } ] testname: "jquery.ui-contextmenu qunit tests (jQuery UI 12)" + # statusCheckAttempts: 180 + recordVideo: false + videoUploadOnPass: false + ui: # UI Menu 11+ dropped support for IE7 options: urls: [ @@ -118,7 +127,7 @@ module.exports = (grunt) -> # username: process.env.SAUCE_USERNAME, # key: process.env.SAUCE_ACCESS_KEY, build: process.env.TRAVIS_JOB_ID - throttled: 8 + throttled: 5 browsers: [ { browserName: "chrome", platform: "Windows 8.1" } { browserName: "firefox", platform: "Windows 8.1" } @@ -138,10 +147,13 @@ module.exports = (grunt) -> { browserName: "safari", version: "9", platform: "OS X 10.11" } ] testname: "jquery.ui-contextmenu qunit tests (jQuery UI 11+)" + # statusCheckAttempts: 180 + recordVideo: false + videoUploadOnPass: false uglify: options: - banner: "/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - " + "<%= grunt.template.today('yyyy-mm-dd') %> | " + "<%= pkg.homepage ? ' ' + pkg.homepage + ' | ' : '' %>" + " Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" + " Licensed <%= _.map(pkg.licenses, 'type').join(', ') %> */\n" + banner: "/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - " + "<%= grunt.template.today('yyyy-mm-dd') %> | " + "<%= pkg.homepage ? ' ' + pkg.homepage + ' | ' : '' %>" + " Copyright (c) 2013 -<%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" + " Licensed <%= _.map(pkg.licenses, 'type').join(', ') %> */\n" report: "gzip" build: diff --git a/LICENSE.txt b/LICENSE.txt index 1fe179f..adfa23f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright 2013-2016 Martin Wendt and others (see commiter list on GitHub) +Copyright 2013-2017 Martin Wendt and others (see commiter list on GitHub) https://github.com/mar10/jquery-ui-contextmenu Permission is hereby granted, free of charge, to any person obtaining diff --git a/README.md b/README.md index e614ce6..69add07 100644 --- a/README.md +++ b/README.md @@ -43,16 +43,16 @@ First, include dependencies: * jQuery UI 1.9+ (at least core, widget, menu), 1.11+ recommended * One of the ThemeRoller CSS themes or a custom one * jquery.ui-contextmenu.js (also available as CDN on - [jsdelivr](http://www.jsdelivr.com/#!jquery.ui-contextmenu) - or [cdnjs](https://cdnjs.com/libraries/jquery.ui-contextmenu)) + [jsdelivr](http://www.jsdelivr.com/#!jquery.ui-contextmenu), + [cdnjs](https://cdnjs.com/libraries/jquery.ui-contextmenu)), or + [UNPKG](https://unpkg.com/ui-contextmenu@latest/jquery.ui-contextmenu.min.js) ```html - - - - + + + + ``` Assume we have some HTML elements that we want to attach a popup menu to: diff --git a/bower.json b/bower.json index 8fb7fda..557ae38 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ui-contextmenu", "description": "Turn a jQuery UI Menu widget into a contextmenu.", - "version": "1.13.0", + "version": "1.13.1", "main": [ "jquery.ui-contextmenu.js" ], diff --git a/jquery.ui-contextmenu.js b/jquery.ui-contextmenu.js index 055856b..cf3c211 100644 --- a/jquery.ui-contextmenu.js +++ b/jquery.ui-contextmenu.js @@ -5,7 +5,7 @@ * * @see https://github.com/mar10/jquery-ui-contextmenu * - * Copyright (c) 2013-2016, Martin Wendt (http://wwWendt.de). Licensed MIT. + * Copyright (c) 2013-2017, Martin Wendt (http://wwWendt.de). Licensed MIT. */ (function( factory ) { @@ -372,6 +372,8 @@ $.widget("moogle.contextmenu", { $ul = $("