Skip to content

Commit

Permalink
bump to v1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
craftpip committed Nov 7, 2015
1 parent 83d84ab commit be0e0c8
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### ![jquery-confirm](https://raw.githubusercontent.com/craftpip/jquery-confirm/master/jquery-confirm.png "jquery-confirm")
*alerts, confirms and dialogs in* ***one.***

v1.7.9
v1.8.0

A multipurpose plugin for alert, confirm & dialog, with Super powers.

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-confirm2",
"version": "1.7.9",
"version": "1.8.0",
"homepage": "https://github.com/craftpip/jquery-confirm",
"authors": [
"boniface pereira <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion css/jquery-confirm.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* jquery-confirm v1.7.9 (http://craftpip.github.io/jquery-confirm/)
* jquery-confirm v1.8.0 (http://craftpip.github.io/jquery-confirm/)
* Author: boniface pereira
* Website: www.craftpip.com
* Contact: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion css/jquery-confirm.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* jquery-confirm v1.7.9 (http://craftpip.github.io/jquery-confirm/)
* jquery-confirm v1.8.0 (http://craftpip.github.io/jquery-confirm/)
* Author: boniface pereira
* Website: www.craftpip.com
* Contact: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery-confirm.min.css

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

4 changes: 2 additions & 2 deletions dist/jquery-confirm.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<script src="demo/libs/bootstrap.min.js"></script>
<script src="demo/libs/pretty.js"></script>
<script>
var version = '1.7.9';
var version = '1.8.0';
</script>
<style type="text/css">
.space10{
Expand Down
Binary file modified jquery-confirm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 8 additions & 7 deletions js/jquery-confirm.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* jquery-confirm v1.7.9 (http://craftpip.github.io/jquery-confirm/)
* jquery-confirm v1.8.0 (http://craftpip.github.io/jquery-confirm/)
* Author: Boniface Pereira
* Website: www.craftpip.com
* Contact: [email protected]
Expand Down Expand Up @@ -73,8 +73,6 @@ var jconfirm, Jconfirm;
},
animations: ['anim-scale', 'anim-top', 'anim-bottom', 'anim-left', 'anim-right', 'anim-zoom', 'anim-opacity', 'anim-none', 'anim-rotate', 'anim-rotatex', 'anim-rotatey', 'anim-scalex', 'anim-scaley'],
_buildHTML: function () {
var that = this;

/*
* Cleaning animations.
*/
Expand All @@ -91,12 +89,13 @@ var jconfirm, Jconfirm;
this.CSS = {
'-webkit-transition-duration': this.animationSpeed / 1000 + 's',
'transition-duration': this.animationSpeed / 1000 + 's',
'-webkjit-transition-timing-function': 'cubic-bezier(0.27, 1.12, 0.32, ' + this.animationBounce + ')',
'-webkit-transition-timing-function': 'cubic-bezier(0.27, 1.12, 0.32, ' + this.animationBounce + ')',
'transition-timing-function': 'cubic-bezier(0.27, 1.12, 0.32, ' + this.animationBounce + ')'
};

this.$el.find('.jconfirm-bg').css(this.CSS);
this.$b = this.$el.find('.jconfirm-box').css(this.CSS).addClass(this.animation);
this.$body = this.$b; // alias

/*
* Add rtl class if rtl option has selected
Expand All @@ -109,14 +108,16 @@ var jconfirm, Jconfirm;
*/
this.setTitle();
this.contentDiv = this.$el.find('div.content');

this.$content = this.contentDiv; // alias

/*
* Settings up buttons
*/
this.$btnc = this.$el.find('.buttons');
if (this.confirmButton && this.confirmButton.trim() !== '') {
this.$confirmButton = $('<button class="btn">' + this.confirmButton + '</button>').appendTo(this.$btnc).addClass(this.confirmButtonClass);
}

if (this.cancelButton && this.cancelButton.trim() !== '') {
this.$cancelButton = $('<button class="btn">' + this.cancelButton + '</button>').appendTo(this.$btnc).addClass(this.cancelButtonClass);
}
Expand All @@ -125,7 +126,7 @@ var jconfirm, Jconfirm;
this.$btnc.remove();
}

if (!this.confirmButton && !this.cancelButton && this.closeIcon == null) {
if (!this.confirmButton && !this.cancelButton && this.closeIcon === null) {
this.$closeButton = this.$b.find('.closeIcon').show();
}

Expand Down Expand Up @@ -298,7 +299,7 @@ var jconfirm, Jconfirm;

var key = e.which;
// Do not react if Enter/Space is pressed on input elements
if (this.$b.find(':input').is(':focus') && /13|32/.test(key))
if (this.contentDiv.find(':input').is(':focus') && /13|32/.test(key))
return false;

if ($.inArray(key, this.cancelKeys) !== -1) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery-confirm",
"version": "1.7.9",
"version": "1.8.0",
"title": "jquery-confirm.js | A multipurpose alert and confirm plugin",
"description": "A jQuery plugin that provides great set of features like, Auto-close, Ajax-loading, background-dismiss, themes and more.",
"homepage": "http://craftpip.github.io/jquery-confirm/",
Expand Down

0 comments on commit be0e0c8

Please sign in to comment.