Index: views_slideshow.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/views_slideshow.module,v retrieving revision 1.11.2.2.2.12.2.5.2.2 diff -u -p -r1.11.2.2.2.12.2.5.2.2 views_slideshow.module --- views_slideshow.module 1 Jan 2011 01:20:21 -0000 1.11.2.2.2.12.2.5.2.2 +++ views_slideshow.module 9 Jan 2011 04:07:25 -0000 @@ -313,6 +313,15 @@ function views_slideshow_views_slideshow // Default slideshow type and skins $options['slideshow_type'] = array('default' => ''); $options['slideshow_skin'] = array('default' => ''); + $options['skin_info'] = array( + 'default' => array( + 'class' => 'default', + 'title' => t('Untitled skin'), + 'module' => 'views_slideshow', + 'path' => '', + 'stylesheets' => array(), + ), + ); // Set default widgets and weight values. $widgets = module_invoke_all('views_slideshow_widget_info'); @@ -320,7 +329,7 @@ function views_slideshow_views_slideshow $locations = array('top', 'bottom'); foreach ($locations as $location) { foreach ($widgets as $widget_id => $widget_name) { - $options['widgets']['contains'][$location]['contains'][$widget_id]['enable'] = array('default' => 0); + $options['widgets']['contains'][$location]['contains'][$widget_id]['contains']['enable'] = array('default' => 0); $options['widgets']['contains'][$location]['contains'][$widget_id]['contains']['weight'] = array('default' => 1); } } Index: contrib/views_slideshow_cycle/js/views_slideshow_cycle.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/js/Attic/views_slideshow_cycle.js,v retrieving revision 1.1.2.2.2.4 diff -u -p -r1.1.2.2.2.4 views_slideshow_cycle.js --- contrib/views_slideshow_cycle/js/views_slideshow_cycle.js 7 Jan 2011 08:34:53 -0000 1.1.2.2.2.4 +++ contrib/views_slideshow_cycle/js/views_slideshow_cycle.js 9 Jan 2011 04:07:25 -0000 @@ -237,25 +237,30 @@ } // If selected wait for the images to be loaded. - // Otherwise just load the slideshow. + // otherwise just load the slideshow. if (settings.wait_for_image_load) { - // For IE/Chrome/Opera we need to make sure the images are loaded before - // starting the slideshow. + // For IE/Chrome/Opera we if there are images then we need to make + // sure the images are loaded before starting the slideshow. settings.totalImages = $(settings.targetId + ' img').length; - settings.loadedImages = 0; + if (settings.totalImages) { + settings.loadedImages = 0; - // Add a load event for each image. - $(settings.targetId + ' img').each(function() { - var $imageElement = $(this); - $imageElement.bind('load', function () { - Drupal.viewsSlideshowCycle.imageWait(fullId); + // Add a load event for each image. + $(settings.targetId + ' img').each(function() { + var $imageElement = $(this); + $imageElement.bind('load', function () { + Drupal.viewsSlideshowCycle.imageWait(fullId); + }); + + // Removing the source and adding it again will fire the load event. + var imgSrc = $imageElement.attr('src'); + $imageElement.attr('src', ''); + $imageElement.attr('src', imgSrc); }); - - // Removing the source and adding it again will fire the load event. - var imgSrc = $imageElement.attr('src'); - $imageElement.attr('src', ''); - $imageElement.attr('src', imgSrc); - }); + } + else { + Drupal.viewsSlideshowCycle.load(fullId); + } } else { Drupal.viewsSlideshowCycle.load(fullId); Index: theme/views_slideshow.theme.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/theme/Attic/views_slideshow.theme.inc,v retrieving revision 1.1.2.5.2.2 diff -u -p -r1.1.2.5.2.2 views_slideshow.theme.inc --- theme/views_slideshow.theme.inc 1 Jan 2011 01:20:21 -0000 1.1.2.5.2.2 +++ theme/views_slideshow.theme.inc 9 Jan 2011 04:07:25 -0000 @@ -23,8 +23,20 @@ function template_preprocess_views_slide /** * Process Skins */ - $skin_info = $options['skin_info']; + $skin_info = array(); + if (isset($options['skin_info'])) { + $skin_info = $options['skin_info']; + } + // Make sure $skin_info has all the values. + $skin_info += array( + 'class' => 'default', + 'title' => t('Untitled skin'), + 'module' => 'views_slideshow', + 'path' => '', + 'stylesheets' => array(), + ); + $vars['skin'] = $skin_info['class']; // Enqueue any stylesheets set for the skin on this view are added.