API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Sep 6th, 2015
155
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
GAMBAS 10.83 KB | None | 0 0
raw download clone embed print report
  1. commit d8330c7c9f8f7e180956d623998393592e74fc43
  2. Author: summatix
  3. Date:   Sun Sep 6 16:59:11 2015 -0500
  4.  
  5.     Removed inline JavaScript in favor of using wp_localize_script
  6.  
  7. diff --git a/float-to-top-button.php b/float-to-top-button.php
  8. index 620ce47..b30b5cc 100644
  9. --- a/float-to-top-button.php
  10. +++ b/float-to-top-button.php
  11. @@ -59,9 +59,6 @@ class Fttb
  12.         {   // ADD BACKEND ACTIONS
  13.             add_action('admin_menu', array(&$this, 'fttb_admin_menu'));
  14.             add_filter('plugin_action_links_'.plugin_basename(__FILE__), array(&$this, 'fttb_settings_link'));
  15. -       } else
  16. -       {   // ADD FRONTEND ACTIONS
  17. -           add_action('wp_footer', array(&$this, 'fttb_javascript_vars'));
  18.         } // if (is_admin())
  19.     } // function __construct()
  20.  
  21. @@ -121,11 +118,10 @@ class Fttb
  22.      *  LOAD FRONTEND JAVASCRIPT
  23.      *******************************************************************************/
  24.     function fttb_fe_scripts()
  25. -   {   wp_register_script('fttb-script', plugins_url('float-to-top-button/js/jquery.scrollUp.min.js'), array('jquery'), '1.0', true);
  26. -       wp_enqueue_script('fttb-script');
  27. +   {   wp_enqueue_script('fttb-script', plugins_url('float-to-top-button/js/jquery.scrollUp.min.js'), array('jquery'), $this->fttb_version, true);
  28.         // v2.0.6
  29. -       wp_register_script('fttb-active', plugins_url('float-to-top-button/js/float-to-top-button'.$this->script_debug.'.js'), array('jquery'), '1.0', true);
  30. -       wp_enqueue_script('fttb-active');
  31. +       wp_enqueue_script('fttb-active', plugins_url('float-to-top-button/js/float-to-top-button'.$this->script_debug.'.js'), array('jquery'), $this->fttb_version, true);
  32. +       wp_localize_script('fttb-active', 'fttb', $this->get_fttb_javascript_vars());
  33.     } // fttb_fe_scripts()
  34.  
  35.  
  36. @@ -211,28 +207,24 @@ class Fttb
  37.     /*******************************************************************************
  38.      *  PASS OPTIONS TO JAVASCRIPT
  39.      *******************************************************************************/
  40. -   function fttb_javascript_vars()
  41. -   {  
  42. -       echo '
  43. -<!-- START Float to Top Button v'.$this->fttb_version.' ['.$this->fttb_release_date.'] | http://cagewebdev.com/float-to-top-button | CAGE Web Design | Rolf van Gelder -->
  44. -<script type="text/javascript">
  45. -var fttb_topdistance       = '.$this->fttb_options['topdistance'].';
  46. -var fttb_topspeed          = '.$this->fttb_options['topspeed'].';
  47. -var fttb_animation         = "'.$this->fttb_options['animation'].'";
  48. -var fttb_animationinspeed   = '.$this->fttb_options['animationinspeed'].';
  49. -var fttb_animationoutspeed  = '.$this->fttb_options['animationoutspeed'].';
  50. -var fttb_scrolltext            = "'. __( $this->fttb_options['scrolltext'], 'float-to-top-button' ).'";
  51. -var fttb_imgurl                = "'.$this->imgurl.'";
  52. -var fttb_arrow_img         = "'.$this->fttb_options['arrow_img'].'";
  53. -var fttb_position           = "'.$this->fttb_options['position'].'";
  54. -var fttb_spacing_horizontal = "'.$this->fttb_options['spacing_horizontal'].'";
  55. -var fttb_spacing_vertical   = "'.$this->fttb_options['spacing_vertical'].'";
  56. -var fttb_opacity_out       = '.$this->fttb_options['opacity_out'].';
  57. -var fttb_opacity_over      = '.$this->fttb_options['opacity_over'].';
  58. -</script>
  59. -<!-- END Float to Top Button -->
  60. -';
  61. -   } // fttb_javascript_vars()
  62. +   function get_fttb_javascript_vars()
  63. +   {
  64. +       return array(
  65. +           'topdistance'        => $this->fttb_options['topdistance'],
  66. +           'topspeed'           => $this->fttb_options['topspeed'],
  67. +           'animation'          => $this->fttb_options['animation'],
  68. +           'animationinspeed'   => $this->fttb_options['animationinspeed'],
  69. +           'animationoutspeed'  => $this->fttb_options['animationoutspeed'],
  70. +           'scrolltext'         => __( $this->fttb_options['scrolltext'], 'float-to-top-button' ),
  71. +           'imgurl'             => $this->imgurl,
  72. +           'arrow_img'          => $this->fttb_options['arrow_img'],
  73. +           'position'           => $this->fttb_options['position'],
  74. +           'spacing_horizontal' => $this->fttb_options['spacing_horizontal'],
  75. +           'spacing_vertical'   => $this->fttb_options['spacing_vertical'],
  76. +           'opacity_out'        => $this->fttb_options['opacity_out'],
  77. +           'opacity_over'       => $this->fttb_options['opacity_over']
  78. +       );
  79. +   } // get_fttb_javascript_vars()
  80.  
  81.  
  82.     /*******************************************************************************
  83. diff --git a/js/float-to-top-button.js b/js/float-to-top-button.js
  84. index d5f1c15..02f5cf0 100644
  85. --- a/js/float-to-top-button.js
  86. +++ b/js/float-to-top-button.js
  87. @@ -19,53 +19,53 @@
  88.  jQuery(document).ready(function(){
  89.     /* CREATE THE SCROLLUP INSTANCE */
  90.     var fttb_img = new Image();
  91. -   fttb_img.src = fttb_imgurl+fttb_arrow_img;
  92. +   fttb_img.src = fttb.imgurl+fttb.arrow_img;
  93.    
  94.     jQuery("#scrollUp").width(fttb_img.width);
  95.     jQuery("#scrollUp").height(fttb_img.height);
  96.        
  97.     jQuery.scrollUp({
  98. -       topDistance: fttb_topdistance,             // DISTANCE FROM TOP BEFORE SHOWING ELEMENT (PX)
  99. -       topSpeed: fttb_topspeed,                   // SPEED BACK TO TOP (MS)
  100. -       animation: fttb_animation,                 // FADE, SLIDE, NONE
  101. -       animationInSpeed: fttb_animationinspeed,   // ANIMATION IN SPEED (MS)
  102. -       animationOutSpeed: fttb_animationoutspeed, // ANIMATION OUT SPEED (MS)
  103. -       scrollText: fttb_scrolltext                // TTTLE FOR THE IMAGE
  104. +       topDistance: fttb.topdistance,             // DISTANCE FROM TOP BEFORE SHOWING ELEMENT (PX)
  105. +       topSpeed: fttb.topspeed,                   // SPEED BACK TO TOP (MS)
  106. +       animation: fttb.animation,                 // FADE, SLIDE, NONE
  107. +       animationInSpeed: fttb.animationinspeed,   // ANIMATION IN SPEED (MS)
  108. +       animationOutSpeed: fttb.animationoutspeed, // ANIMATION OUT SPEED (MS)
  109. +       scrollText: fttb.scrolltext                // TTTLE FOR THE IMAGE
  110.     });
  111.        
  112.     /* SET THE 'TO TOP' IMAGE TO THE SELECTED IMAGE */
  113. -   jQuery("#scrollUp").css({"background-image":"url("+fttb_imgurl+fttb_arrow_img+")"});
  114. +   jQuery("#scrollUp").css({"background-image":"url("+fttb.imgurl+fttb.arrow_img+")"});
  115.  
  116. -   if(fttb_position == 'lowerleft')
  117. +   if(fttb.position == 'lowerleft')
  118.     {
  119. -       jQuery("#scrollUp").css('left', fttb_spacing_horizontal);
  120. -       jQuery("#scrollUp").css('bottom', fttb_spacing_vertical);      
  121. +       jQuery("#scrollUp").css('left', fttb.spacing_horizontal);
  122. +       jQuery("#scrollUp").css('bottom', fttb.spacing_vertical);      
  123.     }
  124. -   else if(fttb_position == 'lowerright')
  125. +   else if(fttb.position == 'lowerright')
  126.     {
  127. -       jQuery("#scrollUp").css('right', fttb_spacing_horizontal);
  128. -       jQuery("#scrollUp").css('bottom', fttb_spacing_vertical);          
  129. +       jQuery("#scrollUp").css('right', fttb.spacing_horizontal);
  130. +       jQuery("#scrollUp").css('bottom', fttb.spacing_vertical);          
  131.     }
  132. -   else if(fttb_position == 'upperleft')
  133. +   else if(fttb.position == 'upperleft')
  134.     {
  135. -       jQuery("#scrollUp").css('left', fttb_spacing_horizontal);
  136. -       jQuery("#scrollUp").css('top', fttb_spacing_vertical);
  137. +       jQuery("#scrollUp").css('left', fttb.spacing_horizontal);
  138. +       jQuery("#scrollUp").css('top', fttb.spacing_vertical);
  139.     }
  140. -   else if(fttb_position == 'upperright')
  141. +   else if(fttb.position == 'upperright')
  142.     {
  143. -       jQuery("#scrollUp").css('right', fttb_spacing_horizontal);
  144. -       jQuery("#scrollUp").css('top', fttb_spacing_vertical);     
  145. +       jQuery("#scrollUp").css('right', fttb.spacing_horizontal);
  146. +       jQuery("#scrollUp").css('top', fttb.spacing_vertical);     
  147.     }
  148.    
  149.     /* SET THE OPACITY OF THE 'TO TOP' IMAGE (FROM THE SETTINGS) */
  150. -   setOpacity(fttb_opacity_out);
  151. +   setOpacity(fttb.opacity_out);
  152.    
  153.     jQuery("#scrollUp").mouseover(function() {
  154. -       setOpacity(fttb_opacity_over);
  155. +       setOpacity(fttb.opacity_over);
  156.     });
  157.    
  158.     jQuery("#scrollUp").mouseout(function() {
  159. -       setOpacity(fttb_opacity_out);
  160. +       setOpacity(fttb.opacity_out);
  161.     });
  162.  });       
  163.  
  164. diff --git a/js/float-to-top-button.min.js b/js/float-to-top-button.min.js
  165. index 3a0f68b..392ab9b 100644
  166. --- a/js/float-to-top-button.min.js
  167. +++ b/js/float-to-top-button.min.js
  168. @@ -1 +1 @@
  169. -function setOpacity(t){jQuery("#scrollUp").css({"-khtml-opacity":"."+t}),jQuery("#scrollUp").css({"-moz-opacity":"."+t}),jQuery("#scrollUp").css({"-ms-filter":'"alpha(opacity='+t+')"'}),jQuery("#scrollUp").css({filter:"alpha(opacity="+t+")"}),jQuery("#scrollUp").css({filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=0."+t+")"}),jQuery("#scrollUp").css({opacity:"."+t})}jQuery(document).ready(function(){var t=new Image;t.src=fttb_imgurl+fttb_arrow_img,jQuery("#scrollUp").width(t.width),jQuery("#scrollUp").height(t.height),jQuery.scrollUp({topDistance:fttb_topdistance,topSpeed:fttb_topspeed,animation:fttb_animation,animationInSpeed:fttb_animationinspeed,animationOutSpeed:fttb_animationoutspeed,scrollText:fttb_scrolltext}),jQuery("#scrollUp").css({"background-image":"url("+fttb_imgurl+fttb_arrow_img+")"}),"lowerleft"==fttb_position?(jQuery("#scrollUp").css("left",fttb_spacing_horizontal),jQuery("#scrollUp").css("bottom",fttb_spacing_vertical)):"lowerright"==fttb_position?(jQuery("#scrollUp").css("right",fttb_spacing_horizontal),jQuery("#scrollUp").css("bottom",fttb_spacing_vertical)):"upperleft"==fttb_position?(jQuery("#scrollUp").css("left",fttb_spacing_horizontal),jQuery("#scrollUp").css("top",fttb_spacing_vertical)):"upperright"==fttb_position&&(jQuery("#scrollUp").css("right",fttb_spacing_horizontal),jQuery("#scrollUp").css("top",fttb_spacing_vertical)),setOpacity(fttb_opacity_out),jQuery("#scrollUp").mouseover(function(){setOpacity(fttb_opacity_over)}),jQuery("#scrollUp").mouseout(function(){setOpacity(fttb_opacity_out)})});
  170. \ No newline at end of file
  171. +function setOpacity(t){jQuery("#scrollUp").css({"-khtml-opacity":"."+t}),jQuery("#scrollUp").css({"-moz-opacity":"."+t}),jQuery("#scrollUp").css({"-ms-filter":'"alpha(opacity='+t+')"'}),jQuery("#scrollUp").css({filter:"alpha(opacity="+t+")"}),jQuery("#scrollUp").css({filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=0."+t+")"}),jQuery("#scrollUp").css({opacity:"."+t})}jQuery(document).ready(function(){var t=new Image;t.src=fttb.imgurl+fttb.arrow_img,jQuery("#scrollUp").width(t.width),jQuery("#scrollUp").height(t.height),jQuery.scrollUp({topDistance:fttb.topdistance,topSpeed:fttb.topspeed,animation:fttb.animation,animationInSpeed:fttb.animationinspeed,animationOutSpeed:fttb.animationoutspeed,scrollText:fttb.scrolltext}),jQuery("#scrollUp").css({"background-image":"url("+fttb.imgurl+fttb.arrow_img+")"}),"lowerleft"==fttb.position?(jQuery("#scrollUp").css("left",fttb.spacing_horizontal),jQuery("#scrollUp").css("bottom",fttb.spacing_vertical)):"lowerright"==fttb.position?(jQuery("#scrollUp").css("right",fttb.spacing_horizontal),jQuery("#scrollUp").css("bottom",fttb.spacing_vertical)):"upperleft"==fttb.position?(jQuery("#scrollUp").css("left",fttb.spacing_horizontal),jQuery("#scrollUp").css("top",fttb.spacing_vertical)):"upperright"==fttb.position&&(jQuery("#scrollUp").css("right",fttb.spacing_horizontal),jQuery("#scrollUp").css("top",fttb.spacing_vertical)),setOpacity(fttb.opacity_out),jQuery("#scrollUp").mouseover(function(){setOpacity(fttb.opacity_over)}),jQuery("#scrollUp").mouseout(function(){setOpacity(fttb.opacity_out)})});
  172. \ No newline at end of file
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!