Merge branch 'develop' of cvs2:WP-Themes/gaylordmichigan into develop

diff --cc js/app.js
index fe1ec1c,53d4804..b38b1cc
--- 1/js/app.js
--- 2/js/app.js
+++ b/js/app.js
@@@ -289,14 -289,17 +289,15 @@@ $(document).ready(function () 
  //        if(!video_visible){
  //            $("#wp-custom-header-video-button").trigger('click');
  //            paused = true;
 -//            console.log("PAUSED");
  //        } else {
  //            paused = false;
 -//            console.log('PLAYING');
  //        }
  //
 +//         console.log( $("#wp-custom-header-video-button").text());
  //        $(window).on("scroll", function(){
 -//            console.log(clicked, paused, video_visible);
 -//            
 +////            console.log(clicked, paused, video_visible);
  //            video_visible = $("#wp-custom-header").isOnScreen();
 -//            
++
  //            if(video_visible && clicked === false && paused === true){
  //                $("#wp-custom-header-video-button").trigger('click');
  //                clicked = true;
@@@ -311,17 -314,6 +312,18 @@@
  //            }
  //        })
  //    });
 +    
 +    $(window).scroll(function() {
 +        $("iframe").each( function() {
 +            if( $(window).scrollTop() > $(this).offset().top - 200 ) {
 +                $(this).css('opacity',1);
 +                player.playVideo();
 +            } else {
 +                $(this).css('opacity',0);
 +                player.stopVideo();
 +            }
 +        });
 +    });
 +
++
  });

diff --cc js/custom/pageSetup.js
index 0567a2c,a04e61a..48f5c2f
--- 1/js/custom/pageSetup.js
--- 2/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@@ -86,14 -86,17 +86,15 @@@ $(document).ready(function () 
  //        if(!video_visible){
  //            $("#wp-custom-header-video-button").trigger('click');
  //            paused = true;
 -//            console.log("PAUSED");
  //        } else {
  //            paused = false;
 -//            console.log('PLAYING');
  //        }
  //
 +//         console.log( $("#wp-custom-header-video-button").text());
  //        $(window).on("scroll", function(){
 -//            console.log(clicked, paused, video_visible);
 -//            
 +////            console.log(clicked, paused, video_visible);
  //            video_visible = $("#wp-custom-header").isOnScreen();
 -//            
++
  //            if(video_visible && clicked === false && paused === true){
  //                $("#wp-custom-header-video-button").trigger('click');
  //                clicked = true;
@@@ -108,17 -111,6 +109,18 @@@
  //            }
  //        })
  //    });
 +    
 +    $(window).scroll(function() {
 +        $("iframe").each( function() {
 +            if( $(window).scrollTop() > $(this).offset().top - 200 ) {
 +                $(this).css('opacity',1);
 +                player.playVideo();
 +            } else {
 +                $(this).css('opacity',0);
 +                player.stopVideo();
 +            }
 +        });
 +    });
 +
++
  });