diff --git a/css/css.php b/css/css.php index 678260f0..5de082b7 100644 --- a/css/css.php +++ b/css/css.php @@ -40,7 +40,7 @@ $cssFilesBase = array( array('href' => 'css/alertify.core.css', 'min' => true), array('href' => 'css/alertify.default.css', 'min' => true), array('href' => 'css/jquery.tagsinput.css', 'min' => true), - array('href' => 'js/fancybox/jquery.fancybox.css', 'min' => true), + array('href' => 'css/jquery.fancybox.css', 'min' => true), ); if (file_exists($themeCssPath)){ diff --git a/js/fancybox/blank.gif b/css/fancybox/blank.gif similarity index 100% rename from js/fancybox/blank.gif rename to css/fancybox/blank.gif diff --git a/css/fancybox/fancybox_loading.gif b/css/fancybox/fancybox_loading.gif new file mode 100644 index 00000000..a03a40c0 Binary files /dev/null and b/css/fancybox/fancybox_loading.gif differ diff --git a/css/fancybox/fancybox_loading@2x.gif b/css/fancybox/fancybox_loading@2x.gif new file mode 100644 index 00000000..9205aeb0 Binary files /dev/null and b/css/fancybox/fancybox_loading@2x.gif differ diff --git a/js/fancybox/fancybox_overlay.png b/css/fancybox/fancybox_overlay.png similarity index 100% rename from js/fancybox/fancybox_overlay.png rename to css/fancybox/fancybox_overlay.png diff --git a/js/fancybox/fancybox_sprite.png b/css/fancybox/fancybox_sprite.png similarity index 100% rename from js/fancybox/fancybox_sprite.png rename to css/fancybox/fancybox_sprite.png diff --git a/css/fancybox/fancybox_sprite@2x.png b/css/fancybox/fancybox_sprite@2x.png new file mode 100644 index 00000000..d0e4779f Binary files /dev/null and b/css/fancybox/fancybox_sprite@2x.png differ diff --git a/js/fancybox/helpers/fancybox_buttons.png b/css/fancybox/helpers/fancybox_buttons.png similarity index 100% rename from js/fancybox/helpers/fancybox_buttons.png rename to css/fancybox/helpers/fancybox_buttons.png diff --git a/js/fancybox/helpers/jquery.fancybox-buttons.css b/css/fancybox/helpers/jquery.fancybox-buttons.css similarity index 98% rename from js/fancybox/helpers/jquery.fancybox-buttons.css rename to css/fancybox/helpers/jquery.fancybox-buttons.css index 9453b464..a26273af 100644 --- a/js/fancybox/helpers/jquery.fancybox-buttons.css +++ b/css/fancybox/helpers/jquery.fancybox-buttons.css @@ -46,6 +46,7 @@ width: 30px; height: 30px; text-indent: -9999px; + background-color: transparent; background-image: url('fancybox_buttons.png'); background-repeat: no-repeat; outline: none; diff --git a/js/fancybox/helpers/jquery.fancybox-buttons.js b/css/fancybox/helpers/jquery.fancybox-buttons.js similarity index 93% rename from js/fancybox/helpers/jquery.fancybox-buttons.js rename to css/fancybox/helpers/jquery.fancybox-buttons.js index 5496e606..fd8b9556 100644 --- a/js/fancybox/helpers/jquery.fancybox-buttons.js +++ b/css/fancybox/helpers/jquery.fancybox-buttons.js @@ -1,6 +1,6 @@ /*! * Buttons helper for fancyBox - * version: 1.0.4 (Mon, 01 Oct 2012) + * version: 1.0.5 (Mon, 15 Oct 2012) * @requires fancyBox v2.0 or later * * Usage: @@ -22,7 +22,7 @@ defaults : { skipSingle : false, // disables if gallery contains single image position : 'top', // 'top' or 'bottom' - tpl : '
', + tpl : '' }, list : null, @@ -64,7 +64,8 @@ prev : this.list.find('.btnPrev').click( F.prev ), next : this.list.find('.btnNext').click( F.next ), play : this.list.find('.btnPlay').click( F.play ), - toggle : this.list.find('.btnToggle').click( F.toggle ) + toggle : this.list.find('.btnToggle').click( F.toggle ), + close : this.list.find('.btnClose').click( F.close ) } } @@ -118,4 +119,4 @@ } }; -}(jQuery)); \ No newline at end of file +}(jQuery)); diff --git a/js/fancybox/helpers/jquery.fancybox-media.js b/css/fancybox/helpers/jquery.fancybox-media.js similarity index 86% rename from js/fancybox/helpers/jquery.fancybox-media.js rename to css/fancybox/helpers/jquery.fancybox-media.js index 3092832a..3584c8a7 100644 --- a/js/fancybox/helpers/jquery.fancybox-media.js +++ b/css/fancybox/helpers/jquery.fancybox-media.js @@ -1,6 +1,6 @@ /*! * Media helper for fancyBox - * version: 1.0.4 (Mon, 01 Oct 2012) + * version: 1.0.6 (Fri, 14 Jun 2013) * @requires fancyBox v2.0 or later * * Usage: @@ -25,7 +25,7 @@ * * Or: * $(".fancybox").fancybox({, - * helpers : { + * helpers : { * media: true * }, * youtube : { @@ -39,6 +39,7 @@ * http://www.youtube.com/watch?v=opj24KnzrWo * http://www.youtube.com/embed/opj24KnzrWo * http://youtu.be/opj24KnzrWo + * http://www.youtube-nocookie.com/embed/opj24KnzrWo * Vimeo * http://vimeo.com/40648169 * http://vimeo.com/channels/staffpicks/38843628 @@ -88,7 +89,7 @@ F.helpers.media = { defaults : { youtube : { - matcher : /(youtube\.com|youtu\.be)\/(watch\?v=|v\/|u\/|embed\/?)?([\w-]{11}|\?listType=(.*)&list=(.*)).*/i, + matcher : /(youtube\.com|youtu\.be|youtube-nocookie\.com)\/(watch\?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*)).*/i, params : { autoplay : 1, autohide : 1, @@ -151,7 +152,7 @@ instagram : { matcher : /(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i, type : 'image', - url : '//$1/p/$2/media/' + url : '//$1/p/$2/media/?size=l' }, google_maps : { matcher : /maps\.google\.([a-z]{2,3}(\.[a-z]{2})?)\/(\?ll=|maps\?)(.*)/i, @@ -171,16 +172,18 @@ params; for (what in opts) { - item = opts[ what ]; - rez = url.match( item.matcher ); + if (opts.hasOwnProperty(what)) { + item = opts[ what ]; + rez = url.match( item.matcher ); - if (rez) { - type = item.type; - params = $.extend(true, {}, item.params, obj[ what ] || ($.isPlainObject(opts[ what ]) ? opts[ what ].params : null)); + if (rez) { + type = item.type; + params = $.extend(true, {}, item.params, obj[ what ] || ($.isPlainObject(opts[ what ]) ? opts[ what ].params : null)); - url = $.type( item.url ) === "function" ? item.url.call( this, rez, params, obj ) : format( item.url, rez, params ); + url = $.type( item.url ) === "function" ? item.url.call( this, rez, params, obj ) : format( item.url, rez, params ); - break; + break; + } } } diff --git a/js/fancybox/helpers/jquery.fancybox-thumbs.css b/css/fancybox/helpers/jquery.fancybox-thumbs.css similarity index 97% rename from js/fancybox/helpers/jquery.fancybox-thumbs.css rename to css/fancybox/helpers/jquery.fancybox-thumbs.css index e40ae820..63d29436 100644 --- a/js/fancybox/helpers/jquery.fancybox-thumbs.css +++ b/css/fancybox/helpers/jquery.fancybox-thumbs.css @@ -51,4 +51,5 @@ position: relative; border: 0; padding: 0; + max-width: none; } \ No newline at end of file diff --git a/js/fancybox/helpers/jquery.fancybox-thumbs.js b/css/fancybox/helpers/jquery.fancybox-thumbs.js similarity index 100% rename from js/fancybox/helpers/jquery.fancybox-thumbs.js rename to css/fancybox/helpers/jquery.fancybox-thumbs.js diff --git a/js/fancybox/jquery.fancybox.css b/css/jquery.fancybox.css similarity index 75% rename from js/fancybox/jquery.fancybox.css rename to css/jquery.fancybox.css index 043f8f90..18cd832c 100644 --- a/js/fancybox/jquery.fancybox.css +++ b/css/jquery.fancybox.css @@ -1,4 +1,4 @@ -/*! fancyBox v2.1.0 fancyapps.com | fancyapps.com/fancybox/#license */ +/*! fancyBox v2.1.5 fancyapps.com | fancyapps.com/fancybox/#license */ .fancybox-wrap, .fancybox-skin, .fancybox-outer, @@ -76,7 +76,7 @@ } #fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span { - background-image: url('../js/fancybox/fancybox_sprite.png'); + background-image: url('fancybox/fancybox_sprite.png'); } #fancybox-loading { @@ -94,7 +94,7 @@ #fancybox-loading div { width: 44px; height: 44px; - background: url('../js/fancybox/fancybox_loading.gif') center center no-repeat; + background: url('fancybox/fancybox_loading.gif') center center no-repeat; } .fancybox-close { @@ -114,7 +114,7 @@ height: 100%; cursor: pointer; text-decoration: none; - background: transparent url('../js/fancybox/blank.gif'); /* helps IE */ + background: transparent url('fancybox/blank.gif'); /* helps IE */ -webkit-tap-highlight-color: rgba(0,0,0,0); z-index: 8040; } @@ -154,15 +154,27 @@ .fancybox-tmp { position: absolute; - top: -9999px; - left: -9999px; + top: -99999px; + left: -99999px; visibility: hidden; + max-width: 99999px; + max-height: 99999px; + overflow: visible !important; } /* Overlay helper */ .fancybox-lock { - overflow: hidden; + overflow: hidden !important; + width: auto; +} + +.fancybox-lock body { + overflow: hidden !important; +} + +.fancybox-lock-test { + overflow-y: hidden !important; } .fancybox-overlay { @@ -172,7 +184,7 @@ overflow: hidden; display: none; z-index: 8010; - background: url('../js/fancybox/fancybox_overlay.png'); + background: url('fancybox/fancybox_overlay.png'); } .fancybox-overlay-fixed { @@ -243,4 +255,20 @@ 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/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/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/js/fancybox/fancybox_loading.gif b/js/fancybox/fancybox_loading.gif deleted file mode 100644 index 01586176..00000000 Binary files a/js/fancybox/fancybox_loading.gif and /dev/null differ diff --git a/js/fancybox/jquery.fancybox.js b/js/fancybox/jquery.fancybox.js deleted file mode 100644 index 26f40045..00000000 --- a/js/fancybox/jquery.fancybox.js +++ /dev/null @@ -1,1921 +0,0 @@ -/*! - * fancyBox - jQuery Plugin - * version: 2.1.1 (Mon, 01 Oct 2012) - * @requires jQuery v1.6 or later - * - * Examples at http://fancyapps.com/fancybox/ - * License: www.fancyapps.com/fancybox/#license - * - * Copyright 2012 Janis Skarnelis - janis@fancyapps.com - * - */ - -(function (window, document, $, undefined) { - "use strict"; - - var W = $(window), - D = $(document), - F = $.fancybox = function () { - F.open.apply( this, arguments ); - }, - didUpdate = null, - isTouch = document.createTouch !== undefined, - - isQuery = function(obj) { - return obj && obj.hasOwnProperty && obj instanceof $; - }, - isString = function(str) { - return str && $.type(str) === "string"; - }, - isPercentage = function(str) { - return isString(str) && str.indexOf('%') > 0; - }, - isScrollable = function(el) { - return (el && !(el.style.overflow && el.style.overflow === 'hidden') && ((el.clientWidth && el.scrollWidth > el.clientWidth) || (el.clientHeight && el.scrollHeight > el.clientHeight))); - }, - getScalar = function(orig, dim) { - var value = parseInt(orig, 10) || 0; - - if (dim && isPercentage(orig)) { - value = F.getViewport()[ dim ] / 100 * value; - } - - return Math.ceil(value); - }, - getValue = function(value, dim) { - return getScalar(value, dim) + 'px'; - }; - - $.extend(F, { - // The current version of fancyBox - version: '2.1.1', - - defaults: { - padding : 15, - margin : 20, - - width : 800, - height : 600, - minWidth : 100, - minHeight : 100, - maxWidth : 9999, - maxHeight : 9999, - - autoSize : true, - autoHeight : false, - autoWidth : false, - - autoResize : !isTouch, - autoCenter : !isTouch, - fitToView : true, - aspectRatio : false, - topRatio : 0.5, - leftRatio : 0.5, - - scrolling : 'auto', // 'auto', 'yes' or 'no' - wrapCSS : '', - - arrows : true, - closeBtn : true, - closeClick : false, - nextClick : false, - mouseWheel : true, - autoPlay : false, - playSpeed : 3000, - preload : 3, - modal : false, - loop : true, - - ajax : { - dataType : 'html', - headers : { 'X-fancyBox': true } - }, - iframe : { - scrolling : 'auto', - preload : true - }, - swf : { - wmode: 'transparent', - allowfullscreen : 'true', - allowscriptaccess : 'always' - }, - - keys : { - next : { - 13 : 'left', // enter - 34 : 'up', // page down - 39 : 'left', // right arrow - 40 : 'up' // down arrow - }, - prev : { - 8 : 'right', // backspace - 33 : 'down', // page up - 37 : 'right', // left arrow - 38 : 'down' // up arrow - }, - close : [27], // escape key - play : [32], // space - start/stop slideshow - toggle : [70] // letter "f" - toggle fullscreen - }, - - direction : { - next : 'left', - prev : 'right' - }, - - scrollOutside : true, - - // Override some properties - index : 0, - type : null, - href : null, - content : null, - title : null, - - // HTML templates - tpl: { - wrap : 'The requested content cannot be loaded.
Please try again later.
The requested content cannot be loaded.
Please try again later.
The requested content cannot be loaded.
Please try again later.