Skip to content

Commit

Permalink
Use wp_enqueue_scripts instead of wp_print_scripts to enqueue meteors…
Browse files Browse the repository at this point in the history
…lides js on the front-end.
  • Loading branch information
dbernar1 committed Jun 2, 2013
1 parent 71a1676 commit 8ea6921
Showing 1 changed file with 33 additions and 37 deletions.
70 changes: 33 additions & 37 deletions meteor-slides-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,52 +241,48 @@ function meteorslides_css() {

// Adds JavaScript for the slideshow

add_action( 'wp_print_scripts', 'meteorslides_javascript' );
add_action( 'wp_enqueue_scripts', 'meteorslides_javascript' );

function meteorslides_javascript() {

$meteor_options = get_option( 'meteorslides_options' );

if( !is_admin() ) {

wp_enqueue_script( 'jquery' );
wp_enqueue_script( 'jquery-cycle', plugins_url( '/js/jquery.cycle.all.js', __FILE__ ), array( 'jquery' ) );
wp_enqueue_script( 'jquery-metadata', plugins_url( '/js/jquery.metadata.v2.js', __FILE__ ), array( 'jquery' ) );
wp_enqueue_script( 'jquery-touchwipe', plugins_url( '/js/jquery.touchwipe.1.1.1.js', __FILE__ ), array( 'jquery' ) );
wp_enqueue_script( 'jquery' );
wp_enqueue_script( 'jquery-cycle', plugins_url( '/js/jquery.cycle.all.js', __FILE__ ), array( 'jquery' ) );
wp_enqueue_script( 'jquery-metadata', plugins_url( '/js/jquery.metadata.v2.js', __FILE__ ), array( 'jquery' ) );
wp_enqueue_script( 'jquery-touchwipe', plugins_url( '/js/jquery.touchwipe.1.1.1.js', __FILE__ ), array( 'jquery' ) );

if ( file_exists( get_stylesheet_directory()."/slideshow.js" ) ) {

if ( file_exists( get_stylesheet_directory()."/slideshow.js" ) ) {

wp_enqueue_script( 'meteorslides-script', get_stylesheet_directory_uri() . '/slideshow.js', array('jquery', 'jquery-cycle') );

}

elseif ( file_exists( get_template_directory()."/slideshow.js" ) ) {

wp_enqueue_script( 'meteorslides-script', get_template_directory_uri() . '/slideshow.js', array('jquery', 'jquery-cycle') );

}

else {

wp_enqueue_script( 'meteorslides-script', plugins_url( '/js/slideshow.js', __FILE__ ), array( 'jquery', 'jquery-cycle' ) );

}
wp_enqueue_script( 'meteorslides-script', get_stylesheet_directory_uri() . '/slideshow.js', array('jquery', 'jquery-cycle') );

}

elseif ( file_exists( get_template_directory()."/slideshow.js" ) ) {

wp_enqueue_script( 'meteorslides-script', get_template_directory_uri() . '/slideshow.js', array('jquery', 'jquery-cycle') );

}

else {

wp_localize_script( 'meteorslides-script', 'meteorslidessettings',
wp_enqueue_script( 'meteorslides-script', plugins_url( '/js/slideshow.js', __FILE__ ), array( 'jquery', 'jquery-cycle' ) );

}

wp_localize_script( 'meteorslides-script', 'meteorslidessettings',

array(

array(
'meteorslideshowspeed' => $meteor_options['transition_speed'] * 1000,
'meteorslideshowduration' => $meteor_options['slide_duration'] * 1000,
'meteorslideshowheight' => $meteor_options['slide_height'],
'meteorslideshowwidth' => $meteor_options['slide_width'],
'meteorslideshowtransition' => $meteor_options['transition_style']

'meteorslideshowspeed' => $meteor_options['transition_speed'] * 1000,
'meteorslideshowduration' => $meteor_options['slide_duration'] * 1000,
'meteorslideshowheight' => $meteor_options['slide_height'],
'meteorslideshowwidth' => $meteor_options['slide_width'],
'meteorslideshowtransition' => $meteor_options['transition_style']

)

);
)

}
);

}

Expand Down Expand Up @@ -508,4 +504,4 @@ function form( $instance ) {
A shining furrow, as thy thoughts in me.
*/

?>
?>

0 comments on commit 8ea6921

Please sign in to comment.