Skip to content

Commit 41e8264

Browse files
committed
Preparing release 2.0.0
1 parent a62febc commit 41e8264

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+112
-113
lines changed

README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
---
88

9-
__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'.__
9+
__IMPORTANT: 2.0.0 is release and has change the default names of the icon classes in order to stop CSS conflicts with frameworks which define the class 'icon'.__
1010

1111

1212
[![Travis Build Status](https://travis-ci.org/swisnl/jQuery-contextMenu.svg?branch=master)](https://travis-ci.org/swisnl/jQuery-contextMenu)
@@ -103,16 +103,15 @@ Font-Awesome icons used from [encharm/Font-Awesome-SVG-PNG](https://github.com/e
103103

104104
## Changelog ##
105105

106-
### Unreleased ###
106+
### 2.0.0 (October 28th 2015) ###
107107

108-
* __The Next version will change the default names of the icon classes in order to stop CSS conflicts with frameworks which define the class 'icon'.__ In order to keep the icon names the same as before this change you can change the defaults on the classnames for the icons ([docs on classNames option](http://swisnl.github.io/jQuery-contextMenu/docs.html#options-classNames)). The classnames will probably be "context-menu-icon-*" as proposed earlier by @rodneyrehm.
108+
* __This version will changes the default names of the icon classes in order to stop CSS conflicts with frameworks which define the class 'icon'.__ In order to keep the icon names the same as before this change you can change the defaults on the classnames for the icons ([docs on classNames option](http://swisnl.github.io/jQuery-contextMenu/docs.html#options-classNames)). The classnames will probably be "context-menu-icon-*" as proposed earlier by @rodneyrehm.
109109
* You can not use SASS to customize your contextmenu. The gulp command build-icons takes all the SVG icons from src/icons and builds them into a font. In order to this we needed to break backwards compatibility. This does mean the new CSS does not have the old .icon class defined which makes it a lot more stable within CSS frameworks. The first revision of the documentation is found [here](documentation/docs/customize.md).
110-
* The 1.x branch will be maintained for a while, just to make bugfixes are done there still. But support for 1.x will be dropped in the coming months.
110+
* The 1.x branch will be maintained for a while with bugfixes. But support for 1.x will be dropped in the coming months.
111111
* Reverted the change from 1.7.0: .html() changed back to .text() since it is an security issue (thanks @arai-a)
112112

113113
### 1.10.1 (October 25th 2015) ###
114114

115-
* Last release before 2.0
116115
* Added gulp command (integration-test-paths) to change the paths in the integration tests to the correct path after they are overwritten by the documentation generator.
117116
* Make sure the contextmenu is not outside the client area by (thanks to @arai-a)
118117
* Update jQuery dependecy so that it will not result in double installation of jQuery when using npm (thanks to @fredericlb)

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jQuery-contextMenu",
3-
"version": "1.10.1",
3+
"version": "2.0.0",
44
"main": [
55
"dist/jquery.contextMenu.js",
66
"dist/jquery.contextMenu.min.js",

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

0 Bytes
Binary file not shown.

dist/font/context-menu-icons.woff2

4 Bytes
Binary file not shown.

dist/jquery.contextMenu.css

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*!
33
* jQuery contextMenu - Plugin for simple contextMenu handling
44
*
5-
* Version: v1.10.1
5+
* Version: v2.0.0
66
*
77
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
88
* Web: http://swisnl.github.io/jQuery-contextMenu/
@@ -12,15 +12,15 @@
1212
* Licensed under
1313
* MIT License http://www.opensource.org/licenses/mit-license
1414
*
15-
* Date: 2015-10-26T20:12:37.063Z
15+
* Date: 2015-10-28T15:16:13.762Z
1616
*/
1717
@font-face {
1818
font-family: "context-menu-icons";
1919
font-style: normal;
2020
font-weight: normal;
2121

22-
src: url("font/context-menu-icons.eot?3ex7z");
23-
src: url("font/context-menu-icons.eot?3ex7z#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?3ex7z") format("woff2"), url("font/context-menu-icons.woff?3ex7z") format("woff"), url("font/context-menu-icons.ttf?3ex7z") format("truetype");
22+
src: url("font/context-menu-icons.eot?4maaf");
23+
src: url("font/context-menu-icons.eot?4maaf#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?4maaf") format("woff2"), url("font/context-menu-icons.woff?4maaf") format("woff"), url("font/context-menu-icons.ttf?4maaf") format("truetype");
2424
}
2525

2626
.context-menu-icon-add:before, .context-menu-icon-copy:before, .context-menu-icon-cut:before, .context-menu-icon-delete:before, .context-menu-icon-edit:before, .context-menu-icon-paste:before, .context-menu-icon-quit:before {

dist/jquery.contextMenu.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
2-
* jQuery contextMenu v1.10.1 - Plugin for simple contextMenu handling
2+
* jQuery contextMenu v2.0.0 - Plugin for simple contextMenu handling
33
*
4-
* Version: v1.10.1
4+
* Version: v2.0.0
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: 2015-10-26T21:06:48.056Z
15+
* Date: 2015-10-28T15:16:15.572Z
1616
*/
1717

1818
(function (factory) {

dist/jquery.contextMenu.min.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)