Changeset 498198

Timestamp:

01/31/2012 10:09:09 PM (14 years ago)

Author:

Beaver6813

Message:

• Fixed loading image alignment issue.
• Removed manual-trigger.js debug lines (caused conflicts).

Location:

infinite-scroll/branches/Beta

Files:

• includes/infinite-scroll.class.php (modified) (2 diffs)
• js/behaviors/manual-trigger.js (modified) (1 diff)
• js/behaviors/manual-trigger.min.js (modified) (1 diff)

infinite-scroll/branches/Beta/includes/infinite-scroll.class.php

@@ -103 +103 @@
 public static function addStyle()
     {
-    switch(get_option('infscr_image_align'))
-        {
-        default:
-        case 0:
-            $align = "left";
-        break;
+    $options = get_option('infscr_options');
+    switch($options['infscr_image_align'])
+        {
         case 1:
             $align = "center";
@@ -115 +112 @@
             $align = "right";
         break;
+        default:
+        case 0:
+            $align = "left";
+        break;
         }
     echo "<!-- Infinite-Scroll Style -->
     <style type=\"text/css\">
-     #infscr-loading img { text-align: $align; }
+     #infscr-loading { text-align: $align; }
     </style>\r\n";
     return true;    

infinite-scroll/branches/Beta/js/behaviors/manual-trigger.js

@@ -79 +79 @@
         var opts = this.options,
             instance = this;
-        this._debug("Binding Manual Trigger..")
         // Bind nextSelector link to retrieve
         jQuery(opts.nextSelector).click(function(e) {
-            this._debug("Manual Trigger Clicked..")
             if (e.which == 1 && !e.metaKey && !e.shiftKey) {
                 e.preventDefault();

infinite-scroll/branches/Beta/js/behaviors/manual-trigger.min.js

@@ -1 @@
-jQuery.extend(jQuery.infinitescroll.prototype,{_loadcallback_twitter:function a(a,b){var c=this.options,d=this.options.callback,e=c.state.isDone?"done":!c.appendCallback?"no-append":"append",f;switch(e){case"done":this._showdonemsg();return false;break;case"no-append":if(c.dataType=="html"){b="<div>"+b+"</div>";b=$(b).find(c.itemSelector)}break;case"append":var g=a.children();if(g.length==0){return this._error("end")}f=document.createDocumentFragment();while(a[0].firstChild){f.appendChild(a[0].firstChild)}this._debug("contentSelector",jQuery(c.contentSelector)[0]);jQuery(c.itemSelector).filter(":last").after(f);b=g.get();break}c.loading.finished.call(jQuery(c.contentSelector)[0],c);if(c.animate){var h=jQuery(window).scrollTop()+jQuery("#infscr-loading").height()+c.extraScrollPx+"px";jQuery("html,body").animate({scrollTop:h},800,function(){c.state.isDuringAjax=false})}if(!c.animate)c.state.isDuringAjax=false;d(this,b)},_setup_twitter:function b(){var a=this.options,b=this;this._debug("Binding Manual Trigger..");jQuery(a.nextSelector).click(function(a){this._debug("Manual Trigger Clicked..");if(a.which==1&&!a.metaKey&&!a.shiftKey){a.preventDefault();b.retrieve()}});b.options.loading.start=function(a){a.loading.msg.appendTo(a.loading.selector).show(a.loading.speed,function(){beginAjax(a)})}}});
+jQuery.extend(jQuery.infinitescroll.prototype,{_loadcallback_twitter:function a(a,b){var c=this.options,d=this.options.callback,e=c.state.isDone?"done":!c.appendCallback?"no-append":"append",f;switch(e){case"done":this._showdonemsg();return false;break;case"no-append":if(c.dataType=="html"){b="<div>"+b+"</div>";b=$(b).find(c.itemSelector)}break;case"append":var g=a.children();if(g.length==0){return this._error("end")}f=document.createDocumentFragment();while(a[0].firstChild){f.appendChild(a[0].firstChild)}this._debug("contentSelector",jQuery(c.contentSelector)[0]);jQuery(c.itemSelector).filter(":last").after(f);b=g.get();break}c.loading.finished.call(jQuery(c.contentSelector)[0],c);if(c.animate){var h=jQuery(window).scrollTop()+jQuery("#infscr-loading").height()+c.extraScrollPx+"px";jQuery("html,body").animate({scrollTop:h},800,function(){c.state.isDuringAjax=false})}if(!c.animate)c.state.isDuringAjax=false;d(this,b)},_setup_twitter:function b(){var a=this.options,b=this;jQuery(a.nextSelector).click(function(a){if(a.which==1&&!a.metaKey&&!a.shiftKey){a.preventDefault();b.retrieve()}});b.options.loading.start=function(a){a.loading.msg.appendTo(a.loading.selector).show(a.loading.speed,function(){beginAjax(a)})}}});