Merge pull request #89 from Vigrond/patch-1

Fixed endless recursion loop bug that caused browser to freeze
scaron · Aug 28, 2012 · b0db83a · b0db83a
2 parents 091ec65 + 987d7db
commit b0db83a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/js/jquery.prettyPhoto.js b/js/jquery.prettyPhoto.js
@@ -595,11 +595,13 @@
 					pp_containerHeight = imageHeight, pp_containerWidth = imageWidth;
 				};
 
-				_getDimensions(imageWidth,imageHeight);
+
 
 				if((pp_containerWidth > windowWidth) || (pp_containerHeight > windowHeight)){
 					_fitToViewport(pp_containerWidth,pp_containerHeight)
 				};
+
+				_getDimensions(imageWidth,imageHeight);
 			};
 
 			return {
@@ -912,4 +914,4 @@
 
 })(jQuery);
 
-var pp_alreadyInitialized = false; // Used for the deep linking to make sure not to call the same function several times.
+var pp_alreadyInitialized = false; // Used for the deep linking to make sure not to call the same function several times.