jekyll-theme-simple-texture 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750252b7bffa3426c04f14405128153596994d6cf1c2a7b6dc45fd6b47f8b0af
-  data.tar.gz: c39bc83f76f98756d75f88c276afedea2e86417d9a555cc60a199cb187712287
+  metadata.gz: 635a61b9f6bf592a08a7a7c361b1c5bf5fb1022a96018b22bf8d3ada95b1e7ba
+  data.tar.gz: f9ba9ac650975f82a0c9e812d74cc09b24c77e918fd0bee64c67cf08642cc0ac
 SHA512:
-  metadata.gz: dd324f2b8d14bfe39d3a81428c4b9912ae7427c885054a9d13f857f7f45bf2003b8ee0655f733802b5f00bd33f581eeec7699fcec61438141b56cef9e797ba69
-  data.tar.gz: 41f35429b34b6c8d02950af449543874aa59bacc2846c518194f1a06fa2c13beea702ebf7ef6ce3aa80aa751785ef09da57a7008dcadb7e3925399860a9c2350
+  metadata.gz: d579792a7bf2a0da7a3c49ab19df9f4625ba1583c2ae7fa36f05b7bdb046fa613fe1c8d88d8a27355f3334e43087c2c072785d0b4cf5aa1040a7ffe4e331516f
+  data.tar.gz: 5a678de3330dd06672d2860c9a30d85a9cee50d4862eaf1a07bfa56b98c0d39af00f08b9fab7ee28dace93e0c7c0ff016847574b89f07c2dcfc64f8572ef12f0

data/README.md

@@ -9,7 +9,7 @@ which can also be forked as a boilerplate for older versions of Jekyll.
 
 - Starter-kit demo:
 <https://yizeng.github.io/jekyll-theme-simple-texture/>
-- My own personal blog: <http://yizeng.me/blog>
+- My own personal blog: <https://yizeng.me/blog>
 
 ![Screenshot - Home](assets/images/screenshots/home.png)
 
@@ -78,7 +78,7 @@ i.e. `jekyllapp` in this example.
    ```ruby
    source "https://rubygems.org"
 
-   gem 'jekyll', '= 3.7.2' # locked in to be consistent GitHub Pages.
+   gem 'jekyll'
 
    group :jekyll_plugins do
      gem 'jekyll-feed'

data/_includes/blog/scripts.html

@@ -40,63 +40,6 @@ $(document).ready(function () {
 });
 </script>
 
-<!-- Google Analytics Event tracking -->
-{% if site.google_analytics %}
-<script>
-$(document).on('click', 'footer .back-to-top, .gotop', function (event) {
-    sendGaEvent('Blog', 'Back to Top', event.currentTarget);
-});
-$(document).on('click', '.show-hidden', function (event) {
-    sendGaEvent('Post', 'Show Hidden', event.currentTarget);
-});
-$(document).on('click', 'a.internal', function(event) {
-    sendGaEvent('Blog', 'Navigate', event.currentTarget);
-});
-$('.the-header').on('click', '.nav-link a, [class$=wrapper] .results a, .nav-link button', function(event) {
-    sendGaEvent('Blog', 'Navigate', event.currentTarget);
-});
-$('.the-header').on('click', '.nav-link button', function(event) {
-    sendGaEvent('Blog', 'Navigate', event.currentTarget);
-});
-$('.the-footer').on('click', '.about h4 a', function(event) {
-    sendGaEvent('Blog', 'Go to About', event.currentTarget);
-});
-$('.the-footer').on('click', '.social-links a', function(event) {
-    sendGaEvent('Blog', 'Click Social Link', event.currentTarget);
-});
-$('.unit-article').on('click', '.tag_box.categories a', function(event) {
-    sendGaEvent('Blog', 'Click Category', event.currentTarget);
-});
-$('.unit-article').on('click', '.tag_box.tags a', function(event) {
-    sendGaEvent('Blog', 'Click Tag', event.currentTarget);
-});
-$('.unit-article').on('click', '.comments .show-hidden', function(event) {
-    sendGaEvent('Post', 'Show Comments', event.currentTarget);
-});
-$('.unit-article').on('click', '.meta .author', function(event) {
-    sendGaEvent('Post', 'Show Author', event.currentTarget);
-});
-$('.unit-article').on('click', '.meta .license-icon', function(event) {
-    sendGaEvent('Post', 'Show License', event.currentTarget);
-});
-$('.unit-article').on('click', '.meta .list-tag a', function(event) {
-    sendGaEvent('Post', 'Click Tag', event.currentTarget);
-});
-$('.unit-article').on('click', '.meta .list-category', function(event) {
-    sendGaEvent('Post', 'Click Category', event.currentTarget);
-});
-$('.unit-foot').delegate('.addthis_toolbox .btn-share-post', 'click', function(event) {
-    sendGaEvent('Post', 'Share Post', event.currentTarget);
-});
-$('.search-wrapper').on('click', '.results a', function(event) {
-    sendGaEvent('Search', 'Click Search Result', event.currentTarget);
-});
-$('.search-wrapper').on('click', '.btn-close', function(event) {
-    sendGaEvent('Search', 'Close Search', event.currentTarget);
-});
-</script>
-{% endif %}
-
 <!-- Show menu overlay + Jekyll Simple Search option -->
 <script src="{{ site.baseurl }}/assets/javascripts/jekyll-search.jquery.js"></script>
 <script>
@@ -143,18 +86,18 @@ $(document).ready(function () {
 })(jQuery, window);
 </script>
 
-<script src='//cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.4/jquery.fancybox.min.js'></script>
-<script src='//cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.4/helpers/jquery.fancybox-buttons.min.js'></script>
+<script src='//cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.7/jquery.fancybox.min.js'></script>
+<script src='//cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.7/helpers/jquery.fancybox-buttons.min.js'></script>
 <script src="{{ site.baseurl }}/assets/javascripts/unveil/jquery.unveil.min.js"></script>
 
 <script>
-    window.jQuery.fancybox || document.write('<script src="{{ site.baseurl }}/assets/javascripts/fancybox/jquery.fancybox.pack.js?v=2.1.4"><\/script>')
-    window.jQuery.fancybox.helpers.buttons || document.write('<script src="{{ site.baseurl }}/assets/javascripts/fancybox/helpers/jquery.fancybox-buttons.js?v=1.0.5"><\/script>')
+    window.jQuery.fancybox || document.write('<script src="{{ site.baseurl }}/assets/javascripts/fancybox/jquery.fancybox.pack.js"><\/script>')
+    window.jQuery.fancybox.helpers.buttons || document.write('<script src="{{ site.baseurl }}/assets/javascripts/fancybox/helpers/jquery.fancybox-buttons.js"><\/script>')
 </script>
 
 <script>
-    $("head").append('<link rel="stylesheet" href="{{ site.baseurl }}/assets/javascripts/fancybox/jquery.fancybox.css?v=2.1.4" type="text/css" />');
-    $("head").append('<link rel="stylesheet" href="{{ site.baseurl }}/assets/javascripts/fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.5" type="text/css" />');
+    $("head").append('<link rel="stylesheet" href="{{ site.baseurl }}/assets/javascripts/fancybox/jquery.fancybox.css" type="text/css" />');
+    $("head").append('<link rel="stylesheet" href="{{ site.baseurl }}/assets/javascripts/fancybox/helpers/jquery.fancybox-buttons.css" type="text/css" />');
     $(".post-image").fancybox({
         prevEffect: 'none',
         nextEffect: 'none',

data/_includes/common/gtm-body.html

@@ -0,0 +1,4 @@
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ site.google_tag_manager }}"
+height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->

data/_includes/common/gtm-head.html

@@ -0,0 +1,7 @@
+<!-- Google Tag Manager -->
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','{{ site.google_tag_manager }}');</script>
+<!-- End Google Tag Manager -->

data/_includes/common/libraries.html

@@ -1,16 +1,12 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
 <script>window.Modernizr || document.write('<script src="{{ site.baseurl }}/assets/javascripts/modernizr-2.8.3.min.js"><\/script>')</script>
 
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 <script>
-    window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/javascripts/jquery-3.2.1.min.js"><\/script>')
+    window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/javascripts/jquery-3.3.1.min.js"><\/script>')
 </script>
 
 <script src="//cdnjs.cloudflare.com/ajax/libs/pace/1.0.2/pace.min.js"></script>
 <script>
     window.Pace || document.write('<script src="{{ site.baseurl }}/assets/javascripts/pace.min.js"><\/script>')
 </script>
-
-{% if site.google_analytics %}
-    {% include common/analytics.html %}
-{% endif %}

data/_includes/home/scripts.html

@@ -34,11 +34,3 @@
     });
 
 </script>
-
-{% if site.google_analytics %}
-<script>
-$(document).on('click', '[class*="btn"]', function(event) {
-    sendGaEvent('Home', 'Click', event.currentTarget);
-});
-</script>
-{% endif %}

data/_layouts/blog.html

@@ -11,9 +11,16 @@
     {% include common/meta.html %}
     <link href='{{ site.baseurl }}/assets/stylesheets/blog.css' rel="stylesheet" type="text/css">
     {% include common/libraries.html %}
+    {% if site.google_tag_manager %}
+        {% include common/gtm-head.html %}
+    {% endif %}
 </head>
 
 <body>
+    {% if site.google_tag_manager %}
+        {% include common/gtm-body.html %}
+    {% endif %}
+
     {% include common/notices.html %}
     {% include blog/overlay.html %}
 

data/_layouts/home.html

@@ -11,9 +11,16 @@
     {% include common/meta.html %}
     <link href='{{ site.baseurl }}/assets/stylesheets/home.css' rel="stylesheet" type="text/css">
     {% include common/libraries.html %}
+    {% if site.google_tag_manager %}
+        {% include common/gtm-head.html %}
+    {% endif %}
 </head>
 
 <body>
+    {% if site.google_tag_manager %}
+        {% include common/gtm-body.html %}
+    {% endif %}
+
     <ul id="menu">
         <li data-menuanchor="bio"><a href="#bio">Biography</a></li>
         <li data-menuanchor="social"><a href="#social">Social Links</a></li>

data/assets/javascripts/fancybox/helpers/jquery.fancybox-buttons.css

@@ -31,7 +31,7 @@
 	background: -webkit-linear-gradient(top, rgb(68,68,68) 0%,rgb(52,52,52) 50%,rgb(41,41,41) 50%,rgb(51,51,51) 100%);
 	background: -o-linear-gradient(top, rgb(68,68,68) 0%,rgb(52,52,52) 50%,rgb(41,41,41) 50%,rgb(51,51,51) 100%);
 	background: -ms-linear-gradient(top, rgb(68,68,68) 0%,rgb(52,52,52) 50%,rgb(41,41,41) 50%,rgb(51,51,51) 100%);
-	background: linear-gradient(top, rgb(68,68,68) 0%,rgb(52,52,52) 50%,rgb(41,41,41) 50%,rgb(51,51,51) 100%);
+	background: linear-gradient(to bottom, rgb(68,68,68) 0%,rgb(52,52,52) 50%,rgb(41,41,41) 50%,rgb(51,51,51) 100%);
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#444444', endColorstr='#222222',GradientType=0 );
 }
 
@@ -94,4 +94,4 @@
 #fancybox-buttons a.btnDisabled {
 	opacity : 0.4;
 	cursor: default;
-}
+}

data/assets/javascripts/fancybox/helpers/jquery.fancybox-buttons.js

@@ -13,7 +13,7 @@
  *     });
  *
  */
-(function ($) {
+;(function ($) {
 	//Shortcut for fancyBox object
 	var F = $.fancybox;
 

data/assets/javascripts/fancybox/helpers/jquery.fancybox-media.js

@@ -62,7 +62,7 @@
  *          http://maps.google.com/?ll=48.857995,2.294297&spn=0.007666,0.021136&t=m&z=16
  *          http://maps.google.com/?ll=48.859463,2.292626&spn=0.000965,0.002642&t=m&z=19&layer=c&cbll=48.859524,2.292532&panoid=YJ0lq28OOy3VT2IqIuVY0g&cbp=12,151.58,,0,-15.56
  */
-(function ($) {
+;(function ($) {
 	"use strict";
 
 	//Shortcut for fancyBox object
@@ -97,7 +97,9 @@
 					rel         : 0,
 					hd          : 1,
 					wmode       : 'opaque',
-					enablejsapi : 1
+					enablejsapi : 1,
+                    			ps: 'docs',
+                    			controls: 1
 				},
 				type : 'iframe',
 				url  : '//www.youtube.com/embed/$3'
@@ -196,4 +198,4 @@
 		}
 	};
 
-}(jQuery));
+}(jQuery));

data/assets/javascripts/fancybox/helpers/jquery.fancybox-thumbs.js

@@ -14,7 +14,7 @@
  *     });
  *
  */
-(function ($) {
+;(function ($) {
 	//Shortcut for fancyBox object
 	var F = $.fancybox;
 
@@ -62,13 +62,14 @@
 
 			//Load each thumbnail
 			$.each(obj.group, function (i) {
-				var href = thumbSource( obj.group[ i ] );
+				var el   = obj.group[ i ],
+					href = thumbSource( el );
 
 				if (!href) {
 					return;
 				}
 
-				$("<img />").load(function () {
+				$("<img />").on("load", function () {
 					var width  = this.width,
 						height = this.height,
 						widthRatio, heightRatio, parent;
@@ -105,7 +106,9 @@
 
 					$(this).hide().appendTo(parent).fadeIn(300);
 
-				}).attr('src', href);
+				})
+				.attr('src',   href)
+				.attr('title', el.title);
 			});
 
 			//Set initial width
@@ -159,4 +162,4 @@
 		}
 	}
 
-}(jQuery));
+}(jQuery));

data/assets/javascripts/fancybox/jquery.fancybox.css

@@ -21,6 +21,8 @@
 	position: absolute;
 	top: 0;
 	left: 0;
+	-webkit-transform: translate3d(0, 0, 0);
+	transform: translate3d(0, 0, 0);
 	z-index: 8020;
 }
 
@@ -76,7 +78,7 @@
 }
 
 #fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span {
-	background-image: url('fancybox_sprite.png');
+	background-image: url(fancybox_sprite.png);
 }
 
 #fancybox-loading {
@@ -94,7 +96,7 @@
 #fancybox-loading div {
 	width: 44px;
 	height: 44px;
-	background: url('fancybox_loading.gif') center center no-repeat;
+	background: url(fancybox_loading.gif) center center no-repeat;
 }
 
 .fancybox-close {
@@ -114,7 +116,7 @@
 	height: 100%;
 	cursor: pointer;
 	text-decoration: none;
-	background: transparent url('blank.gif'); /* helps IE */
+	background: transparent url(blank.gif); /* helps IE */
 	-webkit-tap-highlight-color: rgba(0,0,0,0);
 	z-index: 8040;
 }
@@ -156,7 +158,6 @@
 	position: absolute;
 	top: -99999px;
 	left: -99999px;
-	visibility: hidden;
 	max-width: 99999px;
 	max-height: 99999px;
 	overflow: visible !important;
@@ -165,7 +166,7 @@
 /* Overlay helper */
 
 .fancybox-lock {
-    overflow: hidden !important;
+    overflow: visible !important;
     width: auto;
 }
 
@@ -184,7 +185,7 @@
 	overflow: hidden;
 	display: none;
 	z-index: 8010;
-	background: url('fancybox_overlay.png');
+	background: url(fancybox_overlay.png);
 }
 
 .fancybox-overlay-fixed {
@@ -263,12 +264,12 @@
 	   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-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-image: url(fancybox_loading@2x.gif);
 		background-size: 24px 24px; /*The size of the normal image, half the size of the hi-res image*/
 	}
 }

data/assets/javascripts/fancybox/jquery.fancybox.js

@@ -1,16 +1,16 @@
 /*!
  * fancyBox - jQuery Plugin
- * version: 2.1.5 (Fri, 14 Jun 2013)
- * @requires jQuery v1.6 or later
+ * version: 2.1.7 (Tue, 28 Feb 2017)
+ * 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
+ * Copyright 2017 fancyapps.com
  *
  */
 
-(function (window, document, $, undefined) {
+;(function (window, document, $, undefined) {
 	"use strict";
 
 	var H = $("html"),
@@ -50,7 +50,7 @@
 
 	$.extend(F, {
 		// The current version of fancyBox
-		version: '2.1.5',
+		version: '2.1.7',
 
 		defaults: {
 			padding : 15,
@@ -143,7 +143,8 @@
 				error    : '<p class="fancybox-error">The requested content cannot be loaded.<br/>Please try again later.</p>',
 				closeBtn : '<a title="Close" class="fancybox-item fancybox-close" href="javascript:;"></a>',
 				next     : '<a title="Next" class="fancybox-nav fancybox-next" href="javascript:;"><span></span></a>',
-				prev     : '<a title="Previous" class="fancybox-nav fancybox-prev" href="javascript:;"><span></span></a>'
+				prev     : '<a title="Previous" class="fancybox-nav fancybox-prev" href="javascript:;"><span></span></a>',
+				loading  : '<div id="fancybox-loading"><div></div></div>'
 			},
 
 			// Properties for each animation type
@@ -261,7 +262,7 @@
 					if (isQuery(element)) {
 						obj = {
 							href    : element.data('fancybox-href') || element.attr('href'),
-							title   : element.data('fancybox-title') || element.attr('title'),
+							title   : $('<div/>').text( element.data('fancybox-title') || element.attr('title') || '' ).html(),
 							isDom   : true,
 							element : element
 						};
@@ -363,12 +364,16 @@
 		cancel: function () {
 			var coming = F.coming;
 
-			if (!coming || false === F.trigger('onCancel')) {
+			if (coming && false === F.trigger('onCancel')) {
 				return;
 			}
 
 			F.hideLoading();
 
+			if (!coming) {
+				return;
+			}
+
 			if (F.ajaxLoad) {
 				F.ajaxLoad.abort();
 			}
@@ -546,7 +551,7 @@
 		},
 
 		update: function (e) {
-			var type = (e && e.type),
+			var type = (e && e.originalEvent && e.originalEvent.type),
 				anyway = !type || type === 'orientationchange';
 
 			if (anyway) {
@@ -610,7 +615,7 @@
 
 			F.hideLoading();
 
-			el = $('<div id="fancybox-loading"><div></div></div>').click(F.cancel).appendTo('body');
+			el = $(F.opts.tpl.loading).click(F.cancel).appendTo('body');
 
 			// If user will press the escape-button, the request will be canceled
 			D.bind('keydown.loading', function(e) {
@@ -630,6 +635,8 @@
 					left : (viewport.w * 0.5) + viewport.x
 				});
 			}
+
+			F.trigger('onLoading');
 		},
 
 		getViewport: function () {
@@ -639,7 +646,7 @@
 					y: W.scrollTop()
 				};
 
-			if (locked) {
+			if (locked && locked.length) {
 				rez.w = locked[0].clientWidth;
 				rez.h = locked[0].clientHeight;
 
@@ -741,24 +748,22 @@
 		trigger: function (event, o) {
 			var ret, obj = o || F.coming || F.current;
 
-			if (!obj) {
-				return;
-			}
-
-			if ($.isFunction( obj[event] )) {
-				ret = obj[event].apply(obj, Array.prototype.slice.call(arguments, 1));
-			}
+			if (obj) {
+				if ($.isFunction( obj[event] )) {
+					ret = obj[event].apply(obj, Array.prototype.slice.call(arguments, 1));
+				}
 
-			if (ret === false) {
-				return false;
-			}
+				if (ret === false) {
+					return false;
+				}
 
-			if (obj.helpers) {
-				$.each(obj.helpers, function (helper, opts) {
-					if (opts && F.helpers[helper] && $.isFunction(F.helpers[helper][event])) {
-						F.helpers[helper][event]($.extend(true, {}, F.helpers[helper].defaults, opts), obj);
-					}
-				});
+				if (obj.helpers) {
+					$.each(obj.helpers, function (helper, opts) {
+						if (opts && F.helpers[helper] && $.isFunction(F.helpers[helper][event])) {
+							F.helpers[helper][event]($.extend(true, {}, F.helpers[helper].defaults, opts), obj);
+						}
+					});
+				}
 			}
 
 			D.trigger(event);
@@ -1117,7 +1122,7 @@
 				break;
 
 				case 'image':
-					content = current.tpl.image.replace('{href}', href);
+					content = current.tpl.image.replace(/\{href\}/g, href);
 				break;
 
 				case 'swf':
@@ -1217,7 +1222,7 @@
 			if (current.type === 'iframe') {
 				iframe = current.content;
 
-				if (current.autoHeight && iframe.data('ready') === 1) {
+				if (current.autoHeight && iframe && iframe.data('ready') === 1) {
 					try {
 						if (iframe[0].contentWindow.document.location) {
 							inner.width( origWidth ).height(9999);
@@ -1426,7 +1431,7 @@
 
 			F.isOpen = F.isOpened = true;
 
-			F.wrap.css('overflow', 'visible').addClass('fancybox-opened');
+			F.wrap.css('overflow', 'visible').addClass('fancybox-opened').hide().show(0);
 
 			F.update();
 
@@ -1465,12 +1470,13 @@
 
 			// Stop the slideshow if this is the last item
 			if (!current.loop && current.index === current.group.length - 1) {
+
 				F.play( false );
 
 			} else if (F.opts.autoPlay && !F.player.isActive) {
 				F.opts.autoPlay = false;
 
-				F.play();
+				F.play(true);
 			}
 		},
 
@@ -1703,13 +1709,17 @@
 
 		// Public methods
 		create : function(opts) {
+			var parent;
+
 			opts = $.extend({}, this.defaults, opts);
 
 			if (this.overlay) {
 				this.close();
 			}
 
-			this.overlay = $('<div class="fancybox-overlay"></div>').appendTo( F.coming ? F.coming.parent : opts.parent );
+			parent = F.coming ? F.coming.parent : opts.parent;
+
+			this.overlay = $('<div class="fancybox-overlay"></div>').appendTo( parent && parent.length ? parent : 'body' );
 			this.fixed   = false;
 
 			if (opts.fixed && F.defaults.fixed) {
@@ -1755,19 +1765,14 @@
 		},
 
 		close : function() {
-			var scrollV, scrollH;
-
 			W.unbind('resize.overlay');
 
 			if (this.el.hasClass('fancybox-lock')) {
 				$('.fancybox-margin').removeClass('fancybox-margin');
 
-				scrollV = W.scrollTop();
-				scrollH = W.scrollLeft();
-
 				this.el.removeClass('fancybox-lock');
 
-				W.scrollTop( scrollV ).scrollLeft( scrollH );
+				W.scrollTop( this.scrollV ).scrollLeft( this.scrollH );
 			}
 
 			$('.fancybox-overlay').remove().hide();
@@ -1812,10 +1817,6 @@
 			}
 
 			if (opts.locked && this.fixed && obj.fixed) {
-				if (!overlay) {
-					this.margin = D.height() > W.height() ? $('html').css('margin-right').replace("px", "") : false;
-				}
-
 				obj.locked = this.overlay.append( obj.wrap );
 				obj.fixed  = false;
 			}
@@ -1826,23 +1827,21 @@
 		},
 
 		beforeShow : function(opts, obj) {
-			var scrollV, scrollH;
-
-			if (obj.locked) {
-				if (this.margin !== false) {
-					$('*').filter(function(){
+			if (obj.locked && !this.el.hasClass('fancybox-lock')) {
+				if (this.fixPosition !== false) {
+					$('*:not(object)').filter(function(){
 						return ($(this).css('position') === 'fixed' && !$(this).hasClass("fancybox-overlay") && !$(this).hasClass("fancybox-wrap") );
 					}).addClass('fancybox-margin');
-
-					this.el.addClass('fancybox-margin');
 				}
 
-				scrollV = W.scrollTop();
-				scrollH = W.scrollLeft();
+				this.el.addClass('fancybox-margin');
+
+				this.scrollV = W.scrollTop();
+				this.scrollH = W.scrollLeft();
 
 				this.el.addClass('fancybox-lock');
 
-				W.scrollTop( scrollV ).scrollLeft( scrollH );
+				W.scrollTop( this.scrollV ).scrollLeft( this.scrollH );
 			}
 
 			this.open(opts);
@@ -1857,7 +1856,6 @@
 		afterClose: function (opts) {
 			// Remove overlay if exists and fancyBox is not opening
 			// (e.g., it is not being open using afterClose callback)
-			//if (this.overlay && !F.isActive) {
 			if (this.overlay && !F.coming) {
 				this.overlay.fadeOut(opts.speedOut, $.proxy( this.close, this ));
 			}
@@ -2017,4 +2015,4 @@
 		$("<style type='text/css'>.fancybox-margin{margin-right:" + (w2 - w1) + "px;}</style>").appendTo("head");
 	});
 
-}(window, document, jQuery));
+}(window, document, jQuery));