Skip to content

Commit

Permalink
Preparing release 1.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
bbrala committed Oct 28, 2015
1 parent 80acaf4 commit 07b403d
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 18 deletions.
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
---

__IMPORTANT: The Next version (2.0.0) will change the default names of the icon classes in order to stop CSS conflicts with frameworks which define the class 'icon'.__


[![Travis Build Status](https://travis-ci.org/swisnl/jQuery-contextMenu.svg?branch=master)](https://travis-ci.org/swisnl/jQuery-contextMenu)

$.contextMenu is a management facility for - you guessed it - context menus. It was designed for an application where there are hundreds of elements that may show a context menu - so intialization speed and memory usage are kept fairly small. It also allows to register context menus without providing actual markup, as $.contextMenu generates DOMElements as needed.
Expand Down Expand Up @@ -100,7 +97,7 @@ $.contextMenu is published under the [MIT license](http://www.opensource.org/lic

## Changelog ##

### Unreleased ###
### 1.10.2 (October 28th 2015) ###

* Reverted the change from 1.7.0: .html() changed back to .text() since it is an security issue (thanks @arai-a)

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jQuery-contextMenu",
"version": "1.10.1",
"version": "1.10.2",
"main": [
"dist/jquery.contextMenu.js",
"dist/jquery.contextMenu.min.js",
Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.contextMenu.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* jQuery contextMenu - Plugin for simple contextMenu handling
*
* Version: v1.10.1
* Version: v1.10.2
*
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
* Web: http://swisnl.github.io/jQuery-contextMenu/
Expand All @@ -11,7 +11,7 @@
* Licensed under
* MIT License http://www.opensource.org/licenses/mit-license
* Date: 2015-10-26T19:58:28.706Z
* Date: 2015-10-28T15:14:59.323Z
*/

.context-menu-list {
Expand Down
6 changes: 3 additions & 3 deletions dist/jquery.contextMenu.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* jQuery contextMenu v1.10.1 - Plugin for simple contextMenu handling
* jQuery contextMenu v1.10.2 - Plugin for simple contextMenu handling
*
* Version: v1.10.1
* Version: v1.10.2
*
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
* Web: http://swisnl.github.io/jQuery-contextMenu/
Expand All @@ -12,7 +12,7 @@
* MIT License http://www.opensource.org/licenses/mit-license
* GPL v3 http://opensource.org/licenses/GPL-3.0
*
* Date: 2015-10-26T22:23:41.404Z
* Date: 2015-10-28T15:15:00.338Z
*/

(function (factory) {
Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.contextMenu.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/jquery.contextMenu.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 07b403d

Please sign in to comment.