diff --git a/cg_template_switcher_changelog.xml b/cg_template_switcher_changelog.xml index d4b52a1..477b31d 100644 --- a/cg_template_switcher_changelog.xml +++ b/cg_template_switcher_changelog.xml @@ -1,4 +1,16 @@ + + pkg_cg_template_switcher + package + 2.0.7 + + Update : 18/02/2023 + + + Remove jQuery dependency + Remove FancyBox + + pkg_cg_template_switcher package diff --git a/packages/mod_cg_template_switcher_j4.zip b/packages/mod_cg_template_switcher_j4.zip index d2cb542..bc500ea 100644 Binary files a/packages/mod_cg_template_switcher_j4.zip and b/packages/mod_cg_template_switcher_j4.zip differ diff --git a/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.ini b/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.ini index 45a5d5e..3a9ca33 100644 --- a/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.ini +++ b/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.ini @@ -1,4 +1,4 @@ -CG_XML_DESCRIPTION="

CG Template Switcher version 2.0.6

" +CG_XML_DESCRIPTION="

CG Template Switcher version 2.0.7

" CG_STYLE_PREVIEW="Preview template ?" CG_STYLE_PREVIEWDESC="Show or not template preview window ?" CG_STYLE_AUTO="Auto Switch" diff --git a/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.sys.ini b/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.sys.ini index 1308ba4..ec17968 100644 --- a/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.sys.ini +++ b/packages/mod_cg_template_switcher_j4/language/en-GB/mod_cg_template_switcher.sys.ini @@ -1,2 +1,2 @@ -CG_XML_DESCRIPTION="

CG Template Switcher version 2.0.6

" +CG_XML_DESCRIPTION="

CG Template Switcher version 2.0.7

" diff --git a/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.ini b/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.ini index 2ea2939..628e347 100644 --- a/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.ini +++ b/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.ini @@ -1,4 +1,4 @@ -CG_XML_DESCRIPTION="

CG Template Switcher version 2.0.6.

" +CG_XML_DESCRIPTION="

CG Template Switcher version 2.0.7.

" CG_STYLE_PREVIEW="Prévisualisation du template ?" CG_STYLE_PREVIEWDESC="Activer ou non la Prévisualisation du template ?" CG_STYLE_AUTO="Auto Switch" diff --git a/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.sys.ini b/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.sys.ini index bb98aec..dd6b4fb 100644 --- a/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.sys.ini +++ b/packages/mod_cg_template_switcher_j4/language/fr-FR/mod_cg_template_switcher.sys.ini @@ -1 +1 @@ -CG_XML_DESCRIPTION="

CG Template Switcher version 2.0.6.

" +CG_XML_DESCRIPTION="

CG Template Switcher version 2.0.7.

" diff --git a/packages/mod_cg_template_switcher_j4/media/fancybox/blank.gif b/packages/mod_cg_template_switcher_j4/media/fancybox/blank.gif deleted file mode 100644 index 35d42e8..0000000 Binary files a/packages/mod_cg_template_switcher_j4/media/fancybox/blank.gif and /dev/null differ diff --git a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_loading.gif b/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_loading.gif deleted file mode 100644 index a03a40c..0000000 Binary files a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_loading.gif and /dev/null differ diff --git a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_loading@2x.gif b/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_loading@2x.gif deleted file mode 100644 index 9205aeb..0000000 Binary files a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_loading@2x.gif and /dev/null differ diff --git a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_overlay.png b/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_overlay.png deleted file mode 100644 index a439139..0000000 Binary files a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_overlay.png and /dev/null differ diff --git a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_sprite.png b/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_sprite.png deleted file mode 100644 index fd8d5ca..0000000 Binary files a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_sprite.png and /dev/null differ diff --git a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_sprite@2x.png b/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_sprite@2x.png deleted file mode 100644 index d0e4779..0000000 Binary files a/packages/mod_cg_template_switcher_j4/media/fancybox/fancybox_sprite@2x.png and /dev/null differ diff --git a/packages/mod_cg_template_switcher_j4/media/fancybox/jquery.fancybox.css b/packages/mod_cg_template_switcher_j4/media/fancybox/jquery.fancybox.css deleted file mode 100644 index fb2c6dd..0000000 --- a/packages/mod_cg_template_switcher_j4/media/fancybox/jquery.fancybox.css +++ /dev/null @@ -1,275 +0,0 @@ -/*! fancyBox v2.1.5 fancyapps.com | fancyapps.com/fancybox/#license */ -.fancybox-wrap, -.fancybox-skin, -.fancybox-outer, -.fancybox-inner, -.fancybox-image, -.fancybox-wrap iframe, -.fancybox-wrap object, -.fancybox-nav, -.fancybox-nav span, -.fancybox-tmp -{ - padding: 0; - margin: 0; - border: 0; - outline: none; - vertical-align: top; -} - -.fancybox-wrap { - position: absolute; - top: 0; - left: 0; - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); - z-index: 8020; -} - -.fancybox-skin { - position: relative; - background: #f9f9f9; - color: #444; - text-shadow: none; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.fancybox-opened { - z-index: 8030; -} - -.fancybox-opened .fancybox-skin { - -webkit-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5); - box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5); -} - -.fancybox-outer, .fancybox-inner { - position: relative; -} - -.fancybox-inner { - overflow: hidden; -} - -.fancybox-type-iframe .fancybox-inner { - -webkit-overflow-scrolling: touch; -} - -.fancybox-error { - color: #444; - font: 14px/20px "Helvetica Neue",Helvetica,Arial,sans-serif; - margin: 0; - padding: 15px; - white-space: nowrap; -} - -.fancybox-image, .fancybox-iframe { - display: block; - width: 100%; - height: 100%; -} - -.fancybox-image { - max-width: 100%; - max-height: 100%; -} - -#fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span { - background-image: url(fancybox_sprite.png); -} - -#fancybox-loading { - position: fixed; - top: 50%; - left: 50%; - margin-top: -22px; - margin-left: -22px; - background-position: 0 -108px; - opacity: 0.8; - cursor: pointer; - z-index: 8060; -} - -#fancybox-loading div { - width: 44px; - height: 44px; - background: url(fancybox_loading.gif) center center no-repeat; -} - -.fancybox-close { - position: absolute; - top: -18px; - right: -18px; - width: 36px; - height: 36px; - cursor: pointer; - z-index: 8040; -} - -.fancybox-nav { - position: absolute; - top: 0; - width: 40%; - height: 100%; - cursor: pointer; - text-decoration: none; - background: transparent url(blank.gif); /* helps IE */ - -webkit-tap-highlight-color: rgba(0,0,0,0); - z-index: 8040; -} - -.fancybox-prev { - left: 0; -} - -.fancybox-next { - right: 0; -} - -.fancybox-nav span { - position: absolute; - top: 50%; - width: 36px; - height: 34px; - margin-top: -18px; - cursor: pointer; - z-index: 8040; - visibility: hidden; -} - -.fancybox-prev span { - left: 10px; - background-position: 0 -36px; -} - -.fancybox-next span { - right: 10px; - background-position: 0 -72px; -} - -.fancybox-nav:hover span { - visibility: visible; -} - -.fancybox-tmp { - position: absolute; - top: -99999px; - left: -99999px; - max-width: 99999px; - max-height: 99999px; - overflow: visible !important; -} - -/* Overlay helper */ - -.fancybox-lock { - overflow: visible !important; - width: auto; -} - -.fancybox-lock body { - overflow: hidden !important; -} - -.fancybox-lock-test { - overflow-y: hidden !important; -} - -.fancybox-overlay { - position: absolute; - top: 0; - left: 0; - overflow: hidden; - display: none; - z-index: 8010; - background: url(fancybox_overlay.png); -} - -.fancybox-overlay-fixed { - position: fixed; - bottom: 0; - right: 0; -} - -.fancybox-lock .fancybox-overlay { - overflow: auto; - overflow-y: scroll; -} - -/* Title helper */ - -.fancybox-title { - visibility: hidden; - font: normal 13px/20px "Helvetica Neue",Helvetica,Arial,sans-serif; - position: relative; - text-shadow: none; - z-index: 8050; -} - -.fancybox-opened .fancybox-title { - visibility: visible; -} - -.fancybox-title-float-wrap { - position: absolute; - bottom: 0; - right: 50%; - margin-bottom: -35px; - z-index: 8050; - text-align: center; -} - -.fancybox-title-float-wrap .child { - display: inline-block; - margin-right: -100%; - padding: 2px 20px; - background: transparent; /* Fallback for web browsers that doesn't support RGBa */ - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - text-shadow: 0 1px 2px #222; - color: #FFF; - font-weight: bold; - line-height: 24px; - white-space: nowrap; -} - -.fancybox-title-outside-wrap { - position: relative; - margin-top: 10px; - color: #fff; -} - -.fancybox-title-inside-wrap { - padding-top: 10px; -} - -.fancybox-title-over-wrap { - position: absolute; - bottom: 0; - left: 0; - color: #fff; - padding: 10px; - background: #000; - background: rgba(0, 0, 0, .8); -} - -/*Retina graphics!*/ -@media only screen and (-webkit-min-device-pixel-ratio: 1.5), - only screen and (min--moz-device-pixel-ratio: 1.5), - only screen and (min-device-pixel-ratio: 1.5){ - - #fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span { - background-image: url(fancybox_sprite@2x.png); - background-size: 44px 152px; /*The size of the normal image, half the size of the hi-res image*/ - } - - #fancybox-loading div { - background-image: url(fancybox_loading@2x.gif); - background-size: 24px 24px; /*The size of the normal image, half the size of the hi-res image*/ - } -} \ No newline at end of file diff --git a/packages/mod_cg_template_switcher_j4/media/fancybox/jquery.fancybox.pack.js b/packages/mod_cg_template_switcher_j4/media/fancybox/jquery.fancybox.pack.js deleted file mode 100644 index 640e016..0000000 --- a/packages/mod_cg_template_switcher_j4/media/fancybox/jquery.fancybox.pack.js +++ /dev/null @@ -1,46 +0,0 @@ -/*! fancyBox v2.1.7 fancyapps.com | fancyapps.com/fancybox/#license */ -(function(t,J,f,x){var L=f("html"),q=f(t),p=f(J),b=f.fancybox=function(){b.open.apply(this,arguments)},K=navigator.userAgent.match(/msie/i),D=null,u=J.createTouch!==x,v=function(a){return a&&a.hasOwnProperty&&a instanceof f},r=function(a){return a&&"string"===f.type(a)},G=function(a){return r(a)&&0
',image:'',iframe:'",error:'

The requested content cannot be loaded.
Please try again later.

',closeBtn:'',next:'',prev:'',loading:'
'},openEffect:"fade", -openSpeed:250,openEasing:"swing",openOpacity:!0,openMethod:"zoomIn",closeEffect:"fade",closeSpeed:250,closeEasing:"swing",closeOpacity:!0,closeMethod:"zoomOut",nextEffect:"elastic",nextSpeed:250,nextEasing:"swing",nextMethod:"changeIn",prevEffect:"elastic",prevSpeed:250,prevEasing:"swing",prevMethod:"changeOut",helpers:{overlay:!0,title:!0},onCancel:f.noop,beforeLoad:f.noop,afterLoad:f.noop,beforeShow:f.noop,afterShow:f.noop,beforeChange:f.noop,beforeClose:f.noop,afterClose:f.noop},group:{},opts:{}, -previous:null,coming:null,current:null,isActive:!1,isOpen:!1,isOpened:!1,wrap:null,skin:null,outer:null,inner:null,player:{timer:null,isActive:!1},ajaxLoad:null,imgPreload:null,transitions:{},helpers:{},open:function(a,c){if(a&&(f.isPlainObject(c)||(c={}),!1!==b.close(!0)))return f.isArray(a)||(a=v(a)?f(a).get():[a]),f.each(a,function(d,e){var k={},g,l,h,n,m;"object"===f.type(e)&&(e.nodeType&&(e=f(e)),v(e)?(k={href:e.data("fancybox-href")||e.attr("href"),title:f("
").text(e.data("fancybox-title")|| -e.attr("title")||"").html(),isDom:!0,element:e},f.metadata&&f.extend(!0,k,e.metadata())):k=e);g=c.href||k.href||(r(e)?e:null);l=c.title!==x?c.title:k.title||"";n=(h=c.content||k.content)?"html":c.type||k.type;!n&&k.isDom&&(n=e.data("fancybox-type"),n||(n=(n=e.prop("class").match(/fancybox\.(\w+)/))?n[1]:null));r(g)&&(n||(b.isImage(g)?n="image":b.isSWF(g)?n="swf":"#"===g.charAt(0)?n="inline":r(e)&&(n="html",h=e)),"ajax"===n&&(m=g.split(/\s+/,2),g=m.shift(),m=m.shift()));h||("inline"===n?g?h=f(r(g)? -g.replace(/.*(?=#[^\s]+$)/,""):g):k.isDom&&(h=e):"html"===n?h=g:n||g||!k.isDom||(n="inline",h=e));f.extend(k,{href:g,type:n,content:h,title:l,selector:m});a[d]=k}),b.opts=f.extend(!0,{},b.defaults,c),c.keys!==x&&(b.opts.keys=c.keys?f.extend({},b.defaults.keys,c.keys):!1),b.group=a,b._start(b.opts.index)},cancel:function(){var a=b.coming;a&&!1===b.trigger("onCancel")||(b.hideLoading(),a&&(b.ajaxLoad&&b.ajaxLoad.abort(),b.ajaxLoad=null,b.imgPreload&&(b.imgPreload.onload=b.imgPreload.onerror=null),a.wrap&& -a.wrap.stop(!0,!0).trigger("onReset").remove(),b.coming=null,b.current||b._afterZoomOut(a)))},close:function(a){b.cancel();!1!==b.trigger("beforeClose")&&(b.unbindEvents(),b.isActive&&(b.isOpen&&!0!==a?(b.isOpen=b.isOpened=!1,b.isClosing=!0,f(".fancybox-item, .fancybox-nav").remove(),b.wrap.stop(!0,!0).removeClass("fancybox-opened"),b.transitions[b.current.closeMethod]()):(f(".fancybox-wrap").stop(!0).trigger("onReset").remove(),b._afterZoomOut())))},play:function(a){var c=function(){clearTimeout(b.player.timer)}, -d=function(){c();b.current&&b.player.isActive&&(b.player.timer=setTimeout(b.next,b.current.playSpeed))},e=function(){c();p.unbind(".player");b.player.isActive=!1;b.trigger("onPlayEnd")};!0===a||!b.player.isActive&&!1!==a?b.current&&(b.current.loop||b.current.index=e.index?"next":"prev"],b.router=d||"jumpto",e.loop&&(0>a&&(a=e.group.length+a%e.group.length),a%=e.group.length),e.group[a]!==x&&(b.cancel(),b._start(a)))},reposition:function(a,c){var d=b.current,e=d?d.wrap:null,k;e&&(k=b._getPosition(c),a&&"scroll"===a.type?(delete k.position,e.stop(!0,!0).animate(k,200)):(e.css(k), -d.pos=f.extend({},d.dim,k)))},update:function(a){var c=a&&a.originalEvent&&a.originalEvent.type,d=!c||"orientationchange"===c;d&&(clearTimeout(D),D=null);b.isOpen&&!D&&(D=setTimeout(function(){var e=b.current;e&&!b.isClosing&&(b.wrap.removeClass("fancybox-tmp"),(d||"load"===c||"resize"===c&&e.autoResize)&&b._setDimension(),"scroll"===c&&e.canShrink||b.reposition(a),b.trigger("onUpdate"),D=null)},d&&!u?0:300))},toggle:function(a){b.isOpen&&(b.current.fitToView="boolean"===f.type(a)?a:!b.current.fitToView, -u&&(b.wrap.removeAttr("style").addClass("fancybox-tmp"),b.trigger("onUpdate")),b.update())},hideLoading:function(){p.unbind(".loading");f("#fancybox-loading").remove()},showLoading:function(){var a,c;b.hideLoading();a=f(b.opts.tpl.loading).click(b.cancel).appendTo("body");p.bind("keydown.loading",function(a){27===(a.which||a.keyCode)&&(a.preventDefault(),b.cancel())});b.defaults.fixed||(c=b.getViewport(),a.css({position:"absolute",top:.5*c.h+c.y,left:.5*c.w+c.x}));b.trigger("onLoading")},getViewport:function(){var a= -b.current&&b.current.locked||!1,c={x:q.scrollLeft(),y:q.scrollTop()};a&&a.length?(c.w=a[0].clientWidth,c.h=a[0].clientHeight):(c.w=u&&t.innerWidth?t.innerWidth:q.width(),c.h=u&&t.innerHeight?t.innerHeight:q.height());return c},unbindEvents:function(){b.wrap&&v(b.wrap)&&b.wrap.unbind(".fb");p.unbind(".fb");q.unbind(".fb")},bindEvents:function(){var a=b.current,c;a&&(q.bind("orientationchange.fb"+(u?"":" resize.fb")+(a.autoCenter&&!a.locked?" scroll.fb":""),b.update),(c=a.keys)&&p.bind("keydown.fb", -function(d){var e=d.which||d.keyCode,k=d.target||d.srcElement;if(27===e&&b.coming)return!1;d.ctrlKey||d.altKey||d.shiftKey||d.metaKey||k&&(k.type||f(k).is("[contenteditable]"))||f.each(c,function(c,k){if(1h.clientWidth||h.clientHeight&&h.scrollHeight>h.clientHeight),d=f(d).parent();0!==e&&!h&&1g||0>k)&&b.next(0>g?"up":"right"),c.preventDefault())}))},trigger:function(a,c){var d,e=c||b.coming||b.current;if(e){f.isFunction(e[a])&&(d=e[a].apply(e,Array.prototype.slice.call(arguments,1)));if(!1===d)return!1;e.helpers&&f.each(e.helpers,function(c, -d){if(d&&b.helpers[c]&&f.isFunction(b.helpers[c][a]))b.helpers[c][a](f.extend(!0,{},b.helpers[c].defaults,d),e)})}p.trigger(a)},isImage:function(a){return r(a)&&a.match(/(^data:image\/.*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg)((\?|#).*)?$)/i)},isSWF:function(a){return r(a)&&a.match(/\.(swf)((\?|#).*)?$/i)},_start:function(a){var c={},d,e;a=m(a);d=b.group[a]||null;if(!d)return!1;c=f.extend(!0,{},b.opts,d);d=c.margin;e=c.padding;"number"===f.type(d)&&(c.margin=[d,d,d,d]);"number"===f.type(e)&&(c.padding= -[e,e,e,e]);c.modal&&f.extend(!0,c,{closeBtn:!1,closeClick:!1,nextClick:!1,arrows:!1,mouseWheel:!1,keys:null,helpers:{overlay:{closeClick:!1}}});c.autoSize&&(c.autoWidth=c.autoHeight=!0);"auto"===c.width&&(c.autoWidth=!0);"auto"===c.height&&(c.autoHeight=!0);c.group=b.group;c.index=a;b.coming=c;if(!1===b.trigger("beforeLoad"))b.coming=null;else{e=c.type;d=c.href;if(!e)return b.coming=null,b.current&&b.router&&"jumpto"!==b.router?(b.current.index=a,b[b.router](b.direction)):!1;b.isActive=!0;if("image"=== -e||"swf"===e)c.autoHeight=c.autoWidth=!1,c.scrolling="visible";"image"===e&&(c.aspectRatio=!0);"iframe"===e&&u&&(c.scrolling="scroll");c.wrap=f(c.tpl.wrap).addClass("fancybox-"+(u?"mobile":"desktop")+" fancybox-type-"+e+" fancybox-tmp "+c.wrapCSS).appendTo(c.parent||"body");f.extend(c,{skin:f(".fancybox-skin",c.wrap),outer:f(".fancybox-outer",c.wrap),inner:f(".fancybox-inner",c.wrap)});f.each(["Top","Right","Bottom","Left"],function(a,b){c.skin.css("padding"+b,y(c.padding[a]))});b.trigger("onReady"); -if("inline"===e||"html"===e){if(!c.content||!c.content.length)return b._error("content")}else if(!d)return b._error("href");"image"===e?b._loadImage():"ajax"===e?b._loadAjax():"iframe"===e?b._loadIframe():b._afterLoad()}},_error:function(a){f.extend(b.coming,{type:"html",autoWidth:!0,autoHeight:!0,minWidth:0,minHeight:0,scrolling:"no",hasError:a,content:b.coming.tpl.error});b._afterLoad()},_loadImage:function(){var a=b.imgPreload=new Image;a.onload=function(){this.onload=this.onerror=null;b.coming.width= -this.width/b.opts.pixelRatio;b.coming.height=this.height/b.opts.pixelRatio;b._afterLoad()};a.onerror=function(){this.onload=this.onerror=null;b._error("image")};a.src=b.coming.href;!0!==a.complete&&b.showLoading()},_loadAjax:function(){var a=b.coming;b.showLoading();b.ajaxLoad=f.ajax(f.extend({},a.ajax,{url:a.href,error:function(a,d){b.coming&&"abort"!==d?b._error("ajax",a):b.hideLoading()},success:function(c,d){"success"===d&&(a.content=c,b._afterLoad())}}))},_loadIframe:function(){var a=b.coming, -c=f(a.tpl.iframe.replace(/\{rnd\}/g,(new Date).getTime())).attr("scrolling",u?"auto":a.iframe.scrolling).attr("src",a.href);f(a.wrap).bind("onReset",function(){try{f(this).find("iframe").hide().attr("src","//about:blank").end().empty()}catch(d){}});a.iframe.preload&&(b.showLoading(),c.one("load",function(){f(this).data("ready",1);u||f(this).bind("load.fb",b.update);f(this).parents(".fancybox-wrap").width("100%").removeClass("fancybox-tmp").show();b._afterLoad()}));a.content=c.appendTo(a.inner);a.iframe.preload|| -b._afterLoad()},_preloadImages:function(){var a=b.group,c=b.current,d=a.length,e=c.preload?Math.min(c.preload,d-1):0,f,g;for(g=1;g<=e;g+=1)f=a[(c.index+g)%d],"image"===f.type&&f.href&&((new Image).src=f.href)},_afterLoad:function(){var a=b.coming,c=b.current,d,e,k,g,l;b.hideLoading();if(a&&!1!==b.isActive)if(!1===b.trigger("afterLoad",a,c))a.wrap.stop(!0).trigger("onReset").remove(),b.coming=null;else{c&&(b.trigger("beforeChange",c),c.wrap.stop(!0).removeClass("fancybox-opened").find(".fancybox-item, .fancybox-nav").remove()); -b.unbindEvents();d=a.content;e=a.type;k=a.scrolling;f.extend(b,{wrap:a.wrap,skin:a.skin,outer:a.outer,inner:a.inner,current:a,previous:c});g=a.href;switch(e){case "inline":case "ajax":case "html":a.selector?d=f("
").html(d).find(a.selector):v(d)&&(d.data("fancybox-placeholder")||d.data("fancybox-placeholder",f('
').insertAfter(d).hide()),d=d.show().detach(),a.wrap.bind("onReset",function(){f(this).find(d).length&&d.hide().replaceAll(d.data("fancybox-placeholder")).data("fancybox-placeholder", -!1)}));break;case "image":d=a.tpl.image.replace(/\{href\}/g,g);break;case "swf":d='',l="",f.each(a.swf,function(a,b){d+='';l+=" "+a+'="'+b+'"'}),d+='"}v(d)&&d.parent().is(a.inner)||a.inner.append(d);b.trigger("beforeShow"); -a.inner.css("overflow","yes"===k?"scroll":"no"===k?"hidden":k);b._setDimension();b.reposition();b.isOpen=!1;b.coming=null;b.bindEvents();if(!b.isOpened)f(".fancybox-wrap").not(a.wrap).stop(!0).trigger("onReset").remove();else if(c.prevMethod)b.transitions[c.prevMethod]();b.transitions[b.isOpened?a.nextMethod:a.openMethod]();b._preloadImages()}},_setDimension:function(){var a=b.getViewport(),c=0,d,e=b.wrap,k=b.skin,g=b.inner,l=b.current;d=l.width;var h=l.height,n=l.minWidth,w=l.minHeight,p=l.maxWidth, -q=l.maxHeight,u=l.scrolling,r=l.scrollOutside?l.scrollbarWidth:0,z=l.margin,A=m(z[1]+z[3]),t=m(z[0]+z[2]),x,B,v,E,C,H,D,F,I;e.add(k).add(g).width("auto").height("auto").removeClass("fancybox-tmp");z=m(k.outerWidth(!0)-k.width());x=m(k.outerHeight(!0)-k.height());B=A+z;v=t+x;E=G(d)?(a.w-B)*m(d)/100:d;C=G(h)?(a.h-v)*m(h)/100:h;if("iframe"===l.type){if(I=l.content,l.autoHeight&&I&&1===I.data("ready"))try{I[0].contentWindow.document.location&&(g.width(E).height(9999),H=I.contents().find("body"),r&&H.css("overflow-x", -"hidden"),C=H.outerHeight(!0))}catch(M){}}else if(l.autoWidth||l.autoHeight)g.addClass("fancybox-tmp"),l.autoWidth||g.width(E),l.autoHeight||g.height(C),l.autoWidth&&(E=g.width()),l.autoHeight&&(C=g.height()),g.removeClass("fancybox-tmp");d=m(E);h=m(C);F=E/C;n=m(G(n)?m(n,"w")-B:n);p=m(G(p)?m(p,"w")-B:p);w=m(G(w)?m(w,"h")-v:w);q=m(G(q)?m(q,"h")-v:q);H=p;D=q;l.fitToView&&(p=Math.min(a.w-B,p),q=Math.min(a.h-v,q));B=a.w-A;t=a.h-t;l.aspectRatio?(d>p&&(d=p,h=m(d/F)),h>q&&(h=q,d=m(h*F)),dB||A>t)&&d>n&&h>w&&!(19p&&(d=p,h=m(d/F)),g.width(d).height(h),e.width(d+z),a=e.width(),A=e.height();else d=Math.max(n,Math.min(d,d-(a-B))),h=Math.max(w,Math.min(h,h-(A-t)));r&&"auto"===u&&hB||A>t)&&d>n&&h>w;d=l.aspectRatio?dw&&h
').appendTo(c&&c.length?c:"body");this.fixed=!1;a.fixed&&b.defaults.fixed&&(this.overlay.addClass("fancybox-overlay-fixed"),this.fixed=!0)},open:function(a){var c=this;a=f.extend({},this.defaults,a);this.overlay?this.overlay.unbind(".overlay").width("auto").height("auto"):this.create(a);this.fixed||(q.bind("resize.overlay",f.proxy(this.update,this)),this.update());a.closeClick&& -this.overlay.bind("click.overlay",function(a){if(f(a.target).hasClass("fancybox-overlay"))return b.isActive?b.close():c.close(),!1});this.overlay.css(a.css).show()},close:function(){q.unbind("resize.overlay");this.el.hasClass("fancybox-lock")&&(f(".fancybox-margin").removeClass("fancybox-margin"),this.el.removeClass("fancybox-lock"),q.scrollTop(this.scrollV).scrollLeft(this.scrollH));f(".fancybox-overlay").remove().hide();f.extend(this,{overlay:null,fixed:!1})},update:function(){var a="100%",b;this.overlay.width(a).height("100%"); -K?(b=Math.max(J.documentElement.offsetWidth,J.body.offsetWidth),p.width()>b&&(a=p.width())):p.width()>q.width()&&(a=p.width());this.overlay.width(a).height(p.height())},onReady:function(a,b){var d=this.overlay;f(".fancybox-overlay").stop(!0,!0);d||this.create(a);a.locked&&this.fixed&&b.fixed&&(b.locked=this.overlay.append(b.wrap),b.fixed=!1);!0===a.showEarly&&this.beforeShow.apply(this,arguments)},beforeShow:function(a,b){b.locked&&!this.el.hasClass("fancybox-lock")&&(!1!==this.fixPosition&&f("*:not(object)").filter(function(){return"fixed"=== -f(this).css("position")&&!f(this).hasClass("fancybox-overlay")&&!f(this).hasClass("fancybox-wrap")}).addClass("fancybox-margin"),this.el.addClass("fancybox-margin"),this.scrollV=q.scrollTop(),this.scrollH=q.scrollLeft(),this.el.addClass("fancybox-lock"),q.scrollTop(this.scrollV).scrollLeft(this.scrollH));this.open(a)},onUpdate:function(){this.fixed||this.update()},afterClose:function(a){this.overlay&&!b.coming&&this.overlay.fadeOut(a.speedOut,f.proxy(this.close,this))}};b.helpers.title={defaults:{type:"float", -position:"bottom"},beforeShow:function(a){var c=b.current,d=c.title,e=a.type;f.isFunction(d)&&(d=d.call(c.element,c));if(r(d)&&""!==f.trim(d)){c=f('
'+d+"
");switch(e){case "inside":e=b.skin;break;case "outside":e=b.wrap;break;case "over":e=b.inner;break;default:e=b.skin,c.appendTo("body"),K&&c.width(c.width()),c.wrapInner(''),b.current.margin[2]+=Math.abs(m(c.css("margin-bottom")))}c["top"===a.position?"prependTo": -"appendTo"](e)}}};f.fn.fancybox=function(a){var c,d=f(this),e=this.selector||"",k=function(g){var l=f(this).blur(),h=c,k,m;g.ctrlKey||g.altKey||g.shiftKey||g.metaKey||l.is(".fancybox-wrap")||(k=a.groupAttr||"data-fancybox-group",m=l.attr(k),m||(k="rel",m=l.get(0)[k]),m&&""!==m&&"nofollow"!==m&&(l=e.length?f(e):d,l=l.filter("["+k+'="'+m+'"]'),h=l.index(this)),a.index=h,!1!==b.open(l,a)&&g.preventDefault())};a=a||{};c=a.index||0;e&&!1!==a.live?p.undelegate(e,"click.fb-start").delegate(e+":not('.fancybox-item, .fancybox-nav')", -"click.fb-start",k):d.unbind("click.fb-start").bind("click.fb-start",k);this.filter("[data-fancybox-start=1]").trigger("click");return this};p.ready(function(){var a,c;f.scrollbarWidth===x&&(f.scrollbarWidth=function(){var a=f('
').appendTo("body"),b=a.children(),b=b.innerWidth()-b.height(99).innerWidth();a.remove();return b});f.support.fixedPosition===x&&(f.support.fixedPosition=function(){var a=f('
').appendTo("body"), -b=20===a[0].offsetTop||15===a[0].offsetTop;a.remove();return b}());f.extend(b.defaults,{scrollbarWidth:f.scrollbarWidth(),fixed:f.support.fixedPosition,parent:f("body")});a=f(t).width();L.addClass("fancybox-lock-test");c=f(t).width();L.removeClass("fancybox-lock-test");f("").appendTo("head")})})(window,document,jQuery); diff --git a/packages/mod_cg_template_switcher_j4/media/fancybox/index.html b/packages/mod_cg_template_switcher_j4/media/js/index.html similarity index 100% rename from packages/mod_cg_template_switcher_j4/media/fancybox/index.html rename to packages/mod_cg_template_switcher_j4/media/js/index.html diff --git a/packages/mod_cg_template_switcher_j4/media/js/init.js b/packages/mod_cg_template_switcher_j4/media/js/init.js index 44d89b5..9a9a5e9 100644 --- a/packages/mod_cg_template_switcher_j4/media/js/init.js +++ b/packages/mod_cg_template_switcher_j4/media/js/init.js @@ -1,47 +1,37 @@ /** * @package CG template switcher Module - * @version 2.0.5 + * @version 2.0.7 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL - * @copyright (c) 2025 ConseilGouz. All Rights Reserved. + * @copyright (c) 2023 ConseilGouz. All Rights Reserved. * @author ConseilGouz * **/ var options; var CG_TS_Images = new Array(); -jQuery(document).ready(function($) { +document.addEventListener('DOMContentLoaded', function() { if (typeof Joomla === 'undefined' || typeof Joomla.getOptions === 'undefined') { console.error('Joomla.getOptions not found!\nThe Joomla core.js file is not being loaded.'); + return; } options = Joomla.getOptions('mod_cg_template_switcher'); - if (typeof options === 'undefined' ) { // cache Joomla problem - request = { - 'option' : 'com_ajax', - 'module' : 'cg_template_switcher', - 'data' : 'param', - 'format' : 'raw' - }; - jQuery.ajax({ - type : 'POST', - data : request, - success: function (response) { - options = JSON.parse(response); - go_switch(options); - } - }); - }; if (typeof options !== 'undefined' ) { go_switch(options); } }); function go_switch(options) { - jQuery(".fancybox").fancybox(); - jQuery("#CG_TS_OKBtn").click(function() { - sortValue = jQuery("#CG_TS_Select").find(":selected").val(); + btn_ok = document.getElementById("CG_TS_OKBtn"); + if (btn_ok) { + btn_ok.addEventListener('click',function() { + sortValue = document.querySelector("#CG_TS_Select").selectedOptions[0].value; CG_TS_Cookie(sortValue); - }); - jQuery("#CG_TS_CancelBtn").click(function() { + }); + } + btn_cancel = document.getElementById("CG_TS_CancelBtn"); + if (btn_cancel) { + btn_cancel.addEventListener('click',function() { CG_TS_Cookie_Del() - }); + }); + } if (options.showpreview == 'true') { var templates = options.templates; for (var k in templates) { @@ -50,8 +40,8 @@ function go_switch(options) { CG_TS_Images[k].preview = templates[k]['preview']; } } - jQuery("#CG_TS_Select").on( 'change', function(){ - sortValue = jQuery("#CG_TS_Select").find(":selected").val(); + document.getElementById("CG_TS_Select").addEventListener( 'change', function(){ + sortValue = this.selectedOptions[0].value; if (options.showpreview == 'true') { CG_TS_ImageShow(sortValue); } @@ -73,7 +63,7 @@ function CG_TS_Cookie_Del() { $secure = ""; if (window.location.protocol == "https:") $secure="secure;"; document.cookie = "cg_template=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;samesite=lax;"+$secure; - jQuery('#cg_ts_form').submit(); + document.getElementById('cg_ts_form').submit(); } function CG_TS_Cookie(b) { var expires = ""; @@ -85,6 +75,6 @@ function CG_TS_Cookie(b) { $secure = ""; if (window.location.protocol == "https:") $secure="secure;"; document.cookie = "cg_template="+encodeURIComponent(b)+expires+"; path=/; samesite=lax;"+$secure; - jQuery('#cg_ts_form').submit(); + document.getElementById('cg_ts_form').submit(); } diff --git a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.php b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.php index a32ce7b..51af865 100644 --- a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.php +++ b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.php @@ -22,8 +22,6 @@ $document = Factory::getDocument(); $modulefield = ''.JURI::base(true).'/media/mod_cg_template_switcher/'; -$document->addStyleSheet($modulefield .'fancybox/jquery.fancybox.css'); -$document->addScript($modulefield .'fancybox/jquery.fancybox.pack.js'); $document->addStyleDeclaration($params->get('css','')); $templates = CGTemplateSwitcherHelper::getTemplates($params); diff --git a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.xml b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.xml index 2d4b5e8..b9e452c 100644 --- a/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.xml +++ b/packages/mod_cg_template_switcher_j4/mod_cg_template_switcher.xml @@ -2,12 +2,12 @@ CG Template Switcher ConseilGouz - October 2022 - Copyright (C) 2022 ConseilGouz. All rights reserved + 2023/02/18 + Copyright (C) 2023 ConseilGouz. All rights reserved http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 pascal.leconte@conseilgouz.com www.conseilgouz.com - 2.0.6 + 2.0.7 CG_XML_DESCRIPTION ConseilGouz\Module\CGTemplateSwitcher https://raw.githubusercontent.com/conseilgouz/pkg_cg_template_switcher_j4/master/cg_template_switcher_changelog.xml @@ -19,7 +19,6 @@ js - fancybox index.html diff --git a/packages/mod_cg_template_switcher_j4/src/Helper/CGTemplateSwitcherHelper.php b/packages/mod_cg_template_switcher_j4/src/Helper/CGTemplateSwitcherHelper.php index 334b8c2..6f385fe 100644 --- a/packages/mod_cg_template_switcher_j4/src/Helper/CGTemplateSwitcherHelper.php +++ b/packages/mod_cg_template_switcher_j4/src/Helper/CGTemplateSwitcherHelper.php @@ -1,9 +1,9 @@ loadObjectList(); return $items; } -// AJAX Request - public static function getAjax() { - $input = Factory::getApplication()->input; - $params = new Registry($module->params); - $output = ''; - if ($input->get('data') == "param") { - return self::getParams($params); - } - return false; - } - private static function getParams($params) { - $templates = self::getTemplates($params); - $templates_js = array(); - if ($params->get('showpreview', 'true') == 'true') { - foreach ($templates->images as $template => $image) { - $arr['width'] = $image->width; - $arr['height'] = $image->height; - $arr['src'] = $image->src; - $arr['preview'] = $image->preview; - $templates_js[$template] = $arr; - } - } - $ret = '{"cookie_duration":"'.$params->get('cookie_duration', 0).'","showpreview":"'.$params->get('showpreview', 'true').'","autoswitch":"'.$params->get('autoswitch', 'false').'","noimage":"'. JText::_('NOIMAGE').'","templates":'.json_encode($templates_js).'}'; - return $ret; - } } ?> \ No newline at end of file diff --git a/packages/mod_cg_template_switcher_j4/src/Helper/index.html b/packages/mod_cg_template_switcher_j4/src/Helper/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/packages/mod_cg_template_switcher_j4/src/Helper/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkg_cgtemplateswitcher.xml b/pkg_cgtemplateswitcher.xml index 7ac7dda..261032a 100644 --- a/pkg_cgtemplateswitcher.xml +++ b/pkg_cgtemplateswitcher.xml @@ -1,13 +1,13 @@ CG Template Switcher - October 2022 + 2023/02/18 cgtemplateswitcher https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL ConseilGouz pascal.leconte@conseilgouz.com www.conseilgouz.com - 2.0.6 + 2.0.7 https://www.conseilgouz.com/ ConseilGouz Package CG Template Switcher diff --git a/script.php b/script.php index 354bac6..5cbaf84 100644 --- a/script.php +++ b/script.php @@ -1,9 +1,9 @@ extname)]; + // remove fancybox in media + $f = JPATH_SITE . '/media/mod_'.$this->extname.'/fancybox'; + if (@file_exists($f) && is_dir($f)) { + Folder::delete($f); + } + $obsloteFiles = [sprintf("%s/modules/mod_%s/helper.php", JPATH_SITE, $this->extname), + sprintf("%s/modules/mod_%s/script.php", JPATH_SITE, $this->extname), + sprintf("%s/modules/mod_%s/tmpl/lighbox.html", JPATH_SITE, $this->extname), + ]; foreach ($obsloteFiles as $file) { if (@is_file($file))