Merge pull request #664 from ExactTarget/infinite-scroll-method-bug

3.0.2-wip: fix for issue #651 - infinitescroll plugin definition searche...
ExactTarget · Sep 12, 2014 · c8ac984 · c8ac984
2 parents b13b00f + 5797bfd
commit c8ac984
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dist/fuelux.zip b/dist/fuelux.zip
diff --git a/dist/js/fuelux.js b/dist/js/fuelux.js
@@ -1153,10 +1153,10 @@
 
 			var $set = this.each( function() {
 				var $this = $( this );
-				var data = $this.data( 'datepicker' );
+				var data = $this.data( 'fu.datepicker' );
 				var options = typeof option === 'object' && option;
 
-				if ( !data ) $this.data( 'datepicker', ( data = new Datepicker( this, options ) ) );
+				if ( !data ) $this.data( 'fu.datepicker', ( data = new Datepicker( this, options ) ) );
 				if ( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 			} );
 
@@ -3695,7 +3695,7 @@
 
 			var $set = this.each( function() {
 				var $this = $( this );
-				var data = $this.data( 'infinitescroll' );
+				var data = $this.data( 'fu.infinitescroll' );
 				var options = typeof option === 'object' && option;
 
 				if ( !data ) $this.data( 'fu.infinitescroll', ( data = new InfiniteScroll( this, options ) ) );

diff --git a/dist/js/fuelux.min.js b/dist/js/fuelux.min.js
diff --git a/js/datepicker.js b/js/datepicker.js
@@ -627,10 +627,10 @@
 
 		var $set = this.each(function () {
 			var $this   = $( this );
-			var data    = $this.data( 'datepicker' );
+			var data    = $this.data( 'fu.datepicker' );
 			var options = typeof option === 'object' && option;
 
-			if( !data ) $this.data('datepicker', (data = new Datepicker( this, options ) ) );
+			if( !data ) $this.data('fu.datepicker', (data = new Datepicker( this, options ) ) );
 			if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 		});
 

diff --git a/js/infinite-scroll.js b/js/infinite-scroll.js
@@ -142,7 +142,7 @@
 
 		var $set = this.each(function () {
 			var $this   = $( this );
-			var data    = $this.data('infinitescroll');
+			var data    = $this.data('fu.infinitescroll');
 			var options = typeof option === 'object' && option;
 
 			if( !data ) $this.data('fu.infinitescroll', (data = new InfiniteScroll( this, options ) ) );