More control with callbacks for behaviors

+ You can now extend callbacks without having to basically replicate the entire '_loadcallback' function + Added cufon behavior + Modified manual-trigger behavior + Updated Masonry behavior
AnthonyDiSanti · Jun 29, 2011 · 76a5d98 · 76a5d98
1 parent 642a069
commit 76a5d98
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 77 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+
+infinte-scroll.tmproj
diff --git a/behaviors/cufon.js b/behaviors/cufon.js
@@ -0,0 +1,21 @@
+/*
+	--------------------------------
+	Infinite Scroll Behavior
+	Cufon Refresh
+	--------------------------------
+	+ https://github.com/paulirish/infinitescroll/
+	+ version 2.0b2.110617
+	+ Copyright 2011 Paul Irish & Luke Shumard
+	+ Licensed under the MIT license
+	
+	+ Documentation: http://infinite-scroll.com/
+	
+*/
+
+$.extend($.infinitescroll.prototype,{
+
+	_callback_cufon: function infscr_callback_cufon(newElements) {
+		Cufon.refresh(newElements);
+	}
+
+});
diff --git a/behaviors/manual-trigger.js b/behaviors/manual-trigger.js
@@ -25,6 +25,15 @@ $.extend($.infinitescroll.prototype,{
 				instance.retrieve();
 			}
 		});
+
+		// Define loadingStart to never hide pager
+		instance.options.loadingStart = function (opts) {
+			opts.loadingMsg
+				.appendTo(opts.loadMsgSelector)
+				.show(opts.loadingMsgRevealSpeed, function () {
+                	beginAjax(opts);
+            });
+		}
 	}
 
 });
diff --git a/behaviors/masonry-isotope.js b/behaviors/masonry-isotope.js
@@ -14,72 +14,8 @@
 
 $.extend($.infinitescroll.prototype,{
 
-	_setup_masonry: function infscr_setup_masonry () {
-
-		var opts = this.options,
-			instance = this;
-
-		this._binding('bind');
-
-	},
-
-	_loadcallback_masonry: function infscr_loadcallback_masonry (box,data) {
-
-		var opts = this.options,
-    		callback = this.options.callback,
-    		result = (opts.isDone) ? 'done' : 'append',
-    		frag;
-
-        switch (result) {
-
-            case 'done':
-
-                this._showdonemsg();
-                return false;
-
-                break;
-
-            case 'append':
-
-                var children = box.children();
-
-                // if it didn't return anything
-                if (children.length == 0) {
-                    return this._error('end');
-                }
-
-
-                // use a documentFragment because it works when content is going into a table or UL
-                frag = document.createDocumentFragment();
-                while (box[0].firstChild) {
-                    frag.appendChild(box[0].firstChild);
-                }
-
-                this._debug('contentSelector', $(opts.contentSelector)[0])
-
-				// instead of the standard append, we use masonry's appended method
-				$(opts.contentSelector)[0].masonry('appended',frag);
-
-                data = children.get();
-
-
-                break;
-
-        }
-
-        // loadingEnd function
-		opts.loadingEnd.call($(opts.contentSelector)[0],opts)
-
-
-        // smooth scroll to ease in the new content
-        if (opts.animate) {
-            var scrollTo = $(window).scrollTop() + $('#infscr-loading').height() + opts.extraScrollPx + 'px';
-            $('html,body').animate({ scrollTop: scrollTo }, 800, function () { opts.isDuringAjax = false; });
-        }
-
-        if (!opts.animate) opts.isDuringAjax = false; // once the call is done, we can allow it again.
-
-        callback.call($(opts.contentSelector)[0], data);
+	_callback_masonry: function infscr_callback_masonry (newElements) {
+		$(this).masonry('appended',$(newElements));
 	}
 
 });
diff --git a/jquery.infinitescroll.js b/jquery.infinitescroll.js
@@ -151,7 +151,14 @@
 			};
 
             // callback loading
-            opts.callback = opts.callback || callback || function () { };
+            opts.callback = function(instance,data) {
+				if (!!opts.behavior && instance['_callback_'+opts.behavior] !== undefined) {
+					instance['_callback_'+opts.behavior].call($(opts.contentSelector)[0], data);
+				}
+				if (callback) {
+					callback.call($(opts.contentSelector)[0], data);
+				}
+			};
 
             this._setup();
 
@@ -317,7 +324,7 @@
 
             if (!opts.animate) opts.isDuringAjax = false; // once the call is done, we can allow it again.
 
-            callback.call($(opts.contentSelector)[0], data);
+            callback(this,data);
 
         },
 

diff --git a/test/index.html b/test/index.html
@@ -83,15 +83,6 @@ <h1>Infinite Scroll Testing</h1>
 		dataType	 	: 'html',
 		// behavior		: 'twitter',
 		// loadMore		: '#next',
-		/*
-		loadingStart	: function (opts) {
-			opts.loadingMsg
-				.appendTo(opts.loadMsgSelector)
-				.show(opts.loadingMsgRevealSpeed, function () {
-                	beginAjax(opts);
-            });
-		}
-		*/
 		// appendCallback	: false, // USE FOR PREPENDING
 		// pathParse     	: function( pathStr, nextPage ){ return pathStr.replace('2', nextPage ); }
     }, function(newElements){