Skip to content

Commit 093ed06

Browse files
needimneedim
committed
version 2.2.4
1 parent 8f8d9bd commit 093ed06

File tree

8 files changed

+122
-96
lines changed

8 files changed

+122
-96
lines changed

‎Gruntfile.js

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
module.exports = function (grunt) {
22
grunt.initConfig({
33

4+
bump: {
5+
options: {
6+
files: ['package.json', 'noty.jquery.json', 'bower.json', 'js/noty/jquery.noty.js'],
7+
updateConfigs: [],
8+
commit: false,
9+
commitMessage: 'Release v%VERSION%',
10+
commitFiles: ['-a'],
11+
createTag: true,
12+
tagName: 'v%VERSION%',
13+
tagMessage: 'Version %VERSION%',
14+
push: false,
15+
pushTo: 'upstream',
16+
gitDescribeOptions: '--tags --always --abbrev=1 --dirty=-d'
17+
}
18+
},
419
concat: {
520
dist: {
621
src: ['js/noty/jquery.noty.js', 'js/noty/layouts/*.js', 'js/noty/themes/*.js'],
@@ -9,6 +24,11 @@ module.exports = function (grunt) {
924
},
1025

1126
uglify: {
27+
options: {
28+
preserveComments: function(a) {
29+
return !!(a.start.file == 'js/noty/jquery.noty.js' && a.start.line == 11);
30+
}
31+
},
1232
minifyJS: {
1333
files: {
1434
'js/noty/packaged/jquery.noty.packaged.min.js': ['js/noty/jquery.noty.js', 'js/noty/layouts/*.js', 'js/noty/themes/*.js']
@@ -19,5 +39,9 @@ module.exports = function (grunt) {
1939

2040
grunt.loadNpmTasks('grunt-contrib-uglify');
2141
grunt.loadNpmTasks('grunt-contrib-concat');
22-
grunt.registerTask('build', ['concat', 'uglify:minifyJS']);
42+
grunt.loadNpmTasks('grunt-bump');
43+
44+
grunt.registerTask('build', ['bump', 'concat', 'uglify:minifyJS']);
45+
grunt.registerTask('conc', ['concat']);
46+
grunt.registerTask('ugly', ['uglify:minifyJS']);
2347
};

‎README.markdown

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
[![Gittip donate button](http://img.shields.io/gittip/needim.png)](https://www.gittip.com/needim/ "Donate weekly to this project using Gittip")
2-
[![Flattr donate button](http://img.shields.io/flattr/donate.png?color=green)](https://flattr.com/thing/529967/noty-jQuery-Notification-Plugin "Donate monthly to this project using Flattr")
3-
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/needim/noty/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
4-
51
# noty - A jQuery Notification Plugin
62

73
![noty v2](http://needim.github.io/noty/img/noty-v2-logo.png?v2 "noty v2")
@@ -44,12 +40,12 @@ Documentation and examples are here: <http://needim.github.io/noty>
4440
2. If you cloned a while ago, get the latest changes from upstream:
4541

4642
```bash
47-
git checkout develop
48-
git pull upstream develop
43+
git checkout master
44+
git pull upstream master
4945
```
5046

51-
3. Create a new topic branch (off the main project development branch) to
52-
contain your feature, change, or fix:
47+
3. Create a new topic branch (off the main project development branch)
48+
to contain your feature, change, or fix:
5349

5450
```bash
5551
git checkout -b <topic-branch-name>
@@ -61,10 +57,10 @@ Documentation and examples are here: <http://needim.github.io/noty>
6157
[interactive rebase](https://help.github.com/articles/interactive-rebase)
6258
feature to tidy up your commits before making them public.
6359

64-
5. Locally merge (or rebase) the upstream development branch into your topic branch:
60+
5. Locally merge (or rebase) the upstream master branch into your topic branch:
6561

6662
```bash
67-
git pull [--rebase] upstream develop
63+
git pull [--rebase] upstream master
6864
```
6965

7066
6. Push your topic branch up to your fork:
@@ -74,7 +70,7 @@ Documentation and examples are here: <http://needim.github.io/noty>
7470
```
7571

7672
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
77-
with a clear title and description against the `develop` branch.
73+
with a clear title and description against the `master` branch.
7874

7975
**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
8076
license your work under the the terms of the [MIT License](LICENSE.txt).

‎bower.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "noty",
3-
"version": "2.2.2",
4-
"authors": [
5-
"Nedim Arabacı"
6-
],
7-
"description": "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)"
2+
"name" : "noty",
3+
"version" : "2.2.4",
4+
"authors" : [
5+
"Nedim Arabacı"
6+
],
7+
"description": "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)"
88
}

‎js/noty/jquery.noty.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
/**
2-
* noty - jQuery Notification Plugin v2.2.2
3-
* Contributors: https://github.com/needim/noty/graphs/contributors
4-
*
5-
* Examples and Documentation - http://needim.github.com/noty/
6-
*
7-
* Licensed under the MIT licenses:
8-
* http://www.opensource.org/licenses/mit-license.php
9-
*
10-
**/
1+
/*!
2+
@package noty - jQuery Notification Plugin
3+
@version version: 2.2.4
4+
@contributors https://github.com/needim/noty/graphs/contributors
5+
6+
@documentation Examples and Documentation - http://needim.github.com/noty/
7+
8+
@license Licensed under the MIT licenses: http://www.opensource.org/licenses/mit-license.php
9+
*/
1110

1211
if (typeof Object.create !== 'function') {
1312
Object.create = function (o) {

‎js/noty/packaged/jquery.noty.packaged.js

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
/**
2-
* noty - jQuery Notification Plugin v2.2.2
3-
* Contributors: https://github.com/needim/noty/graphs/contributors
4-
*
5-
* Examples and Documentation - http://needim.github.com/noty/
6-
*
7-
* Licensed under the MIT licenses:
8-
* http://www.opensource.org/licenses/mit-license.php
9-
*
10-
**/
1+
/*!
2+
@package noty - jQuery Notification Plugin
3+
@version version: 2.2.4
4+
@contributors https://github.com/needim/noty/graphs/contributors
5+
6+
@documentation Examples and Documentation - http://needim.github.com/noty/
7+
8+
@license Licensed under the MIT licenses: http://www.opensource.org/licenses/mit-license.php
9+
*/
1110

1211
if (typeof Object.create !== 'function') {
1312
Object.create = function (o) {
@@ -77,7 +76,7 @@ if (typeof Object.create !== 'function') {
7776
$.each(this.options.buttons, function (i, button) {
7877
var $button = $('<button/>').addClass((button.addClass) ? button.addClass : 'gray').html(button.text).attr('id', button.id ? button.id : 'button-' + i)
7978
.appendTo(self.$bar.find('.noty_buttons'))
80-
.bind('click', function () {
79+
.on('click', function () {
8180
if ($.isFunction(button.onClick)) {
8281
button.onClick.call($button, self);
8382
}
@@ -474,7 +473,7 @@ if (typeof Object.create !== 'function') {
474473
buttons:false
475474
};
476475

477-
$(window).resize(function () {
476+
$(window).on('resize', function () {
478477
$.each($.noty.layouts, function (index, layout) {
479478
layout.container.style.apply($(layout.container.selector));
480479
});
@@ -1101,7 +1100,7 @@ window.noty = function noty(options) {
11011100
marginLeft: 0
11021101
});
11031102

1104-
this.$bar.bind({
1103+
this.$bar.on({
11051104
mouseenter: function() { $(this).find('.noty_close').stop().fadeTo('normal',1); },
11061105
mouseleave: function() { $(this).find('.noty_close').stop().fadeTo('normal',0); }
11071106
});

‎js/noty/packaged/jquery.noty.packaged.min.js

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎noty.jquery.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
2-
"name" : "noty",
3-
"version" : "2.2.0",
4-
"title" : "noty - a jquery notification plugin",
5-
"description" : "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
6-
"keywords" : ["noty", "notification", "plugin", "jquery", "javascript", "alert", "error", "warning", "information", "confirmation"],
7-
"homepage" : "http://needim.github.com/noty",
8-
"docs" : "http://needim.github.com/noty",
9-
"demo" : "http://needim.github.com/noty",
10-
"bugs" : "https://github.com/needim/noty/issues",
11-
"download" : "https://github.com/needim/noty/archive/v2.2.0.zip",
12-
"author" : {
13-
"name": "Nedim Arabacı",
14-
"url" : "http://github.com/needim/"
15-
},
16-
"licenses" : [
17-
{
18-
"type": "MIT",
19-
"url" : "http://noty.mit-license.org/"
20-
}
21-
],
22-
"dependencies": {
23-
"jquery": ">=1.8"
24-
}
2+
"name" : "noty",
3+
"version" : "2.2.4",
4+
"title" : "noty - a jquery notification plugin",
5+
"description" : "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
6+
"keywords" : ["noty", "notification", "plugin", "jquery", "javascript", "alert", "error", "warning", "information", "confirmation"],
7+
"homepage" : "http://needim.github.com/noty",
8+
"docs" : "http://needim.github.com/noty",
9+
"demo" : "http://needim.github.com/noty",
10+
"bugs" : "https://github.com/needim/noty/issues",
11+
"download" : "https://github.com/needim/noty/archive/v2.2.0.zip",
12+
"author" : {
13+
"name": "Nedim Arabacı",
14+
"url" : "http://github.com/needim/"
15+
},
16+
"licenses" : [
17+
{
18+
"type": "MIT",
19+
"url" : "http://noty.mit-license.org/"
20+
}
21+
],
22+
"dependencies": {
23+
"jquery": ">=1.8"
24+
}
2525
}

‎package.json

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
{
2-
"name" : "noty",
3-
"version" : "2.2.0",
4-
"title" : "noty - a jquery notification plugin",
5-
"description" : "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
6-
"homepage" : "http://needim.github.com/noty",
7-
"author" : {
8-
"name": "Nedim Arabacı",
9-
"url" : "http://github.com/needim/"
10-
},
11-
"licenses" : [
12-
{
13-
"type": "MIT",
14-
"url" : "http://noty.mit-license.org/"
15-
}
16-
],
17-
"scripts" : {
18-
"build": "grunt build"
19-
},
20-
"repository" : {
21-
"type": "git",
22-
"url" : "git://github.com/needim/noty.git"
23-
},
24-
"dependencies" : {
25-
26-
},
27-
"devDependencies": {
28-
"grunt" : "~0.4.1",
29-
"grunt-contrib-uglify": "~0.2.2",
30-
"grunt-contrib-concat": "~0.3.0"
31-
}
32-
}
2+
"name" : "noty",
3+
"version" : "2.2.4",
4+
"title" : "noty - a jquery notification plugin",
5+
"description" : "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
6+
"homepage" : "http://needim.github.com/noty",
7+
"author" : {
8+
"name": "Nedim Arabacı",
9+
"url" : "http://github.com/needim/"
10+
},
11+
"licenses" : [
12+
{
13+
"type": "MIT",
14+
"url" : "http://noty.mit-license.org/"
15+
}
16+
],
17+
"scripts" : {
18+
"build": "grunt build"
19+
},
20+
"repository" : {
21+
"type": "git",
22+
"url" : "git://github.com/needim/noty.git"
23+
},
24+
"dependencies" : {},
25+
"devDependencies": {
26+
"grunt" : "~0.4.5",
27+
"grunt-contrib-uglify": "~0.4.0",
28+
"grunt-contrib-concat": "~0.4.0",
29+
"grunt-bump" : "0.0.14"
30+
}
31+
}

0 commit comments

Comments
 (0)