build with Grunt

iulianghel · May 26, 2013 · 81d0492 · 81d0492
1 parent e006448
commit 81d0492
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,6 @@ node_modules
 _production
 all.min.css
 .sublime-*
-website/dist/
+website/dist/
+*.idea
+/.idea
diff --git a/dist/jquery.magnific-popup.js b/dist/jquery.magnific-popup.js
@@ -1,4 +1,4 @@
-/*! Magnific Popup - v0.8.8 - 2013-05-24
+/*! Magnific Popup - v0.8.8 - 2013-05-26
 * http://dimsemenov.com/plugins/magnific-popup/
 * Copyright (c) 2013 Dmitry Semenov; */
 ;(function($) {
@@ -141,7 +141,7 @@ MagnificPopup.prototype = {
 	init: function() {
 		var appVersion = navigator.appVersion;
 		mfp.isIE7 = appVersion.indexOf("MSIE 7.") !== -1; 
-		mfp.isIE8 = appVersion.indexOf("MSIE 8.") !== -1,
+		mfp.isIE8 = appVersion.indexOf("MSIE 8.") !== -1;
 		mfp.isLowIE = mfp.isIE7 || mfp.isIE8;
 		mfp.isAndroid = (/android/gi).test(appVersion);
 		mfp.isIOS = (/iphone|ipad|ipod/gi).test(appVersion);
@@ -308,11 +308,13 @@ MagnificPopup.prototype = {
 		var bodyStyles = {};
 
 		if( mfp.fixedContentPos ) {
-			var s = mfp._getScrollbarSize();
-			if(s) {
-				bodyStyles.paddingRight = s;
-			}
-		}
+            if(mfp._hasScrollBar()){
+                var s = mfp._getScrollbarSize();
+                if(s) {
+                    bodyStyles.paddingRight = s;
+                }
+            }
+        }
 
 		if(mfp.fixedContentPos) {
 			if(!mfp.isIE7) {
@@ -705,10 +707,7 @@ MagnificPopup.prototype = {
 		mfp.wrap.removeClass(cName);
 	},
 	_hasScrollBar: function(winHeight) {
-		if(document.body.clientHeight > (winHeight || _window.height()) ) {
-            return true;    
-        }
-        return false;
+		return (document.body.clientHeight > (winHeight || _window.height()) )
 	},
 
 	_parseMarkup: function(template, values, item) {
@@ -908,6 +907,7 @@ for(i = 0; i < rounds; i++) {
 console.log('Test #2:', performance.now() - start);
 */
 
+
 /*>>core*/
 
 /*>>inline*/

diff --git a/dist/jquery.magnific-popup.min.js b/dist/jquery.magnific-popup.min.js
diff --git a/dist/magnific-popup.css b/dist/magnific-popup.css
@@ -212,21 +212,21 @@ button::-moz-focus-inner {
   left: 0; }
   .mfp-arrow-left:after,
   .mfp-arrow-left .mfp-a {
-    border-right: 12px solid black;
+    border-right: 12px solid #000;
     left: 5px; }
   .mfp-arrow-left:before,
   .mfp-arrow-left .mfp-b {
-    border-right: 20px solid white; }
+    border-right: 20px solid #FFF; }
 
 .mfp-arrow-right {
   right: 0; }
   .mfp-arrow-right:after,
   .mfp-arrow-right .mfp-a {
-    border-left: 12px solid black;
+    border-left: 12px solid #000;
     left: 3px; }
   .mfp-arrow-right:before,
   .mfp-arrow-right .mfp-b {
-    border-left: 20px solid white; }
+    border-left: 20px solid #FFF; }
 
 .mfp-iframe-holder {
   padding-top: 40px;