arrive() to video component and main js array

hyunsupul · Sep 17, 2014 · d948bea · d948bea
1 parent e0c9f80
commit d948bea
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -126,6 +126,7 @@ module.exports = function(grunt) {
                      	'public/assets/js/cookie.js',
                      	'public/assets/js/parallax.js',
                      	'public/assets/js/photoset.js',
+                     	'public/assets/js/arrive-2.0.0.min.js',
                      	'public/assets/js/methods.js'
                     ]
                 }

diff --git a/public/assets/js/ai-core.js.map b/public/assets/js/ai-core.js.map
diff --git a/public/assets/js/ai-core.min.js b/public/assets/js/ai-core.min.js
diff --git a/public/includes/libs/arrive-2.0.0.min.js → public/assets/js/arrive-2.0.0.min.js b/public/includes/libs/arrive-2.0.0.min.js → public/assets/js/arrive-2.0.0.min.js
diff --git a/public/class-aesop-core.php b/public/class-aesop-core.php
@@ -292,7 +292,6 @@ public function scripts(){
 
 		// core script
 		wp_enqueue_script('ai-core', AI_CORE_URL.'/public/assets/js/ai-core.min.js', array('jquery'), AI_CORE_VERSION, true);
-		wp_enqueue_script('arrive', AI_CORE_URL.'/public/includes/libs/arrive-2.0.0.min.js', array('jquery'), AI_CORE_VERSION, true);
 	}
 
 	/**

diff --git a/public/includes/components/component-video.php b/public/includes/components/component-video.php
@@ -73,19 +73,21 @@ function aesop_video_shortcode($atts, $content = null) {
 	    if ( 'on' == $atts['viewstart'] && 'self' == $atts['src'] ) { ?>
 	    	<script>
 		    	jQuery(document).ready(function(){
-					jQuery('#aesop-video-<?php echo $unique;?>').waypoint({
-						offset: '<?php echo $waypoint;?>',
-						handler: function(direction){
-					   		jQuery('#aesop-video-<?php echo $unique;?> .mejs-playpause-button button').trigger('click');
-					   	}
+		    		jQuery('#aesop-video-<?php echo $unique;?>').arrive('.mejs-video', function(){
+						jQuery('#aesop-video-<?php echo $unique;?>').waypoint({
+							offset: '<?php echo $waypoint;?>',
+							handler: function(direction){
+						   		jQuery('#aesop-video-<?php echo $unique;?> .mejs-playpause-button button').trigger('click');
+						   	}
+						});
+						<?php if ('on' == $atts['viewend']) { ?>
+						jQuery('#aesop-video-<?php echo $unique;?>').waypoint({
+							handler: function(direction){
+						   		jQuery('#aesop-video-<?php echo $unique;?> .mejs-playpause-button button').trigger('click');
+						   	}
+						});
+						<?php } ?>
 					});
-					<?php if ('on' == $atts['viewend']) { ?>
-					jQuery('#aesop-video-<?php echo $unique;?>').waypoint({
-						handler: function(direction){
-					   		jQuery('#aesop-video-<?php echo $unique;?> .mejs-playpause-button button').trigger('click');
-					   	}
-					});
-					<?php } ?>
 		    	});
 	    	</script>
     	<?php }