Skip to content

Commit

Permalink
Update v1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelodolza committed Oct 1, 2017
1 parent f7f4058 commit ef4532a
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 16 deletions.
6 changes: 4 additions & 2 deletions css/iziModal.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
display: block;
margin: 0;
padding: 0;
font-family: Arial;
font-family: 'Lato', Arial;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
Expand Down Expand Up @@ -176,6 +176,8 @@
}
.iziModal-rtl .iziModal-header-title, .iziModal-rtl .iziModal-header-subtitle{
text-align: right;
font-family: Tahoma, 'Lato', Arial;
font-weight: 500;
}
.iziModal-rtl .iziModal-header.iziModal-noSubtitle {
padding: 10px 15px 12px 40px;
Expand Down Expand Up @@ -265,7 +267,7 @@
color: white;
line-height: 16px;
font-size: 9px;
font-family: arial;
font-family: 'Lato', Arial;
letter-spacing: 0.1em;
text-indent: 0;
text-align: center;
Expand Down
2 changes: 1 addition & 1 deletion css/iziModal.min.css

Large diffs are not rendered by default.

27 changes: 15 additions & 12 deletions js/iziModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@
if(that.group.ids.length > 1 ){

that.$navigate.appendTo('body');
that.$navigate.addClass(that.options.transitionInOverlay);
that.$navigate.addClass('fadeIn');

if(that.options.navigateCaption === true){
that.$navigate.find('.'+PLUGIN_NAME+'-navigate-caption').show();
Expand Down Expand Up @@ -485,7 +485,7 @@

that.$element.removeClass(transitionIn + " transitionIn");
that.$overlay.removeClass(that.options.transitionInOverlay);
that.$navigate.removeClass(that.options.transitionInOverlay);
that.$navigate.removeClass('fadeIn');

opened();
});
Expand Down Expand Up @@ -635,7 +635,14 @@
}
}

if (transitionOut !== '' && animationEvent !== undefined) {
if( (transitionOut === false || transitionOut === '' ) || animationEvent === undefined){

this.$element.hide();
this.$overlay.remove();
this.$navigate.remove();
closed();

} else {

this.$element.attr('class', [
this.classes,
Expand All @@ -649,7 +656,7 @@
this.$overlay.attr('class', PLUGIN_NAME + "-overlay " + this.options.transitionOutOverlay);

if(that.options.navigateArrows !== false){
this.$navigate.attr('class', PLUGIN_NAME + "-navigate " + this.options.transitionOutOverlay);
this.$navigate.attr('class', PLUGIN_NAME + "-navigate fadeOut");
}

this.$element.one(animationEvent, function () {
Expand All @@ -658,16 +665,12 @@
that.$element.removeClass(transitionOut + " transitionOut").hide();
}
that.$overlay.removeClass(that.options.transitionOutOverlay).remove();
that.$navigate.removeClass(that.options.transitionOutOverlay).remove();
that.$navigate.removeClass('fadeOut').remove();
closed();
});
}
else {
this.$element.hide();
this.$overlay.remove();
this.$navigate.remove();
closed();
}

}

}
},

Expand Down
Loading

0 comments on commit ef4532a

Please sign in to comment.