From d74665e03f852112c5d60151024ba1040f436939 Mon Sep 17 00:00:00 2001
From: Zach Wise <zach@digitalartwork.net>
Date: Tue, 3 Jul 2012 13:59:10 -0500
Subject: [PATCH] Tweak caption width to fix shadow weirdness when caption text
 is wider than the width of the media asset.

---
 source/js/Slider/VMM.Slider.js | 68 ++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/source/js/Slider/VMM.Slider.js b/source/js/Slider/VMM.Slider.js
index 8835213..f0dff93 100644
--- a/source/js/Slider/VMM.Slider.js
+++ b/source/js/Slider/VMM.Slider.js
@@ -320,37 +320,38 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
 		/* SIZE SLIDES
 		================================================== */
 		var sizeSlides = function() {
-			var layout_text_media = 		".slider-item .layout-text-media .media .media-container ";
-			var layout_media = 				".slider-item .layout-media .media .media-container ";
-			var layout_both	= 				".slider-item .media .media-container";
-			var mediasize = {
-				text_media: {
-					width: 		(config.slider.content.width/100) * 60,
-					height: 	config.slider.height - 60,
-					video: {
-						width: 	0,
-						height: 0
+			var layout_text_media		= ".slider-item .layout-text-media .media .media-container ",
+				layout_media			= ".slider-item .layout-media .media .media-container ",
+				layout_both				= ".slider-item .media .media-container",
+				layout_caption			= ".slider-item .media .media-container .media-shadow .caption",
+				mediasize = {
+					text_media: {
+						width: 			(config.slider.content.width/100) * 60,
+						height: 		config.slider.height - 60,
+						video: {
+							width:		0,
+							height:		0
+						},
+						text: {
+							width:		((config.slider.content.width/100) * 40) - 30,
+							height:		config.slider.height
+						}
 					},
-					text: {
-						width:	((config.slider.content.width/100) * 40) - 30,
-						height:	config.slider.height
+					media: {
+						width: 			config.slider.content.width,
+						height: 		config.slider.height - 110,
+						video: {
+							width: 		0,
+							height: 	0
+						}
 					}
-				},
-				media: {
-					width: 		config.slider.content.width,
-					height: 	config.slider.height - 110,
-					video: {
-						width: 	0,
-						height: 0
-					}
-				}
-			}
+				};
 			
-			VMM.master_config.sizes.api.width = mediasize.media.width;
-			VMM.master_config.sizes.api.height = mediasize.media.height;
+			VMM.master_config.sizes.api.width	= mediasize.media.width;
+			VMM.master_config.sizes.api.height	= mediasize.media.height;
 			
-			mediasize.text_media.video = 	VMM.Util.ratio.fit(mediasize.text_media.width, mediasize.text_media.height, 16, 9);
-			mediasize.media.video = 		VMM.Util.ratio.fit(mediasize.media.width, mediasize.media.height, 16, 9);
+			mediasize.text_media.video			= VMM.Util.ratio.fit(mediasize.text_media.width, mediasize.text_media.height, 16, 9);
+			mediasize.media.video				= VMM.Util.ratio.fit(mediasize.media.width, mediasize.media.height, 16, 9);
 			
 			VMM.Lib.css(".slider-item", "width", config.slider.content.width );
 			VMM.Lib.height(".slider-item", config.slider.height);
@@ -464,6 +465,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
 			VMM.Lib.width(	layout_media + 		".plain-text-quote", 					mediasize.media.width);
 			VMM.Lib.width(	layout_media + 		".plain-text", 							mediasize.media.width);
 			
+			// CAPTION WIDTH
+			VMM.Lib.css( layout_text_media + 	".caption",	"max-width",	mediasize.text_media.video.width);
+			VMM.Lib.css( layout_media + 		".caption",	"max-width",	mediasize.media.video.width);
+			
 			// MAINTAINS VERTICAL CENTER IF IT CAN
 			for(var i = 0; i < slides.length; i++) {
 				
@@ -585,7 +590,14 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
 				VMM.Lib.css(".slider", "overflow-y", "scroll" );
 			} else {
 				VMM.Lib.css(layout, "overflow-y", "hidden" );
-				VMM.Lib.animate(layout, _duration, _ease, {scrollTop: VMM.Lib.prop(layout, "scrollHeight") - VMM.Lib.height(layout) });
+				var scroll_height = 0;
+				try {
+					scroll_height = VMM.Lib.prop(layout, "scrollHeight");
+					VMM.Lib.animate(layout, _duration, _ease, {scrollTop: scroll_height - VMM.Lib.height(layout) });
+				}
+				catch(err) {
+					scroll_height = VMM.Lib.height(layout);
+				}
 			}
 			
 			preloadSlides();