Skip to content
Permalink
Browse files Browse the repository at this point in the history
update v1.6.1
  • Loading branch information
marcelodolza committed May 30, 2022
1 parent f8dabd8 commit 01728ac
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 28 deletions.
8 changes: 2 additions & 6 deletions css/iziModal.css
@@ -1,5 +1,5 @@
/*
* iziModal | v1.6.0
* iziModal | v1.6.1
* https://izimodal.marcelodolza.com
* by Marcelo Dolza.
*/
Expand Down Expand Up @@ -112,7 +112,7 @@
margin: 0;
opacity: 0.3;
border-radius: 50%;
transition: transform 0.5s cubic-bezier(.16,.81,.32,1), opacity 0.5s ease;
transition: transform 0.3s cubic-bezier(.16,.81,.32,1), opacity 0.3s ease;
background-size: 67% !important;
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: transparent; /* For some Androids */
Expand Down Expand Up @@ -230,14 +230,10 @@
.iziModal .iziModal-content{
zoom:1;
width: 100%;
-webkit-overflow-scrolling: touch;
/*overflow-y: scroll;*/
}
.iziModal .iziModal-wrap{
width: 100%;
position: relative;
-webkit-overflow-scrolling: touch;
overflow-scrolling: touch;
}
.iziModal .iziModal-iframe{
border: 0;
Expand Down
4 changes: 2 additions & 2 deletions css/iziModal.min.css

Large diffs are not rendered by default.

46 changes: 29 additions & 17 deletions js/iziModal.js
@@ -1,5 +1,5 @@
/*
* iziModal | v1.6.0
* iziModal | v1.6.1
* https://izimodal.marcelodolza.com
* by Marcelo Dolza.
*/
Expand Down Expand Up @@ -73,6 +73,21 @@
$elem.attr('id', id);
}

function sanitize(html) {
function trimAttributes(node) {
$.each(node.attributes, function() {
var attrName = this.name;
var attrValue = this.value;
if (attrName.indexOf('on') == 0 || attrValue.indexOf('javascript:') == 0) $(node).removeAttr(attrName);
});
}
var output = $($.parseHTML('<div>' + html + '</div>', null, false));
output.find('*').each(function() {
trimAttributes(this);
});
return output.html();
}

var animationEvent = whichAnimationEvent(),
isMobile = (/Mobi/.test(navigator.userAgent)) ? true : false;

Expand Down Expand Up @@ -231,11 +246,11 @@
if (this.options.subtitle === '') {
this.$header.addClass(PLUGIN_NAME+'-noSubtitle');
} else {
this.$header.find('.'+PLUGIN_NAME+'-header-subtitle').html(this.options.subtitle)
this.$header.find('.'+PLUGIN_NAME+'-header-subtitle').html(sanitize(this.options.subtitle))
}

if (this.options.title !== '') {
this.$header.find('.'+PLUGIN_NAME+'-header-title').html(this.options.title)
this.$header.find('.'+PLUGIN_NAME+'-header-title').html(sanitize(this.options.title))

if (this.options.headerColor !== null) {
if(this.options.borderBottom === true){
Expand All @@ -251,7 +266,7 @@
this.$header.find('.'+PLUGIN_NAME+'-header-icon').addClass(this.options.icon).css('color', this.options.iconColor);
}
if (this.options.iconText !== null){
this.$header.find('.'+PLUGIN_NAME+'-header-icon').html(this.options.iconText);
this.$header.find('.'+PLUGIN_NAME+'-header-icon').html(sanitize(this.options.iconText));
}
}
this.$element.css('overflow', 'hidden').prepend(this.$header);
Expand Down Expand Up @@ -484,7 +499,6 @@
this.$element.find('.'+PLUGIN_NAME+'-iframe').attr('src', href);
}


if (this.options.bodyOverflow || isMobile){
$('html').addClass(PLUGIN_NAME+'-isOverflow');
if(isMobile){
Expand All @@ -502,7 +516,7 @@
that.$navigate.appendTo('body');
that.$navigate.addClass('fadeIn');

if(that.options.navigateCaption === true){
if(that.options.navigateCaption && !isMobile){
that.$navigate.find('.'+PLUGIN_NAME+'-navigate-caption').show();
}

Expand Down Expand Up @@ -655,7 +669,7 @@
}

if(that.options.restoreDefaultContent === true){
that.$element.find('.'+PLUGIN_NAME+'-content').html( that.content );
that.$element.find('.'+PLUGIN_NAME+'-content').html(that.content);
}

if( $('.'+PLUGIN_NAME+':visible').length === 0 ){
Expand Down Expand Up @@ -945,7 +959,7 @@
this.$header.append('<h2 class="'+PLUGIN_NAME+'-header-title"></h2>');
}

this.$header.find('.'+PLUGIN_NAME+'-header-title').html(title);
this.$header.find('.'+PLUGIN_NAME+'-header-title').html(sanitize(title));
},

setSubtitle: function(subtitle){
Expand All @@ -964,7 +978,7 @@

}

this.$header.find('.'+PLUGIN_NAME+'-header-subtitle').html(subtitle);
this.$header.find('.'+PLUGIN_NAME+'-header-subtitle').html(sanitize(subtitle));
this.options.subtitle = subtitle;
},

Expand All @@ -979,7 +993,7 @@

setIconText: function(iconText){

this.$header.find('.'+PLUGIN_NAME+'-header-icon').html(iconText);
this.$header.find('.'+PLUGIN_NAME+'-header-icon').html(sanitize(iconText));
this.options.iconText = iconText;
},

Expand Down Expand Up @@ -1033,7 +1047,7 @@
content = content.content;
}
if (this.options.iframe === false) {
this.$element.find('.'+PLUGIN_NAME+'-content').html(content);
this.$element.find('.'+PLUGIN_NAME+'-content').html(sanitize(content));
}

},
Expand Down Expand Up @@ -1356,14 +1370,12 @@
});

$document.off('keyup.'+PLUGIN_NAME).on('keyup.'+PLUGIN_NAME, function(event) {

if( $('.'+PLUGIN_NAME+':visible').length ){
if( $('.'+PLUGIN_NAME+':visible').length && !isMobile ){
var modal = $('.'+PLUGIN_NAME+':visible')[0].id,
arrowKeys = $('#'+modal).data().iziModal.options.arrowKeys,
group = $('#'+modal).iziModal('getGroup'),
e = event || window.event,
target = e.target || e.srcElement,
modals = {};
target = e.target || e.srcElement;

if(modal !== undefined && arrowKeys && group.name !== undefined && !e.ctrlKey && !e.metaKey && !e.altKey && target.tagName.toUpperCase() !== 'INPUT' && target.tagName.toUpperCase() != 'TEXTAREA'){ //&& $(e.target).is('body')

Expand Down Expand Up @@ -1391,7 +1403,7 @@
newEL.$el = document.createElement(id[0]);
} catch(exc){ }

newEL.$el.id = this.selector.split('#')[1].trim();
newEL.$el.id = newEL.id[1].trim();

} else if(newEL.class.length > 1){
try{
Expand Down Expand Up @@ -1422,7 +1434,7 @@

return data[option].apply(data, [].concat(args));
}
if (options.autoOpen){ // Automatically open the modal if autoOpen setted true or ms
if (options.autoOpen){

if( !isNaN(parseInt(options.autoOpen)) ){

Expand Down
4 changes: 2 additions & 2 deletions js/iziModal.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "izimodal",
"version": "1.6.0",
"version": "1.6.1",
"description": "Elegant, responsive, flexible and lightweight modal plugin with jQuery.",
"readmeFilename": "README.md",
"main": "js/iziModal.js",
Expand Down

0 comments on commit 01728ac

Please sign in to comment.