diff --git a/htdocs/sites/all/modules/views_slideshow_xtra/views_slideshow_xtra.js b/htdocs/sites/all/modules/views_slideshow_xtra/views_slideshow_xtra.js index 36a3e60..c2245e2 100644 --- a/htdocs/sites/all/modules/views_slideshow_xtra/views_slideshow_xtra.js +++ b/htdocs/sites/all/modules/views_slideshow_xtra/views_slideshow_xtra.js @@ -25,10 +25,17 @@ // Move the views slideshow xtra element over the top of the slide. var marginMove = slideAreaOffset.top - xtraOffset.top; - $(this).css({'margin-top': marginMove + 'px'}); + $(this).css({ + 'margin-top': marginMove + 'px' + }); // Move type=text slide elements into place. - var slideData = Drupal.settings.viewsSlideshowXtra[options.slideshowID].slideInfo.text; + if(typeof Drupal.settings.viewsSlideshowXtra!= "undefined"){ + var slideData = Drupal.settings.viewsSlideshowXtra[options.slideshowID].slideInfo.text; + }else{ + var slideData = ""; + } + var slideNum = 0; for (slide in slideData) { var items = slideData[slide]; @@ -44,14 +51,19 @@ } // Move type=link slide elements into place. - var slideData = Drupal.settings.viewsSlideshowXtra[options.slideshowID].slideInfo.link; + if(typeof Drupal.settings.viewsSlideshowXtra!= "undefined"){ + var slideData = Drupal.settings.viewsSlideshowXtra[options.slideshowID].slideInfo.link; + }else{ + var slideData = ""; + } + var slideNum = 0; for (slide in slideData) { var items = slideData[slide]; var itemNum = 0; for (item in items) { //alert('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-link-' + slideNum + '-' + itemNum); - $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-link-' + slideNum + '-' + itemNum).css({ + $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-link-' + slideNum + '-' + itemNum).css({ 'width': slideArea.width() }); itemNum++; @@ -60,36 +72,49 @@ } // Move type=image slide elements into place. - var slideData = Drupal.settings.viewsSlideshowXtra[options.slideshowID].slideInfo.image; + if(typeof Drupal.settings.viewsSlideshowXtra!= "undefined"){ + var slideData = Drupal.settings.viewsSlideshowXtra[options.slideshowID].slideInfo.image;; + }else{ + var slideData = ""; + } var slideNum = 0; for (slide in slideData) { var items = slideData[slide]; var itemNum = 0; for (item in items) { //alert('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-image-' + slideNum + '-' + itemNum); - $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-image-' + slideNum + '-' + itemNum).css({ + $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-image-' + slideNum + '-' + itemNum).css({ 'width': slideArea.width() }); itemNum++; } slideNum++; } + if(typeof Drupal.settings.viewsSlideshowXtra!= "undefined"){ + var settings = Drupal.settings.viewsSlideshowXtra[options.slideshowID]; + if (settings.pauseAfterMouseMove) { + //if(true) { + slideArea.mousemove(function(e) { + if (pageX - e.pageX > 5 || pageY - e.pageY > 5) { + Drupal.viewsSlideshow.action({ + "action": 'pause', + "slideshowID": options.slideshowID + }); + clearTimeout(timeout); + timeout = setTimeout(function() { + Drupal.viewsSlideshow.action({ + "action": 'play', + "slideshowID": options.slideshowID + }); + }, 2000); + } + pageX = e.pageX; + pageY = e.pageY; + }); + } + + } - var settings = Drupal.settings.viewsSlideshowXtra[options.slideshowID]; - if (settings.pauseAfterMouseMove) { - //if(true) { - slideArea.mousemove(function(e) { - if (pageX - e.pageX > 5 || pageY - e.pageY > 5) { - Drupal.viewsSlideshow.action({ "action": 'pause', "slideshowID": options.slideshowID }); - clearTimeout(timeout); - timeout = setTimeout(function() { - Drupal.viewsSlideshow.action({ "action": 'play', "slideshowID": options.slideshowID }); - }, 2000); - } - pageX = e.pageX; - pageY = e.pageY; - }); - } }); @@ -97,20 +122,20 @@ // an xtra slideshow. This seems to work but its probably not the right way. //if (Drupal.settings.viewsSlideshowXtra[options.slideshowID]) { THIS DOES NOT WORK! if ('viewsSlideshowXtra' in Drupal.settings) { - var settings = Drupal.settings.viewsSlideshowXtra[options.slideshowID]; + var settings = Drupal.settings.viewsSlideshowXtra[options.slideshowID]; - // Hide elements either by fading or not - if (settings.displayDelayFade) { - $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-row').fadeOut(); - } - else { - $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-row').hide(); - } + // Hide elements either by fading or not + if (settings.displayDelayFade) { + $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-row').fadeOut(); + } + else { + $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-row').hide(); + } settings.currentTransitioningSlide = options.slideNum; - // Pause from showing the text and links however long the user decides. - setTimeout(function() { + // Pause from showing the text and links however long the user decides. + setTimeout(function() { if (options.slideNum == settings.currentTransitioningSlide) { if (settings.displayDelayFade) { $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-row-' + options.slideNum).fadeIn(); @@ -119,9 +144,9 @@ $('#views-slideshow-xtra-' + options.slideshowID + ' .views-slideshow-xtra-row-' + options.slideNum).show(); } } - }, - settings.displayDelay - ); + }, + settings.displayDelay + ); } }; diff --git a/htdocs/sites/all/modules/views_slideshow_xtra/views_slideshow_xtra_overlay/js/views_slideshow_xtra_overlay.js b/htdocs/sites/all/modules/views_slideshow_xtra/views_slideshow_xtra_overlay/js/views_slideshow_xtra_overlay.js index e33a26f..082a978 100644 --- a/htdocs/sites/all/modules/views_slideshow_xtra/views_slideshow_xtra_overlay/js/views_slideshow_xtra_overlay.js +++ b/htdocs/sites/all/modules/views_slideshow_xtra/views_slideshow_xtra_overlay/js/views_slideshow_xtra_overlay.js @@ -5,51 +5,51 @@ (function ($) { Drupal.behaviors.viewsSlideshowXtraOverlay = { attach: function (context) { - + // Return if there are no vsx elements on the page if ($('.views-slideshow-xtra-overlay').length == 0) { return; } - + var pageX = 0, pageY = 0, timeout; // Modify the slideshow(s) that have a vsx overlay. $('.views_slideshow_main').each(function() { var slideshowMain = $(this); - + // Get the view for this slideshow var view = slideshowMain.closest('.view'); - + // Process the view if it has at least one overlay. if ($('.views-slideshow-xtra-overlay', view).length > 0) { - + // Get the View ID and Display ID so we can get the settings. var viewClasses = classList(view); - + $.each( viewClasses, function(index, item) { // We need this code because the id of the element selected will be something like: // "views_slideshow_cycle_main_views_slideshow_xtra_example-page" - // We don't want to reference the string "cycle" in our code, and there is not a way to + // We don't want to reference the string "cycle" in our code, and there is not a way to // get the "View ID - Display ID" substring from the id string, unless the string "cycle" // is referenced in a string manipulation function. - + // Get the View ID if((/^view-id-/).test(item)) { viewId = item.substring('view-id-'.length); } - + // Get the Display ID if((/^view-display-id-/).test(item)) { viewDisplayId = item.substring('view-display-id-'.length); } - + }); - + if(typeof viewId != "undefined") { var settings = Drupal.settings.viewsSlideshowXtraOverlay[viewId + '-' + viewDisplayId]; // Pause after mouse movement. - if (settings.hasOwnProperty('pauseAfterMouseMove')) { + if (typeof settings != "undefined" && settings.hasOwnProperty('pauseAfterMouseMove')) { var pauseAfterMouseMove = settings.pauseAfterMouseMove; if (pauseAfterMouseMove > 0) { $(this).mousemove(function(e) { @@ -65,7 +65,7 @@ }); } } - + } // Process the overlay(s). @@ -77,7 +77,7 @@ }); } - + }); } }; @@ -85,7 +85,7 @@ Drupal.viewsSlideshowXtraOverlay = Drupal.viewsSlideshowXtraOverlay || {}; Drupal.viewsSlideshowXtraOverlay.transitionBegin = function (options) { - + // Hide all overlays for all slides. $('#views_slideshow_cycle_main_' + options.slideshowID + ' .views-slideshow-xtra-overlay-row').hide(); @@ -100,14 +100,14 @@ // Fade in or show overlay with optional delay. setTimeout(function() { if(settings.overlayFadeIn) { - overlay.fadeIn(settings.overlayFadeIn); + overlay.fadeIn(settings.overlayFadeIn); } else { overlay.show(); } }, settings.overlayDelay ); - + // Fade out overlay with optional delay. if(settings.overlayFadeOut) { setTimeout(function() { @@ -116,7 +116,7 @@ settings.overlayFadeOutDelay ); } - + }); }; @@ -129,5 +129,5 @@ return classes; } - + })(jQuery);