Changeset 9813 for extensions

Timestamp:

Mar 21, 2011, 8:51:25 PM (13 years ago)

Author:

rvelices

Message:

2.2.b avoid google bot retrieving ajax pages used by rv_tscroller

Location:

extensions/rv_tscroller

Files:

• main.inc.php (modified) (4 diffs)
• rv_tscroller.js (modified) (2 diffs)
• rv_tscroller.min.js (modified) (1 diff)

extensions/rv_tscroller/main.inc.php

@@ -1 +1 @@
 <?php /*
 Plugin Name: RV Thumb Scroller
-Version: 2.2.a
+Version: 2.2.b
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=493
 Description: Loads async using ajax thumbnails on index page as you scroll down the page
@@ -7 +7 @@
 Author URI: http://www.modusoptimus.com
 */
-define('RVTS_VERSION', '2.2.a');
+define('RVTS_VERSION', '2.2.b');
 
 class RVTS
@@ -65 +65 @@
         $per_page = $page['nb_image_page'];
         $url_model = str_replace('123456789', '%start%', duplicate_index_url( array('start'=>123456789) ) );
-        $ajax_url_model = add_url_params($url_model, array( 'rvts'=>'' ) );
+        $ajax_url_model = add_url_params($url_model, array( 'rvts'=>'%per%' ) );
 
         $url_model = str_replace('&amp;', '&', $url_model);
@@ -91 +91 @@
         }
         $repeat=false;
+        // the String.fromCharCode comes from google bot which somehow manage to get these urls
         $template->block_footer_script(null,
                 "var RVTS = {
-ajaxUrlModel: '$ajax_url_model'+'%per%',
+ajaxUrlModel: String.fromCharCode(".ord($ajax_url_model[0]).")+'".substr($ajax_url_model,1)."',
 start: $per_page,
 total: $total,
 perPage: $per_page,
-urlModel: '$url_model',
+moreUrlModel: String.fromCharCode(".ord($url_model[0]).")+'".substr($url_model,1)."',
 moreMsg: '$moreMsg',
 ajaxLoaderImage: '$ajax_loader_image'

extensions/rv_tscroller/rv_tscroller.js

@@ -24 +24 @@
                                 RVTS.$thumbs.after(
                                         '<div style="text-align:center;font-size:180%;margin:0 0 20px"><a href="'
-                                        +RVTS.urlModel.replace('%start%', RVTS.start)+'">'
+                                        +RVTS.moreUrlModel.replace('%start%', RVTS.start)+'">'
                                         +RVTS.moreMsg.replace('%d', RVTS.total-RVTS.start)
                                         +'</a></div>');
@@ -40 +40 @@
         var tBot=RVTS.$thumbs.position().top+RVTS.$thumbs.outerHeight()
                 ,wBot=$(window).scrollTop()+$(window).height();
-        tBot -= !evt ? 0:40; //begin 40 pixels before end
+        tBot -= !evt ? 0:90; //begin 90 pixels before end
         return tBot <= wBot ? (RVTS.doAutoScroll(),1) : 0;
 },

extensions/rv_tscroller/rv_tscroller.min.js

@@ -1 @@
-window.jQuery&&window.RVTS&&function(a){a(".navigationBar").hide();RVTS=a.fn.extend(RVTS,{loading:0,adjust:0,doAutoScroll:function(){if(!(RVTS.loading||RVTS.start>=RVTS.total)){var b=RVTS.ajaxUrlModel.replace("%start%",RVTS.start).replace("%per%",RVTS.perPage);if(RVTS.adjust){b+="&adj="+RVTS.adjust;RVTS.adjust=0}a("#ajaxLoader").show();RVTS.loading=1;a.ajax({type:"GET",dataType:"html",url:b,success:function(c){RVTS.start+=RVTS.perPage;RVTS.$thumbs.append(c);if(RVTS.start>500&&RVTS.total>550){RVTS.$thumbs.after('<div style="text-align:center;font-size:180%;margin:0 0 20px"><a href="'+ RVTS.urlModel.replace("%start%",RVTS.start)+'">'+RVTS.moreMsg.replace("%d",RVTS.total-RVTS.start)+"</a></div>");RVTS.total=0}},complete:function(){RVTS.loading=0;a("#ajaxLoader").hide()}})}},checkAutoScroll:function(b){var c=RVTS.$thumbs.position().top+RVTS.$thumbs.outerHeight(),d=a(window).scrollTop()+a(window).height();c-=!b?0:40;return c<=d?(RVTS.doAutoScroll(),1):0},engage:function(){var b=a(window);RVTS.$thumbs=a("#thumbnails");RVTS.$thumbs.append('<div id="ajaxLoader" style="display:none;position:fixed;bottom:32px;right:1%;z-index:999"><img src="'+ RVTS.ajaxLoaderImage+'" width="128" height="15" alt="~"></div>');b.scrollTop(0);if(RVTS.$thumbs.outerHeight()<b.height())RVTS.adjust=1;else if(RVTS.$thumbs.height()>2*b.height())RVTS.adjust=-1;b.bind("scroll resize",RVTS.checkAutoScroll);RVTS.checkAutoScroll()&&window.setTimeout(RVTS.checkAutoScroll,1500)}});a(document).ready(function(){window.setTimeout(RVTS.engage,250)})}(jQuery);
+window.jQuery&&window.RVTS&&function(a){a(".navigationBar").hide();RVTS=a.fn.extend(RVTS,{loading:0,adjust:0,doAutoScroll:function(){if(!(RVTS.loading||RVTS.start>=RVTS.total)){var b=RVTS.ajaxUrlModel.replace("%start%",RVTS.start).replace("%per%",RVTS.perPage);if(RVTS.adjust){b+="&adj="+RVTS.adjust;RVTS.adjust=0}a("#ajaxLoader").show();RVTS.loading=1;a.ajax({type:"GET",dataType:"html",url:b,success:function(c){RVTS.start+=RVTS.perPage;RVTS.$thumbs.append(c);if(RVTS.start>500&&RVTS.total>550){RVTS.$thumbs.after('<div style="text-align:center;font-size:180%;margin:0 0 20px"><a href="'+
+RVTS.moreUrlModel.replace("%start%",RVTS.start)+'">'+RVTS.moreMsg.replace("%d",RVTS.total-RVTS.start)+"</a></div>");RVTS.total=0}},complete:function(){RVTS.loading=0;a("#ajaxLoader").hide()}})}},checkAutoScroll:function(b){var c=RVTS.$thumbs.position().top+RVTS.$thumbs.outerHeight(),d=a(window).scrollTop()+a(window).height();c-=!b?0:90;return c<=d?(RVTS.doAutoScroll(),1):0},engage:function(){var b=a(window);RVTS.$thumbs=a("#thumbnails");RVTS.$thumbs.append('<div id="ajaxLoader" style="display:none;position:fixed;bottom:32px;right:1%;z-index:999"><img src="'+
+RVTS.ajaxLoaderImage+'" width="128" height="15" alt="~"></div>');b.scrollTop(0);if(RVTS.$thumbs.outerHeight()<b.height())RVTS.adjust=1;else if(RVTS.$thumbs.height()>2*b.height())RVTS.adjust=-1;b.bind("scroll resize",RVTS.checkAutoScroll);RVTS.checkAutoScroll()&&window.setTimeout(RVTS.checkAutoScroll,1500)}});a(document).ready(function(){window.setTimeout(RVTS.engage,250)})}(jQuery);