Changeset 714590

Timestamp:

05/17/2013 09:16:00 PM (13 years ago)

Author:

matthewbe

Message:

• spiders only in blog entries
• JS fix

Location:

spider-invasion/trunk

Files:

• js/spider-invasion.js (modified) (2 diffs)
• js/spider-invasion.min.js (modified) (1 diff)
• readme.txt (modified) (1 diff)
• spider-invasion.php (modified) (2 diffs)

spider-invasion/trunk/js/spider-invasion.js

@@ -79 +79 @@
         height: '1px'
     });
-    if(param.invade_content == '') {
+    if(param.invade_content) {
         if(
             $j("#content").length > 0 && 
@@ -131 +131 @@
 window.onload = function() {
     var $j = jQuery.noConflict();
+    param.max_density = +param.max_density; // unary plus to convert string to int
+    param.min_density = +param.min_density;
+    param.nb_spiders = +param.nb_spiders;
+    param.invade_content = Boolean(param.invade_content);
     var surface = $j('body').height()*$j('body').width();
     var densityMax = Math.floor(surface/param.max_density);
     var densityMin = Math.floor(surface/param.min_density);
     var nbSpiders = param.nb_spiders > densityMax ? (densityMax < 1 ? 1 : densityMax) : Math.floor(param.nb_spiders);
-    nbSpiders = nbSpiders < densityMin ? densityMin : nbSpiders;
+    nbSpiders = (nbSpiders != 0 && nbSpiders < densityMin) ? densityMin : nbSpiders;
     for(i=0;i<nbSpiders;++i) {
         setTimeout(function() {

spider-invasion/trunk/js/spider-invasion.min.js

@@ -1 @@
-function getRandomPosition(e){var t=jQuery.noConflict();var n=t("body").height()-e.height();var r=t("body").width()-e.width();var i=Math.floor(Math.random()*n);var s=Math.floor(Math.random()*r);return[i,s]}function runSpawnAnimation(e){e.animate({width:"35px",height:"21px",marginLeft:"-15",marginTop:"-7"},400,function(){e.animate({width:"50px",height:"30px",marginLeft:"-21",marginTop:"-10"},50,function(){e.shake()})})}function spawnSpider(){var e=jQuery.noConflict();var t=param.images_dir+"/cute-spider-"+(Math.floor(Math.random()*3)+1)+".png";var n=e("<img/>").css({position:"absolute",opacity:.5,width:"50px",height:"30px","z-index":100}).addClass("spider-invader").attr("src",t).appendTo("body").hide();var r=getRandomPosition(n);r[1]+=10;n.css({width:"1px",height:"1px"});if(param.invade_content==""){if(e("#content").length>0&&r[1]>e("#content").offset().left-n.height()&&r[1]<e("#content").offset().left+e("#content").width()&&r[0]>e("#content").offset().top&&r[0]<e("#content").offset().top+e("#content").height())return}n.css({top:r[0]+"px",left:r[1]+"px"});n.show();runSpawnAnimation(n);var i=305;var s=r[1]-100+i;var o=r[1]-100;var u=e("<div/>").css({position:"absolute",top:r[0]-140+"px",left:r[1]-150+"px",opacity:.5,width:(s>e("body").width()?e("body").width()-o:i)+"px",height:"275px","z-index":50,overflow:"hidden"}).addClass("spider-danger-zone").appendTo("body").data("spider",n)}function spawnSpidersAtRandomIntervals(e){var t=jQuery.noConflict();spawnSpider();++e;if(t("body").height()*t("body").width()/(500*500)<e)return;setTimeout(function(){spawnSpidersAtRandomIntervals(e)},Math.floor(Math.random()*6e4)+5e3)}function zigzagDefense(e){if(e.position().top<-50)return;e.animate({left:"+=13",top:"-=25"},30,"linear").animate({left:"-=13",top:"-=25"},30,"linear",function(){zigzagDefense(e)})}(function(e){e.fn.shake=function(t){var n={shakes:4,distance:3,duration:200};if(t){e.extend(n,t)}var r;return this.each(function(){$this=e(this);r=$this.css("position");var t=0;if(!r||r==="static"){$this.css("position","relative")}else if(r==="absolute"){t=$this.position().left}for(var i=1;i<=n.shakes;i++){$this.animate({left:t+n.distance*-1},n.duration/n.shakes/4).animate({left:t+n.distance},n.duration/n.shakes/2).animate({left:t+0},n.duration/n.shakes/4)}})}})(jQuery);window.onload=function(){var e=jQuery.noConflict();var t=e("body").height()*e("body").width();var n=Math.floor(t/param.max_density);var r=Math.floor(t/param.min_density);var s=param.nb_spiders>n?n<1?1:n:Math.floor(param.nb_spiders);s=s<r?r:s;for(i=0;i<s;++i){setTimeout(function(){spawnSpider()},Math.floor(Math.random()*400)+10)}setTimeout(function(){spawnSpidersAtRandomIntervals(s)},Math.floor(Math.random()*6e4)+5e3);e("body").on("mouseover",".spider-danger-zone",function(){zigzagDefense(e(this).data("spider"))}).on("click",".spider-invader",function(){zigzagDefense(e(this))})}
+function getRandomPosition(e){var t=jQuery.noConflict();var n=t("body").height()-e.height();var r=t("body").width()-e.width();var i=Math.floor(Math.random()*n);var s=Math.floor(Math.random()*r);return[i,s]}function runSpawnAnimation(e){e.animate({width:"35px",height:"21px",marginLeft:"-15",marginTop:"-7"},400,function(){e.animate({width:"50px",height:"30px",marginLeft:"-21",marginTop:"-10"},50,function(){e.shake()})})}function spawnSpider(){var e=jQuery.noConflict();var t=param.images_dir+"/cute-spider-"+(Math.floor(Math.random()*3)+1)+".png";var n=e("<img/>").css({position:"absolute",opacity:.5,width:"50px",height:"30px","z-index":100}).addClass("spider-invader").attr("src",t).appendTo("body").hide();var r=getRandomPosition(n);r[1]+=10;n.css({width:"1px",height:"1px"});if(param.invade_content){if(e("#content").length>0&&r[1]>e("#content").offset().left-n.height()&&r[1]<e("#content").offset().left+e("#content").width()&&r[0]>e("#content").offset().top&&r[0]<e("#content").offset().top+e("#content").height())return}n.css({top:r[0]+"px",left:r[1]+"px"});n.show();runSpawnAnimation(n);var i=305;var s=r[1]-100+i;var o=r[1]-100;var u=e("<div/>").css({position:"absolute",top:r[0]-140+"px",left:r[1]-150+"px",opacity:.5,width:(s>e("body").width()?e("body").width()-o:i)+"px",height:"275px","z-index":50,overflow:"hidden"}).addClass("spider-danger-zone").appendTo("body").data("spider",n)}function spawnSpidersAtRandomIntervals(e){var t=jQuery.noConflict();spawnSpider();++e;if(t("body").height()*t("body").width()/(500*500)<e)return;setTimeout(function(){spawnSpidersAtRandomIntervals(e)},Math.floor(Math.random()*6e4)+5e3)}function zigzagDefense(e){if(e.position().top<-50)return;e.animate({left:"+=13",top:"-=25"},30,"linear").animate({left:"-=13",top:"-=25"},30,"linear",function(){zigzagDefense(e)})}(function(e){e.fn.shake=function(t){var n={shakes:4,distance:3,duration:200};if(t){e.extend(n,t)}var r;return this.each(function(){$this=e(this);r=$this.css("position");var t=0;if(!r||r==="static"){$this.css("position","relative")}else if(r==="absolute"){t=$this.position().left}for(var i=1;i<=n.shakes;i++){$this.animate({left:t+n.distance*-1},n.duration/n.shakes/4).animate({left:t+n.distance},n.duration/n.shakes/2).animate({left:t+0},n.duration/n.shakes/4)}})}})(jQuery);window.onload=function(){var e=jQuery.noConflict();param.max_density=+param.max_density;param.min_density=+param.min_density;param.nb_spiders=+param.nb_spiders;param.invade_content=Boolean(param.invade_content);var t=e("body").height()*e("body").width();var n=Math.floor(t/param.max_density);var r=Math.floor(t/param.min_density);var s=param.nb_spiders>n?n<1?1:n:Math.floor(param.nb_spiders);s=s!=0&&s<r?r:s;for(i=0;i<s;++i){setTimeout(function(){spawnSpider()},Math.floor(Math.random()*400)+10)}setTimeout(function(){spawnSpidersAtRandomIntervals(s)},Math.floor(Math.random()*6e4)+5e3);e("body").on("mouseover",".spider-danger-zone",function(){zigzagDefense(e(this).data("spider"))}).on("click",".spider-invader",function(){zigzagDefense(e(this))})}

spider-invasion/trunk/readme.txt

@@ -28 +28 @@
 == Changelog ==
 
+= 0.5 =
+* spiders only in blog entries
+* JS fix
+
 = 0.4 =
 * using jquery to fix position related bugs

spider-invasion/trunk/spider-invasion.php

@@ -2 +2 @@
 /*
 Plugin Name: Spider Invasion!
-Version: 0.4
+Version: 0.5
 Plugin URI: http://www.mendoweb.be/blog/wordpress-plugin-spider-invasion/
 Description: Spiders invade your oldest posts. The older the post, the more spiders you get.
@@ -55 +55 @@
 
 function spider_invasion_js() {
-    if( !is_single() && !is_archive() ) return;
+    if( 'post' != get_post_type() ) return;
     $date_post = get_the_date( 'Ymd' );
     if( empty( $date_post ) ) return;