fuelux-rails 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b394ec2968caffe8b18d7223cabed066be8e6d
-  data.tar.gz: 0ced4a787887051466ea986e11789f6d659fa1ab
+  metadata.gz: 55cb9d61718671c8347063ea1b77cfe807b52b9e
+  data.tar.gz: f4e56823b6aa283c6c13f3117f6a58b1669e76f4
 SHA512:
-  metadata.gz: 4f2f96746d016ed70d0bc551245351cdc09a6bed2322ae3ca78a421c490bde4279b58514f31b1c86faee5eb1cdf6f4e5df691c103611a6159842766aabff78b2
-  data.tar.gz: 53cd6334e97d12e9131733645a1557be9d11038beae946f9fe3aecb38e95f9dd28d92752876db6cf474b414192a60ddd4b7fb629bb7cbe9b69d416bca8702e99
+  metadata.gz: 0c6c599ad21f11c6a517f076aa9dcddfca793c84693a38908697eecc984099f3423c34178f13fa9db1b21bf65e03f1eb42fedff51afb6dd06cde4dfb2624a3e8
+  data.tar.gz: f795d828313bdef5c100b68659033dde2c2efdf048b54c8f989561fae3be9c483b62a496c64a754138f7351b8d664be89af38594c1fbdca83f6ff54a730007f7

data/lib/fuelux-rails/version.rb

@@ -1,3 +1,3 @@
 module FueluxRails
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

data/vendor/assets/javascripts/fuelux/checkbox.js

@@ -9,7 +9,7 @@
 !function ($) {
 
 
-
+	var old = $.fn.checkbox;
 
 	// CHECKBOX CONSTRUCTOR AND PROTOTYPE
 
@@ -89,25 +89,31 @@
 
 	// CHECKBOX PLUGIN DEFINITION
 
-	$.fn.checkbox = function (option, value) {
+	$.fn.checkbox = function (option) {
+		var args = Array.prototype.slice.call( arguments, 1 );
 		var methodReturn;
 
 		var $set = this.each(function () {
-			var $this = $(this);
-			var data = $this.data('checkbox');
+			var $this   = $( this );
+			var data    = $this.data('checkbox');
 			var options = typeof option === 'object' && option;
 
-			if (!data) $this.data('checkbox', (data = new Checkbox(this, options)));
-			if (typeof option === 'string') methodReturn = data[option](value);
+			if( !data ) $this.data('checkbox', (data = new Checkbox(this, options)));
+			if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 		});
 
-		return (methodReturn === undefined) ? $set : methodReturn;
+		return ( methodReturn === undefined ) ? $set : methodReturn;
 	};
 
 	$.fn.checkbox.defaults = {};
 
 	$.fn.checkbox.Constructor = Checkbox;
 
+	$.fn.checkbox.noConflict = function () {
+		$.fn.checkbox = old;
+		return this;
+	};
+
 
 	// CHECKBOX DATA-API
 
@@ -121,5 +127,4 @@
 			});
 		});
 	});
-
 }(window.jQuery);

data/vendor/assets/javascripts/fuelux/combobox.js

@@ -9,6 +9,7 @@
 !function ($) {
 
 
+	var old = $.fn.combobox;
 
 
 	// COMBOBOX CONSTRUCTOR AND PROTOTYPE
@@ -136,30 +137,35 @@
 
 	// COMBOBOX PLUGIN DEFINITION
 
-	$.fn.combobox = function (option, value) {
+	$.fn.combobox = function (option) {
+		var args = Array.prototype.slice.call( arguments, 1 );
 		var methodReturn;
 
 		var $set = this.each(function () {
-			var $this = $(this);
-			var data = $this.data('combobox');
+			var $this   = $( this );
+			var data    = $this.data( 'combobox' );
 			var options = typeof option === 'object' && option;
 
-			if (!data) $this.data('combobox', (data = new Combobox(this, options)));
-			if (typeof option === 'string') methodReturn = data[option](value);
+			if( !data ) $this.data('combobox', (data = new Combobox( this, options ) ) );
+			if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 		});
 
-		return (methodReturn === undefined) ? $set : methodReturn;
+		return ( methodReturn === undefined ) ? $set : methodReturn;
 	};
 
 	$.fn.combobox.defaults = {};
 
 	$.fn.combobox.Constructor = Combobox;
 
+	$.fn.combobox.noConflict = function () {
+		$.fn.combobox = old;
+		return this;
+	};
+
 
 	// COMBOBOX DATA-API
 
 	$(function () {
-
 		$(window).on('load', function () {
 			$('.combobox').each(function () {
 				var $this = $(this);
@@ -174,5 +180,4 @@
 			$this.combobox($this.data());
 		});
 	});
-
 }(window.jQuery);

data/vendor/assets/javascripts/fuelux/datagrid.js

@@ -9,6 +9,7 @@
 !function ($) {
 
 
+	var old = $.fn.datagrid;
 
 	// Relates to thead .sorted styles in datagrid.less
 	var SORTED_HEADER_OFFSET = 22;
@@ -85,7 +86,7 @@
 		constructor: Datagrid,
 
 		renderColumns: function () {
-			var self = this;
+			var $target;
 
 			this.$footer.attr('colspan', this.columns.length);
 			this.$topheader.attr('colspan', this.columns.length);
@@ -98,7 +99,12 @@
 				colHTML += '>' + column.label + '</th>';
 			});
 
-			self.$colheader.append(colHTML);
+			this.$colheader.append(colHTML);
+
+			if (this.options.dataOptions.sortProperty) {
+				$target = this.$colheader.children('th[data-property="' + this.options.dataOptions.sortProperty + '"]');
+				this.updateColumns($target, this.options.dataOptions.sortDirection);
+			}
 		},
 
 		updateColumns: function ($target, direction) {
@@ -147,6 +153,18 @@
 			this.$tbody.html(this.placeholderRowHTML(this.options.loadingHTML));
 
 			this.options.dataSource.data(this.options.dataOptions, function (data) {
+				if (typeof data === 'string') {
+					// Error-handling
+
+					self.$footerchildren.css('visibility', 'hidden');
+
+					self.$tbody.html(self.errorRowHTML(data));
+					self.stretchHeight();
+
+					self.$element.trigger('loaded');
+					return;
+				}
+
 				var itemdesc = (data.count === 1) ? self.options.itemText : self.options.itemsText;
 				var rowHTML = '';
 
@@ -185,6 +203,11 @@
 
 		},
 
+		errorRowHTML: function (content) {
+			return '<tr><td style="text-align:center;padding:20px 20px 0 20px;border-bottom:none;" colspan="' +
+				this.columns.length + '"><div class="alert alert-error">' + content + '</div></td></tr>';
+		},
+
 		placeholderRowHTML: function (content) {
 			return '<tr><td style="text-align:center;padding:20px;border-bottom:none;" colspan="' +
 				this.columns.length + '">' + content + '</td></tr>';
@@ -327,14 +350,19 @@
 	// DATAGRID PLUGIN DEFINITION
 
 	$.fn.datagrid = function (option) {
-		return this.each(function () {
-			var $this = $(this);
-			var data = $this.data('datagrid');
+		var args = Array.prototype.slice.call( arguments, 1 );
+		var methodReturn;
+
+		var $set = this.each(function () {
+			var $this   = $( this );
+			var data    = $this.data( 'datagrid' );
 			var options = typeof option === 'object' && option;
 
-			if (!data) $this.data('datagrid', (data = new Datagrid(this, options)));
-			if (typeof option === 'string') data[option]();
+			if( !data ) $this.data('datagrid', (data = new Datagrid( this, options ) ) );
+			if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 		});
+
+		return ( methodReturn === undefined ) ? $set : methodReturn;
 	};
 
 	$.fn.datagrid.defaults = {
@@ -347,4 +375,8 @@
 
 	$.fn.datagrid.Constructor = Datagrid;
 
+	$.fn.datagrid.noConflict = function () {
+		$.fn.datagrid = old;
+		return this;
+	};
 }(window.jQuery);

data/vendor/assets/javascripts/fuelux/pillbox.js

@@ -9,6 +9,7 @@
 !function ($) {
 
 
+	var old = $.fn.pillbox;
 
 	// PILLBOX CONSTRUCTOR AND PROTOTYPE
 
@@ -88,25 +89,32 @@
 
 	// PILLBOX PLUGIN DEFINITION
 
-	$.fn.pillbox = function (option, value1, value2) {
+	$.fn.pillbox = function (option) {
+		var args = Array.prototype.slice.call( arguments, 1 );
 		var methodReturn;
 
 		var $set = this.each(function () {
-			var $this = $(this);
-			var data = $this.data('pillbox');
+			var $this   = $( this );
+			var data    = $this.data( 'pillbox' );
 			var options = typeof option === 'object' && option;
 
-			if (!data) $this.data('pillbox', ( data = new Pillbox(this, options)));
-			if ( typeof option === 'string') methodReturn = data[option](value1, value2);
+			if( !data ) $this.data('pillbox', (data = new Pillbox( this, options ) ) );
+			if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 		});
 
-		return (methodReturn === undefined) ? $set : methodReturn;
+		return ( methodReturn === undefined ) ? $set : methodReturn;
 	};
 
 	$.fn.pillbox.defaults = {};
 
 	$.fn.pillbox.Constructor = Pillbox;
 
+	$.fn.pillbox.noConflict = function () {
+		$.fn.pillbox = old;
+		return this;
+	};
+
+
 	// PILLBOX DATA-API
 
 	$(function () {
@@ -117,4 +125,3 @@
 		});
 	});
 }(window.jQuery);
-

data/vendor/assets/javascripts/fuelux/radio.js

@@ -9,7 +9,7 @@
 !function ($) {
 
 
-
+	var old = $.fn.radio;
 
 	// RADIO CONSTRUCTOR AND PROTOTYPE
 
@@ -41,10 +41,12 @@
 			var disabled = !!$radio.prop('disabled');
 
 			this.$icon.removeClass('checked disabled');
+			this.$label.removeClass('checked');
 
 			// set state of radio
 			if (checked === true) {
 				this.$icon.addClass('checked');
+				this.$label.addClass('checked');
 			}
 			if (disabled === true) {
 				this.$icon.addClass('disabled');
@@ -52,8 +54,11 @@
 		},
 
 		resetGroup: function () {
+			var group = $('input[name="' + this.groupName + '"]');
+
 			// reset all radio buttons in group
-			$('input[name=' + this.groupName + ']').next().removeClass('checked');
+			group.next().removeClass('checked');
+			group.parent().removeClass('checked');
 		},
 
 		enable: function () {
@@ -92,25 +97,31 @@
 
 	// RADIO PLUGIN DEFINITION
 
-	$.fn.radio = function (option, value) {
+	$.fn.radio = function (option) {
+		var args = Array.prototype.slice.call( arguments, 1 );
 		var methodReturn;
 
 		var $set = this.each(function () {
-			var $this = $(this);
-			var data = $this.data('radio');
+			var $this   = $( this );
+			var data    = $this.data( 'radio' );
 			var options = typeof option === 'object' && option;
 
-			if (!data) $this.data('radio', (data = new Radio(this, options)));
-			if (typeof option === 'string') methodReturn = data[option](value);
+			if( !data ) $this.data('radio', (data = new Radio( this, options ) ) );
+			if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 		});
 
-		return (methodReturn === undefined) ? $set : methodReturn;
+		return ( methodReturn === undefined ) ? $set : methodReturn;
 	};
 
 	$.fn.radio.defaults = {};
 
 	$.fn.radio.Constructor = Radio;
 
+	$.fn.radio.noConflict = function () {
+		$.fn.radio = old;
+		return this;
+	};
+
 
 	// RADIO DATA-API
 
@@ -124,5 +135,4 @@
 			});
 		});
 	});
-
 }(window.jQuery);

data/vendor/assets/javascripts/fuelux/search.js

@@ -9,7 +9,7 @@
 !function ($) {
 
 
-
+	var old = $.fn.search;
 
 	// SEARCH CONSTRUCTOR AND PROTOTYPE
 
@@ -97,20 +97,30 @@
 	// SEARCH PLUGIN DEFINITION
 
 	$.fn.search = function (option) {
-		return this.each(function () {
-			var $this = $(this);
-			var data = $this.data('search');
+		var args = Array.prototype.slice.call( arguments, 1 );
+		var methodReturn;
+
+		var $set = this.each(function () {
+			var $this = $( this );
+			var data = $this.data( 'search' );
 			var options = typeof option === 'object' && option;
 
 			if (!data) $this.data('search', (data = new Search(this, options)));
-			if (typeof option === 'string') data[option]();
+			if (typeof option === 'string') methodReturn = data[ option ].apply( data, args );
 		});
+
+		return ( methodReturn === undefined ) ? $set : methodReturn;
 	};
 
 	$.fn.search.defaults = {};
 
 	$.fn.search.Constructor = Search;
 
+	$.fn.search.noConflict = function () {
+		$.fn.search = old;
+		return this;
+	};
+
 
 	// SEARCH DATA-API
 
@@ -121,5 +131,4 @@
 			$this.search($this.data());
 		});
 	});
-
 }(window.jQuery);

data/vendor/assets/javascripts/fuelux/select.js

@@ -9,6 +9,7 @@
 !function ($) {
 
 
+    var old = $.fn.select;
 
 
     // SELECT CONSTRUCTOR AND PROTOTYPE
@@ -18,6 +19,7 @@
         this.options = $.extend({}, $.fn.select.defaults, options);
         this.$element.on('click', 'a', $.proxy(this.itemclicked, this));
         this.$button = this.$element.find('.btn');
+        this.$hiddenField = this.$element.find('.hidden-field');
         this.$label = this.$element.find('.dropdown-label');
         this.setDefaultSelection();
 
@@ -32,6 +34,7 @@
 
         itemclicked: function (e) {
             this.$selectedItem = $(e.target).parent();
+            this.$hiddenField.val(this.$selectedItem.attr('data-value'));
             this.$label.text(this.$selectedItem.text());
 
             // pass object including text and any data-attributes
@@ -90,6 +93,7 @@
             var item = this.$element.find(selector);
 
             this.$selectedItem = item;
+            this.$hiddenField.val(this.$selectedItem.attr('data-value'));
             this.$label.text(this.$selectedItem.text());
         },
 
@@ -121,7 +125,8 @@
 
     // SELECT PLUGIN DEFINITION
 
-    $.fn.select = function (option,value) {
+    $.fn.select = function (option) {
+        var args = Array.prototype.slice.call(arguments, 1);
         var methodReturn;
 
         var $set = this.each(function () {
@@ -130,16 +135,21 @@
             var options = typeof option === 'object' && option;
 
             if (!data) $this.data('select', (data = new Select(this, options)));
-            if (typeof option === 'string') methodReturn = data[option](value);
+            if (typeof option === 'string') methodReturn = data[option].apply(data, args);
         });
 
-        return (methodReturn === undefined) ? $set : methodReturn;
+        return ( methodReturn === undefined ) ? $set : methodReturn;
     };
 
     $.fn.select.defaults = {};
 
     $.fn.select.Constructor = Select;
 
+    $.fn.select.noConflict = function () {
+      $.fn.select = old;
+      return this;
+    };
+
 
     // SELECT DATA-API
 

data/vendor/assets/javascripts/fuelux/spinner.js

@@ -9,7 +9,7 @@
 !function ($) {
 
 
-
+	var old = $.fn.spinner;
 
 	// SPINNER CONSTRUCTOR AND PROTOTYPE
 
@@ -72,7 +72,7 @@
 			if(newVal/1){
 				this.options.value = newVal/1;
 			}else{
-				newVal = newVal.replace(/[^0-9]/g,'');
+				newVal = newVal.replace(/[^0-9]/g,'') || '';
 				this.$input.val(newVal);
 				this.options.value = newVal/1;
 			}
@@ -81,9 +81,11 @@
 		},
 
 		stopSpin: function () {
-			clearTimeout(this.switches.timeout);
-			this.switches.count = 1;
-			this.triggerChangedEvent();
+            if(this.switches.timeout!==undefined){
+                clearTimeout(this.switches.timeout);
+                this.switches.count = 1;
+                this.triggerChangedEvent();
+            }
 		},
 
 		triggerChangedEvent: function () {
@@ -170,19 +172,20 @@
 
 	// SPINNER PLUGIN DEFINITION
 
-	$.fn.spinner = function (option,value) {
+	$.fn.spinner = function (option) {
+		var args = Array.prototype.slice.call( arguments, 1 );
 		var methodReturn;
 
 		var $set = this.each(function () {
-			var $this = $(this);
-			var data = $this.data('spinner');
+			var $this   = $( this );
+			var data    = $this.data( 'spinner' );
 			var options = typeof option === 'object' && option;
 
-			if (!data) $this.data('spinner', (data = new Spinner(this, options)));
-			if (typeof option === 'string') methodReturn = data[option](value);
+			if( !data ) $this.data('spinner', (data = new Spinner( this, options ) ) );
+			if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 		});
 
-		return (methodReturn === undefined) ? $set : methodReturn;
+		return ( methodReturn === undefined ) ? $set : methodReturn;
 	};
 
 	$.fn.spinner.defaults = {
@@ -197,6 +200,11 @@
 
 	$.fn.spinner.Constructor = Spinner;
 
+	$.fn.spinner.noConflict = function () {
+		$.fn.spinner = old;
+		return this;
+	};
+
 
 	// SPINNER DATA-API
 
@@ -207,5 +215,4 @@
 			$this.spinner($this.data());
 		});
 	});
-
 }(window.jQuery);

data/vendor/assets/javascripts/fuelux/tree.js

@@ -9,7 +9,7 @@
 !function ($) {
 
 
-
+	var old = $.fn.tree;
 
 	// TREE CONSTRUCTOR AND PROTOTYPE
 
@@ -211,19 +211,20 @@
 
 	// TREE PLUGIN DEFINITION
 
-	$.fn.tree = function (option, value) {
+	$.fn.tree = function (option) {
+		var args = Array.prototype.slice.call( arguments, 1 );
 		var methodReturn;
 
 		var $set = this.each(function () {
-			var $this = $(this);
-			var data = $this.data('tree');
+			var $this   = $( this );
+			var data    = $this.data( 'tree' );
 			var options = typeof option === 'object' && option;
 
-			if (!data) $this.data('tree', (data = new Tree(this, options)));
-			if (typeof option === 'string') methodReturn = data[option](value);
+			if( !data ) $this.data('tree', (data = new Tree( this, options ) ) );
+			if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 		});
 
-		return (methodReturn === undefined) ? $set : methodReturn;
+		return ( methodReturn === undefined ) ? $set : methodReturn;
 	};
 
 	$.fn.tree.defaults = {
@@ -234,4 +235,8 @@
 
 	$.fn.tree.Constructor = Tree;
 
+	$.fn.tree.noConflict = function () {
+		$.fn.tree = old;
+		return this;
+	};
 }(window.jQuery);

data/vendor/assets/javascripts/fuelux/wizard.js

@@ -9,7 +9,7 @@
 !function ($) {
 
 
-
+	var old = $.fn.wizard;
 
 	// WIZARD CONSTRUCTOR AND PROTOTYPE
 
@@ -18,6 +18,7 @@
 
 		this.$element = $(element);
 		this.options = $.extend({}, $.fn.wizard.defaults, options);
+		this.options.disablePreviousStep = ( this.$element.data().restrict === "previous" ) ? true : false;
 		this.currentStep = this.options.selectedItem.step;
 		this.numSteps = this.$element.find('.steps li').length;
 		this.$prevBtn = this.$element.find('button.btn-prev');
@@ -33,7 +34,12 @@
 		this.$element.on('click', 'li.complete', $.proxy(this.stepclicked, this));
 		
 		if(this.currentStep > 1) {
-            this.selectedItem(this.options.selectedItem);
+			this.selectedItem(this.options.selectedItem);
+		}
+
+		if( this.options.disablePreviousStep ) {
+			this.$prevBtn.attr( 'disabled', true );
+			this.$element.find( '.steps' ).addClass( 'previous-disabled' );
 		}
 	};
 
@@ -47,7 +53,9 @@
 			var lastStep = (this.currentStep === this.numSteps);
 
 			// disable buttons based on current step
-			this.$prevBtn.attr('disabled', (firstStep === true || canMovePrev === false));
+			if( !this.options.disablePreviousStep ) {
+				this.$prevBtn.attr('disabled', (firstStep === true || canMovePrev === false));
+			}
 
 			// change button text of last step, if specified
 			var data = this.$nextBtn.data();
@@ -84,7 +92,7 @@
 			$(target).addClass('active');
 
 			// reset the wizard position to the left
-            this.$element.find('.steps').first().attr('style','margin-left: 0');
+			this.$element.find('.steps').first().attr('style','margin-left: 0');
 
 			// check if the steps are wider than the container div
 			var totalWidth = 0;
@@ -92,8 +100,8 @@
 				totalWidth += $(this).outerWidth();
 			});
 			var containerWidth = 0;
-            if (this.$element.find('.actions').length) {
-                containerWidth = this.$element.width() - this.$element.find('.actions').first().outerWidth();
+			if (this.$element.find('.actions').length) {
+				containerWidth = this.$element.width() - this.$element.find('.actions').first().outerWidth();
 			} else {
 				containerWidth = this.$element.width();
 			}
@@ -101,16 +109,16 @@
 			
 				// set the position so that the last step is on the right
 				var newMargin = totalWidth - containerWidth;
-                this.$element.find('.steps').first().attr('style','margin-left: -' + newMargin + 'px');
+				this.$element.find('.steps').first().attr('style','margin-left: -' + newMargin + 'px');
 				
 				// set the position so that the active step is in a good
 				// position if it has been moved out of view
-                if (this.$element.find('li.active').first().position().left < 200) {
-                    newMargin += this.$element.find('li.active').first().position().left - 200;
+				if (this.$element.find('li.active').first().position().left < 200) {
+					newMargin += this.$element.find('li.active').first().position().left - 200;
 					if (newMargin < 1) {
-                        this.$element.find('.steps').first().attr('style','margin-left: 0');
+						this.$element.find('.steps').first().attr('style','margin-left: 0');
 					} else {
-                        this.$element.find('.steps').first().attr('style','margin-left: -' + newMargin + 'px');
+						this.$element.find('.steps').first().attr('style','margin-left: -' + newMargin + 'px');
 					}
 				}
 			}
@@ -119,20 +127,31 @@
 		},
 
 		stepclicked: function (e) {
-			var li = $(e.currentTarget);
+			var li          = $(e.currentTarget);
+			var index       = this.$element.find('.steps li').index(li);
+			var canMovePrev = true;
 
-			var index = this.$element.find('.steps li').index(li);
+			if( this.options.disablePreviousStep ) {
+				if( index < this.currentStep ) {
+					canMovePrev = false;
+				}
+			}
 
-			var evt = $.Event('stepclick');
-			this.$element.trigger(evt, {step: index + 1});
-			if (evt.isDefaultPrevented()) return;
+			if( canMovePrev ) {
+				var evt = $.Event('stepclick');
+				this.$element.trigger(evt, {step: index + 1});
+				if (evt.isDefaultPrevented()) return;
 
-			this.currentStep = (index + 1);
-			this.setState();
+				this.currentStep = (index + 1);
+				this.setState();
+			}
 		},
 
 		previous: function () {
 			var canMovePrev = (this.currentStep > 1);
+			if( this.options.disablePreviousStep ) {
+				canMovePrev = false;
+			}
 			if (canMovePrev) {
 				var e = $.Event('change');
 				this.$element.trigger(e, {step: this.currentStep, direction: 'previous'});
@@ -186,19 +205,20 @@
 
 	// WIZARD PLUGIN DEFINITION
 
-	$.fn.wizard = function (option, value) {
+	$.fn.wizard = function (option) {
+		var args = Array.prototype.slice.call( arguments, 1 );
 		var methodReturn;
 
 		var $set = this.each(function () {
-			var $this = $(this);
-			var data = $this.data('wizard');
+			var $this   = $( this );
+			var data    = $this.data( 'wizard' );
 			var options = typeof option === 'object' && option;
 
-			if (!data) $this.data('wizard', (data = new Wizard(this, options)));
-			if (typeof option === 'string') methodReturn = data[option](value);
+			if( !data ) $this.data('wizard', (data = new Wizard( this, options ) ) );
+			if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
 		});
 
-		return (methodReturn === undefined) ? $set : methodReturn;
+		return ( methodReturn === undefined ) ? $set : methodReturn;
 	};
 
 	$.fn.wizard.defaults = {
@@ -207,15 +227,19 @@
 
 	$.fn.wizard.Constructor = Wizard;
 
+	$.fn.wizard.noConflict = function () {
+		$.fn.wizard = old;
+		return this;
+	};
+
 
 	// WIZARD DATA-API
 
 	$(function () {
-		$('body').on('mousedown.wizard.data-api', '.wizard', function () {
+		$('body').on('mouseover.wizard.data-api', '.wizard', function () {
 			var $this = $(this);
 			if ($this.data('wizard')) return;
 			$this.wizard($this.data());
 		});
 	});
-
 }(window.jQuery);

data/vendor/toolkit/fuelux/checkbox.less

@@ -12,7 +12,7 @@
 	input[type=checkbox] {
 	/* IE cannot fire events if display none or visibility hidden */
 	position: relative;
-	top: -99999px;
+	left: -99999px;
 	}
 
 	i {

data/vendor/toolkit/fuelux/radio.less

@@ -1,10 +1,20 @@
 .radio-custom {
 	input[type=radio] {
-	/* IE cannot fire events if display none or visibility hidden */
-	position: relative;
-	top: -99999px;
+        /* IE cannot fire events if display none or visibility hidden */
+        position: relative;
+        left: -99999px;
 	}
 
+    &.highlight {
+        padding: 4px 4px 4px 24px;
+
+        &.checked {
+            background: #e9e9e9;
+            -webkit-border-radius: @borderRadiusSmall;
+            border-radius: @borderRadiusSmall;
+        }
+    }
+
 	i {
 		background-image: image-url('fuelux/form.png');
 		background-position: 0 -15px;

data/vendor/toolkit/fuelux/select.less

@@ -8,6 +8,10 @@
         color: #333;
     }
 
+    .hidden-field {
+        display: none;
+    }
+
     &-sizer {
         display: inline-block;
         position: absolute;

data/vendor/toolkit/fuelux/tree.less

@@ -64,8 +64,10 @@
 		}
 
 		.tree-item-name {
-			position: absolute;
-			left: 29px;
+            overflow: hidden;
+            padding-left: 29px;
+            text-overflow: ellipsis;
+            white-space: nowrap;
 		}
 
 		.tree-dot {

data/vendor/toolkit/fuelux/wizard.less

@@ -14,6 +14,24 @@
 		padding: 0;
 		margin: 0;
 		width: 4000px;
+
+		&.previous-disabled {
+			li {
+				&.complete {
+					cursor: default;
+
+					&:hover {
+						background: #f3f4f5;
+						color: @successText;
+						cursor: default;
+
+						.chevron:before {
+							border-left-color: #f3f4f5;
+						}
+					}
+				}
+			}
+		}
 		
 		li {
 			float: left;
@@ -35,7 +53,7 @@
 				position: absolute;
 				right: -14px;
 				top: 0;
-                z-index: 1;
+				z-index: 1;
 			}
 
 			.chevron:before {
@@ -92,7 +110,7 @@
 		line-height: 46px;
 		float: right;
 		padding-left: 15px;
-		padding-right: 15px;		
+		padding-right: 15px;
 		vertical-align: middle;
 		background-color: #e5e5e5;
 		border-left: 1px solid @navbarBorder;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuelux-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Stephen Baldwin