Issue #271 Added support for existing behaviors

metafizzy · Dec 5, 2012 · c950fb6 · c950fb6
1 parent faba1b3
commit c950fb6
Show file tree

Hide file tree

Showing 11 changed files with 173 additions and 126 deletions.
diff --git a/behaviors/cufon.js b/behaviors/cufon.js
@@ -11,11 +11,10 @@
 	+ Documentation: http://infinite-scroll.com/
 	
 */
-
-$.extend($.infinitescroll.prototype,{
-
-	_callback_cufon: function infscr_callback_cufon(newElements) {
-		Cufon.refresh(newElements);
-	}
-
-});
+(function ($, undefined) {
+	$.extend($.infinitescroll.prototype,{
+		_callback_cufon: function infscr_callback_cufon(newElements) {
+			Cufon.refresh(newElements);
+		}
+	});
+})(jQuery);
diff --git a/behaviors/manual-trigger.js b/behaviors/manual-trigger.js
@@ -12,48 +12,50 @@
 	
 */
 
-$.extend($.infinitescroll.prototype,{
-
-	_setup_twitter: function infscr_setup_twitter () {
-		var opts = this.options,
-			instance = this;
-
-		// Bind nextSelector link to retrieve
-		$(opts.nextSelector).click(function(e) {
-			if (e.which == 1 && !e.metaKey && !e.shiftKey) {
-				e.preventDefault();
-				instance.retrieve();
+(function($, undefined) {
+	$.extend($.infinitescroll.prototype,{
+
+		_setup_twitter: function infscr_setup_twitter () {
+			var opts = this.options,
+				instance = this;
+
+			// Bind nextSelector link to retrieve
+			$(opts.nextSelector).click(function(e) {
+				if (e.which == 1 && !e.metaKey && !e.shiftKey) {
+					e.preventDefault();
+					instance.retrieve();
+				}
+			});
+
+			// Define loadingStart to never hide pager
+			instance.options.loading.start = function (opts) {
+				opts.loading.msg
+					.appendTo(opts.loading.selector)
+					.show(opts.loading.speed, function () {
+						instance.beginAjax(opts);
+					});
 			}
-		});
-
-		// Define loadingStart to never hide pager
-		instance.options.loading.start = function (opts) {
+		},
+		_showdonemsg_twitter: function infscr_showdonemsg_twitter () {
+			var opts = this.options,
+				instance = this;
+
+			//Do all the usual stuff
 			opts.loading.msg
-				.appendTo(opts.loading.selector)
-				.show(opts.loading.speed, function () {
-                	instance.beginAjax(opts);
-            });
+				.find('img')
+				.hide()
+				.parent()
+				.find('div').html(opts.loading.finishedMsg).animate({ opacity: 1 }, 2000, function () {
+					$(this).parent().fadeOut('normal');
+				});
+
+			//And also hide the navSelector
+			$(opts.navSelector).fadeOut('normal');
+
+			// user provided callback when done
+			opts.errorCallback.call($(opts.contentSelector)[0],'done');
+
 		}
-	},
-	_showdonemsg_twitter: function infscr_showdonemsg_twitter () {
-		var opts = this.options,
-			instance = this;
-
-		//Do all the usual stuff
-		opts.loading.msg
-            .find('img')
-            .hide()
-            .parent()
-            .find('div').html(opts.loading.finishedMsg).animate({ opacity: 1 }, 2000, function () {
-                $(this).parent().fadeOut('normal');
-            });
-
-		//And also hide the navSelector
-		 $(opts.navSelector).fadeOut('normal');
-
-		// user provided callback when done    
-		opts.errorCallback.call($(opts.contentSelector)[0],'done');
-
-	}
-
-});
+
+	});
+})(jQuery);
diff --git a/behaviors/masonry-isotope.js b/behaviors/masonry-isotope.js
@@ -12,10 +12,10 @@
 	
 */
 
-$.extend($.infinitescroll.prototype,{
-
-	_callback_masonry: function infscr_callback_masonry (newElements) {
-		$(this).masonry('appended',$(newElements));
-	}
-
-});
+(function($, undefined) {
+	$.extend($.infinitescroll.prototype,{
+		_callback_masonry: function infscr_callback_masonry (newElements) {
+			$(this).masonry('appended',$(newElements));
+		}
+	});
+})(jQuery);
diff --git a/behaviors/sausage.js b/behaviors/sausage.js
@@ -12,8 +12,8 @@
 	
 */
 
-$.extend($.infinitescroll.prototype,{
-
-
-
-});
+(function($, undefined) {
+	$.extend($.infinitescroll.prototype,{
+		// TODO: Implement
+	});
+})(jQuery);
diff --git a/wordpress-plugin/behaviors/cufon.js b/wordpress-plugin/behaviors/cufon.js
@@ -11,11 +11,10 @@
 	+ Documentation: http://infinite-scroll.com/
 	
 */
-
-$.extend($.infinitescroll.prototype,{
-
-	_callback_cufon: function infscr_callback_cufon(newElements) {
-		Cufon.refresh(newElements);
-	}
-
-});
+(function ($, undefined) {
+	$.extend($.infinitescroll.prototype,{
+		_callback_cufon: function infscr_callback_cufon(newElements) {
+			Cufon.refresh(newElements);
+		}
+	});
+})(jQuery);
diff --git a/wordpress-plugin/behaviors/manual-trigger.js b/wordpress-plugin/behaviors/manual-trigger.js
@@ -12,48 +12,50 @@
 	
 */
 
-$.extend($.infinitescroll.prototype,{
-
-	_setup_twitter: function infscr_setup_twitter () {
-		var opts = this.options,
-			instance = this;
-
-		// Bind nextSelector link to retrieve
-		$(opts.nextSelector).click(function(e) {
-			if (e.which == 1 && !e.metaKey && !e.shiftKey) {
-				e.preventDefault();
-				instance.retrieve();
+(function($, undefined) {
+	$.extend($.infinitescroll.prototype,{
+
+		_setup_twitter: function infscr_setup_twitter () {
+			var opts = this.options,
+				instance = this;
+
+			// Bind nextSelector link to retrieve
+			$(opts.nextSelector).click(function(e) {
+				if (e.which == 1 && !e.metaKey && !e.shiftKey) {
+					e.preventDefault();
+					instance.retrieve();
+				}
+			});
+
+			// Define loadingStart to never hide pager
+			instance.options.loading.start = function (opts) {
+				opts.loading.msg
+					.appendTo(opts.loading.selector)
+					.show(opts.loading.speed, function () {
+						instance.beginAjax(opts);
+					});
 			}
-		});
-
-		// Define loadingStart to never hide pager
-		instance.options.loading.start = function (opts) {
+		},
+		_showdonemsg_twitter: function infscr_showdonemsg_twitter () {
+			var opts = this.options,
+				instance = this;
+
+			//Do all the usual stuff
 			opts.loading.msg
-				.appendTo(opts.loading.selector)
-				.show(opts.loading.speed, function () {
-                	instance.beginAjax(opts);
-            });
+				.find('img')
+				.hide()
+				.parent()
+				.find('div').html(opts.loading.finishedMsg).animate({ opacity: 1 }, 2000, function () {
+					$(this).parent().fadeOut('normal');
+				});
+
+			//And also hide the navSelector
+			$(opts.navSelector).fadeOut('normal');
+
+			// user provided callback when done
+			opts.errorCallback.call($(opts.contentSelector)[0],'done');
+
 		}
-	},
-	_showdonemsg_twitter: function infscr_showdonemsg_twitter () {
-		var opts = this.options,
-			instance = this;
-
-		//Do all the usual stuff
-		opts.loading.msg
-            .find('img')
-            .hide()
-            .parent()
-            .find('div').html(opts.loading.finishedMsg).animate({ opacity: 1 }, 2000, function () {
-                $(this).parent().fadeOut('normal');
-            });
-
-		//And also hide the navSelector
-		 $(opts.navSelector).fadeOut('normal');
-
-		// user provided callback when done    
-		opts.errorCallback.call($(opts.contentSelector)[0],'done');
-
-	}
-
-});
+
+	});
+})(jQuery);
diff --git a/wordpress-plugin/behaviors/masonry-isotope.js b/wordpress-plugin/behaviors/masonry-isotope.js
@@ -12,10 +12,10 @@
 	
 */
 
-$.extend($.infinitescroll.prototype,{
-
-	_callback_masonry: function infscr_callback_masonry (newElements) {
-		$(this).masonry('appended',$(newElements));
-	}
-
-});
+(function($, undefined) {
+	$.extend($.infinitescroll.prototype,{
+		_callback_masonry: function infscr_callback_masonry (newElements) {
+			$(this).masonry('appended',$(newElements));
+		}
+	});
+})(jQuery);
diff --git a/wordpress-plugin/behaviors/sausage.js b/wordpress-plugin/behaviors/sausage.js
@@ -12,8 +12,8 @@
 	
 */
 
-$.extend($.infinitescroll.prototype,{
-
-
-
-});
+(function($, undefined) {
+	$.extend($.infinitescroll.prototype,{
+		// TODO: Implement
+	});
+})(jQuery);
diff --git a/wordpress-plugin/infinite-scroll.php b/wordpress-plugin/infinite-scroll.php
@@ -117,11 +117,26 @@ function enqueue_js() {
 		$suffix = ( WP_DEBUG ) ? '.dev' : '';
 
 		$file = "/js/front-end/jquery.infinitescroll{$suffix}.js";
-
 		wp_enqueue_script( $this->slug, plugins_url( $file, __FILE__ ), array( 'jquery' ), $this->version, true );
 
 		$options = apply_filters( $this->prefix . 'js_options', $this->options->get_options() );
 		wp_localize_script( $this->slug, $this->slug_, $options );
+
+		// Output a behavior script if needed
+		if ($options["behavior"]) {
+			$scripts["twitter"] = "manual-trigger.js";
+			$scripts["local"] = "local.js";
+			$scripts["cufon"] = "cufon.js";
+			$scripts["masonry"] = "masonry-isotope.js";
+
+			$behaviorFile = $scripts[$options["behavior"]];
+
+			if ($behaviorFile) {
+				$behaviorFile = "/behaviors/" . $behaviorFile;
+				wp_enqueue_script($this->slug . "-behavior", plugins_url($behaviorFile, __FILE__),
+					array("jquery", $this->slug), $this->version, true);
+			}
+		}
 	}
 
 	/**

diff --git a/wordpress-plugin/languages/infinite-scroll.pot b/wordpress-plugin/languages/infinite-scroll.pot
@@ -150,7 +150,11 @@ msgstr ""
 msgid "URL of existing or uploaded image to display as new posts are retrieved"
 msgstr ""
 
-#:templates/options.php
+#: templates/options.php
+mgsid "Behavior"
+msgstr ""
+
+#: templates/options.php
 mgsid "Debug"
 msgstr ""
 

diff --git a/wordpress-plugin/templates/options.php b/wordpress-plugin/templates/options.php
@@ -97,6 +97,32 @@
 			<span class="description"><?php _e( 'URL of existing or uploaded image to display as new posts are retrieved', 'infinite-scroll' ); ?></span>
 		</td>
 	</tr>
+	<tr valign="top">
+		<th scope="row">
+			<?php _e("Behavior", "infinite-scroll") ?>
+		</th>
+		<td>
+
+<?php
+$behavior = $this->parent->options->behavior;
+
+function isBehavior($value, $behavior) {
+	if ($value === $behavior) {
+		print("selected=\"selected\"");
+	}
+}
+
+?>
+
+			<select id="infinite_scroll[behavior]" name="infinite_scroll[behavior]">
+				<option <?php isBehavior("", $behavior); ?> value="">Default</option>
+				<option <?php isBehavior("twitter", $behavior); ?> value="twitter">Manual Trigger</option>
+				<option <?php isBehavior("local", $behavior); ?> value="local">Local</option>
+				<option <?php isBehavior("cufon", $behavior); ?> value="cufon">Cufon</option>
+				<option <?php isBehavior("masonry", $behavior); ?> value="masonry">Masonry/Isotope</option>
+			</select>
+		</td>
+	</tr>
 	<tr valign="top">
 		<th scope="row">
 			<?php _e("Debug", "infinite-scroll") ?>