Merge remote branch 'origin/master'

dcrec1 · Jun 27, 2011 · ca82aa8 · ca82aa8
2 parents f5b7f26 + 787b76a
commit ca82aa8
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/jquery.infinitescroll.js b/jquery.infinitescroll.js
@@ -418,7 +418,7 @@
 
         },
 
-        // grab each selector option and see if any fail
+		// grab each selector option and see if any fail
         _validate: function infscr_validate(opts) {
 
             for (var key in opts) {
@@ -560,6 +560,13 @@
 		// Unbind from scroll
 		unbind: function infscr_unbind() {
 			this._binding('unbind');
+		},
+
+		// update options
+		update: function infscr_options(key) {
+			if ($.isPlainObject(key)) {
+				this.options = $.extend(true,this.options,key);
+			}
 		}
 
     }
@@ -625,8 +632,8 @@
 
                     if (instance) {
 
-                        // go for it
-                        // instance._update(options);
+                        // update options of current instance
+                        instance.update(options);
 
                     } else {