diff --git a/README.md b/README.md index f5a6ee8..57c46d8 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ $ cat bower.json ## Changelog +### v1.3.5 +- oprava smazaného modifikátoru `pdbox--inner` při použití option `isInner` u pdboxu + ### v1.3.4 - titulek a popis v pdboxu je možno nastavit pomocí data atributů na odkazu (`data-pdbox-title` a `data-pdbox-description`) diff --git a/bower.json b/bower.json index ea79c0b..abd1b72 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jquery.pdbox", - "version": "1.3.4", + "version": "1.3.5", "homepage": "https://github.com/peckadesign/jquery.pdbox", "authors": [ "PeckaDesign, s.r.o " diff --git a/dist/js/jquery.pdbox.js b/dist/js/jquery.pdbox.js index 2e0cd0c..5e528af 100644 --- a/dist/js/jquery.pdbox.js +++ b/dist/js/jquery.pdbox.js @@ -3,10 +3,10 @@ * https://github.com/peckadesign/jquery.pdbox * * @author PeckaDesign, s.r.o - * @copyright Copyright (c) 2014-2018 PeckaDesign, s.r.o + * @copyright Copyright (c) 2014-2019 PeckaDesign, s.r.o * @license MIT * - * @version 1.3.4 + * @version 1.3.5 */ $.pdBox = (function () { @@ -273,14 +273,15 @@ $.pdBox = (function () { } this.rootElem - // odstraníme všechny class krom "pdbox" a případné "pdbox--loading" + // odstraníme všechny class krom povolených interních modifikátorů .removeClass(function(i, className) { var list = className.split(' '); + var allowedClass = ['pdbox', 'pdbox--loading', 'pdbox--media', 'pdbox--inner']; + return list.filter(function(val){ - return (val !== 'pdbox' && val !== 'pdbox--loading' && val !== 'pdbox--media'); + return allowedClass.indexOf(val) === -1; }).join(' '); }) - .addClass('pdbox') .addClass(this.options.className); this.window.content.css({ diff --git a/dist/js/jquery.pdbox.min.js b/dist/js/jquery.pdbox.min.js index 0af074d..64674e8 100644 --- a/dist/js/jquery.pdbox.min.js +++ b/dist/js/jquery.pdbox.min.js @@ -1,3 +1,3 @@ -/*! jQuery pdBox 1.3.4 | MIT | PeckaDesign, s.r.o, https://github.com/peckadesign/jquery.pdbox */ +/*! jQuery pdBox 1.3.5 | MIT | PeckaDesign, s.r.o, https://github.com/peckadesign/jquery.pdbox */ -$.pdBox=function(){function a(a){a=a||{},this.defaults={};for(var c in p)p.hasOwnProperty(c)&&(this.defaults[c]=void 0!==a[c]?a[c]:p[c]);this.defaults.className=p.className+(a.className?" "+a.className:""),this.options=$.extend({},p,a),a.template&&(this.options.template=a.template.toString()),"object"==typeof a.langs?this.langs=$.extend({},q,a.langs):this.langs=q,this.options.lang in this.langs||(this.options.lang="en"),this.isOpen=!1,this.setOnOpenOptions=!1,this.isAjax=a.isAjax||!1,this.isInner=a.isInner||!1,this.events={},this.overlay=null,this.rootElem={},this.window={},this.$doc=$(document),this.$body=$("body"),this.spinnerHtml=a.spinnerHtml||"",this.html="function"==typeof a.template?a.template(this):b(this),this.$el=null;var d="";for(var e in r){if(d=v(r[e]),"object"==typeof a[d])for(fn in a[d])a[d].hasOwnProperty(fn)&&"function"==typeof a[d][fn]&&this.addEventListener(r[e],a[d][fn]);else"function"==typeof a[d]&&this.addEventListener(r[e],a[d]);this.options[d]=void 0}this.addEventListener("load",function(){this.rootElem.removeClass("pdbox--loading")}),this.addEventListener("afterOpen",i),this.addEventListener("load",i),l()}function b(a){return $content="
\t
\t\t

\t\t
"+(a.isAjax?"
":"")+"\t\t
\t\t

\t\t\t"+a.langs[a.options.lang].prev+"\t\t\t\t\t\t"+a.langs[a.options.lang].of+"\t\t\t"+a.langs[a.options.lang].next+"\t\t

\t\t

\t\t
"+a.spinnerHtml+"\t\t "+a.langs[a.options.lang].close+"\t
",$content}function c(a){a.rootElem=$('
'),a.rootElem.html(a.html).prependTo(a.$body),a.window.elem=a.rootElem.find(".pdbox__window"),a.window.close=a.window.elem.find(".pdbox__close"),a.window.title=a.window.elem.find(".pdbox__title"),a.window.content=a.window.elem.find(".pdbox__content"),a.window.descWrap=a.window.elem.find(".pdbox__desc"),a.window.desc=a.window.elem.find(".pdbox__snippet"),a.window.desc.length||(a.window.desc=a.window.descWrap),a.window.pager={elem:a.window.elem.find(".pdbox__pager"),pages:a.window.elem.find(".pdbox__pages"),pagesSummary:a.window.elem.find(".pdbox__pages-summary"),activePage:a.window.elem.find(".pdbox__active-page"),pagesCount:a.window.elem.find(".pdbox__pages-count"),prev:a.window.elem.find(".pdbox__page--prev"),next:a.window.elem.find(".pdbox__page--next"),thumbnails:a.window.elem.find(".pdbox__pager--thumbnails")},a.window.media=a.window.elem.find(".pdbox__media-box"),$(document).on("click.pdbox",".pdbox__close, .pdbox__close--alternative",$.proxy(o,a)),a.$doc.on("keyup.pdbox",$.proxy(g,a))}function d(a){a.window.close.off(),a.window.pager.next.off(),a.window.pager.prev.off(),a.window.pager.pages.find("a").off(),a.window.pager.thumbnails.off(),a.overlay.off(),a.$doc.off("keyup.pdbox"),a.rootElem.remove()}function e(a,b,c){var d=b.data("rel");if(d){var e=$(c),g=$([]),i=e.filter('[data-rel="'+d+'"]'),j="";if(i.each(function(a){j+=" "+(a+1)+" "}),a.window.pager.pages.empty().append(j),a.options.imageThumbnails){var k="";i.each(function(a){k+="
  • "}),a.window.pager.thumbnails.append($('
      ')).find(".pdbox__thumbnail-list").append(k),a.window.pager.thumbnails.show(),g=a.window.pager.thumbnails.find("a")}else a.window.pager.thumbnails.hide();$numbers=a.window.pager.pages.find("a"),$numbers.on("click.pdbox",function(b){var c=$(this),d=$numbers.index(this);$numbers.removeClass("pdbox__page--active"),c.addClass("pdbox__page--active"),g.length&&(g.removeClass("pdbox__thumbnail-link--active"),g.eq(d).addClass("pdbox__thumbnail-link--active")),a.window.pager.activePage.text(d+1),a.options.infinitePager||(0===d?a.window.pager.prev.addClass("pdbox__page--disabled"):a.window.pager.prev.removeClass("pdbox__page--disabled"),d===$numbers.length-1?a.window.pager.next.addClass("pdbox__page--disabled"):a.window.pager.next.removeClass("pdbox__page--disabled")),f(a,this.href,i.eq(d)),b.preventDefault()}).eq(i.index(b)).trigger("click.pdbox"),g.length&&g.on("click.pdbox",function(a){a.preventDefault(),$numbers.eq(g.index(this)).trigger("click.pdbox")}),a.window.pager.prev.on("click.pdbox",function(b){b.preventDefault();var c=a.window.pager.pages.find(".pdbox__page--active").prev();0===c.length&&a.options.infinitePager&&(c=a.window.pager.pages.find(".pdbox__page").last()),c.length&&c.trigger("click.pdbox")}),a.window.pager.next.on("click.pdbox",function(b){b.preventDefault();var c=a.window.pager.pages.find(".pdbox__page--active").next();0===c.length&&a.options.infinitePager&&(c=a.window.pager.pages.find(".pdbox__page").first()),c.length&&c.trigger("click.pdbox")}),a.$doc.on("keyup.pdbox",$.proxy(h,a)),$numbers.length>1&&(a.window.pager.elem.show(),a.window.pager.pagesCount.text($numbers.length))}}function f(a,b,c){var d=c.find("img"),e=c.data("pdbox-title")||d.attr("alt")||c.attr("title"),f=c.data("pdbox-description")||d.attr("title")||"",g=c.data("pdbox-srcset");a.rootElem.addClass("pdbox--loading pdbox--media"),a.window.media.show(),e?a.window.title.show().text(e):a.window.title.hide(),f?(a.window.descWrap.show(),a.window.desc.html("

      "+f+"

      ")):a.window.descWrap.hide();var h=c.data("pdbox-video"),i="pdbox__media "+(h?"pdbox__media--video":"pdbox__media--image"),j={src:b};if(preloader=document.createElement(h?"iframe":"img"),$(preloader).on("load insert",function(b){(!h&&"load"===b.type||h&&"insert"===b.type)&&a.window.media.html(this),"load"===b.type&&a.dispatchEvent("load",{element:c,content:preloader})}),h)j.allowfullscreen=!0,j.width=a.options.width,j.height=a.options.width/(16/9);else if(g){j.srcset=g;var k=c.data("pdbox-sizes");(k||(k=a.options.sizes))&&(j.sizes=k)}$(preloader).addClass(i).attr(j),h&&$(preloader).triggerHandler("insert")}function g(a){27===a.which&&this.close()}function h(a){37===a.which?this.window.pager.prev.not(".pdbox__page--disabled").trigger("click"):39===a.which&&this.window.pager.next.not(".pdbox__page--disabled").trigger("click"),a.preventDefault()}function i(){this.isBodyOverflowing?this.$body.addClass("pdbox-open--scrollbar-offset"):k(this)?this.window.elem.addClass("pdbox__window--scrollbar-offset"):this.window.elem.removeClass("pdbox__window--scrollbar-offset")}function j(){var a=document.body.getBoundingClientRect();return a.left+a.rightdocument.documentElement.clientHeight}function l(){var a=document.createElement("style");document.head.appendChild(a);var b=a.sheet;b.insertRule(":root { --pdbox-scrollbar-width:"+m()+"px; }",b.cssRules.length)}function m(){var a=document.createElement("p");a.style.width="100%",a.style.height="200px";var b=document.createElement("div");b.style.position="absolute",b.style.top="0px",b.style.left="0px",b.style.visibility="hidden",b.style.width="200px",b.style.height="150px",b.style.overflow="hidden",b.appendChild(a),document.body.appendChild(b);var c=a.offsetWidth;b.style.overflow="scroll";var d=a.offsetWidth;return c===d&&(d=b.clientWidth),document.body.removeChild(b),c-d}function n(a){a.overlay=$('
      ').prependTo(a.rootElem)}function o(a){var b=$(a.target).closest("a");(a.target===this.window.elem[0]||this.window.elem.has(a.target).length&&(b.hasClass("pdbox__close")||b.hasClass("pdbox__close--alternative")))&&(this.close(),a.preventDefault())}var p={width:900,className:"",imageThumbnails:!1,infinitePager:!1,lang:$("html").attr("lang")||"cs"},q={cs:{close:"Zavřít",prev:"Předchozí",next:"Další",of:"/"},sk:{close:"Zavrieť",prev:"Predchádzajúca",next:"Ďalšie",of:"/"},en:{close:"Close",prev:"Previous",next:"Next",of:"/"},de:{close:"Zumachen",prev:"Vorige",next:"Folgend",of:"/"},es:{close:"Vaer",prev:"Previo",next:"Siguiente",of:"/"},fr:{close:"Fermer",prev:"Précédant",next:"Suivant",of:"/"},it:{close:"Chiudere",prev:"Previo",next:"Veniente",of:"/"},ru:{close:"закрыть",prev:"Предшествующий",next:"Последующий",of:"/"}},r=["beforeOpen","afterOpen","load","beforeClose","afterClose"];a.prototype.open=function(a,b,d){this.$el=a,this.isOpen?this.removeEventListener("load",this.setOptions):(this.isOpen=!0,this.setOnOpenOptions=!0,this.isBodyOverflowing=j(),this.dispatchEvent("beforeOpen",{element:a}),c(this),n(this),d||this.rootElem.addClass("pdbox--loading"),this.isInner&&this.rootElem.addClass("pdbox--inner"),this.setOptions(),this.setOnOpenOptions=!1),this.addEventListener("load",this.setOptions),this.window.elem.on("click",$.proxy(o,this)),this.$body.addClass("pdbox-open"),this.window.pager.elem.hide(),this.window.pager.thumbnails.hide(),this.window.media.hide(),this.window.title.hide(),void 0!==a&&void 0!==b&&a.is(":not(.ajax)")&&e(this,a,b),this.dispatchEvent("afterOpen",{element:a})},a.prototype.close=function(){if(this.isOpen){this.isOpen=!1,this.$el=null,this.removeEventListener("load",this.setOptions),this.rootElem.addClass("pdbox--closing"),this.dispatchEvent("beforeClose"),this.window.elem.off();var a=parseInt(getComputedStyle(this.rootElem[0]).getPropertyValue("--pdbox-closing-duration")||0),b=this;setTimeout(function(){d(b),b.isInner||b.$body.removeClass("pdbox-open pdbox-open--scrollbar-offset"),b.dispatchEvent("afterClose")},a)}},a.prototype.content=function(a){if(void 0===a){var b=this.window.elem.clone();return b.find(".ajax-overlay, .ajax-loader").remove(),b.html()}this.window.elem.html(a),this.window.content=this.window.elem.find(".pdbox__content")},a.prototype.setOptions=function(a,b){var c,d,e;if(this.setOnOpenOptions){$.extend(this.options,this.defaults);for(c in r)d=v(r[c]),this.options[d]=null}if(this.$el){var f={};f.width=this.$el.data("pdboxWidth"),f.className=this.$el.data("pdboxClassName")?this.$el.data("pdboxClassName")+" "+this.defaults.className:this.defaults.className;for(c in r)e=u(r[c]),d=v(r[c]),f[d]=this.$el.data(e);$.extend(this.options,f)}a&&b&&$.extend(this.options,a),this.rootElem.removeClass(function(a,b){return b.split(" ").filter(function(a){return"pdbox"!==a&&"pdbox--loading"!==a&&"pdbox--media"!==a}).join(" ")}).addClass("pdbox").addClass(this.options.className),this.window.content.css({"max-width":this.options.width+"px"})};var s=function(a){a in this.events||(this.events[a]=[])};a.prototype.addEventListener=function(a,b){s.call(this,a),this.events[a].push(b)},a.prototype.removeEventListener=function(a,b){s.call(this,a),void 0===a?this.events={}:this.events[a]=$.grep(this.events[a],function(a){return void 0!==b&&a!==b})},a.prototype.dispatchEvent=function(a,b){s.call(this,a);for(var c=0;c