fuelux-rails 2.2.0.beta.1 → 2.2.0

data/README.md

@@ -1,7 +1,7 @@
-# Fuel UX for Rails 3.1 Asset Pipeline
+# Fuel UX for Rails 3.1/Rails 4.0 Asset Pipeline
 Extends Twitter Bootstrap with additional lightweight JavaScript controls. Easy to install, customize, update, and optimize. 
 
-fuelux-rails project integrates Fuel UX into the Twitter Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline (Rails 3.2 supported)
+fuelux-rails project integrates Fuel UX into the Twitter Bootstrap CSS toolkit for Rails 3.1/Rails 4.0 Asset Pipeline (Rails 3.2 supported)
 
 ## Installing Gem
 

data/lib/fuelux-rails/version.rb

@@ -1,3 +1,3 @@
 module FueluxRails
-  VERSION = "2.2.0.beta.1"
+  VERSION = "2.2.0"
 end

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

@@ -7,7 +7,7 @@
  */
 
 !function ($) {
-
+  
 	// CHECKBOX CONSTRUCTOR AND PROTOTYPE
 
 	var Checkbox = function (element, options) {

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

@@ -7,7 +7,7 @@
  */
 
 !function ($) {
-	
+
 	// COMBOBOX CONSTRUCTOR AND PROTOTYPE
 
 	var Combobox = function (element, options) {
@@ -72,11 +72,8 @@
 		setDefaultSelection: function () {
 			var selector = 'li[data-selected=true]:first';
 			var item = this.$element.find(selector);
-			if (item.length === 0) {
-				// select first item
-				this.selectByIndex(0);
-			}
-			else {
+
+			if (item.length > 0) {
 				// select by data-attribute
 				this.selectBySelector(selector);
 				item.removeData('selected');

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

@@ -13,8 +13,9 @@
 	var Datagrid = function (element, options) {
 		this.$element = $(element);
 		this.$thead = this.$element.find('thead');
+		this.$tfoot = this.$element.find('tfoot');
 		this.$footer = this.$element.find('tfoot th');
-		this.$footerchildren = this.$footer.children();
+		this.$footerchildren = this.$footer.children().show().css('visibility', 'hidden');
 		this.$topheader = this.$element.find('thead th');
 		this.$searchcontrol = this.$element.find('.search');
 		this.$pagesize = this.$element.find('.grid-pagesize');
@@ -30,7 +31,7 @@
 		this.$tbody = $('<tbody>').insertAfter(this.$thead);
 		this.$colheader = $('<tr>').appendTo(this.$thead);
 
-		this.options = $.extend({}, $.fn.datagrid.defaults, options);
+		this.options = $.extend(true, {}, $.fn.datagrid.defaults, options);
 		this.options.dataOptions.pageSize = parseInt(this.$pagesize.val(), 10);
 		this.columns = this.options.dataSource.columns();
 
@@ -42,6 +43,9 @@
 		this.$pageinput.on('change', $.proxy(this.pageChanged, this));
 
 		this.renderColumns();
+
+		if (this.options.stretchHeight) this.initStretchHeight();
+
 		this.renderData();
 	};
 
@@ -102,13 +106,14 @@
 			var self = this;
 
 			this.$tbody.html(this.placeholderRowHTML(this.options.loadingHTML));
-			this.$footerchildren.hide();
 
 			this.options.dataSource.data(this.options.dataOptions, function (data) {
 				var itemdesc = (data.count === 1) ? self.options.itemText : self.options.itemsText;
 				var rowHTML = '';
 
-				self.$footerchildren.toggle(data.count > 0);
+				self.$footerchildren.css('visibility', function () {
+					return (data.count > 0) ? 'visible' : 'hidden';
+				});
 
 				self.$pageinput.val(data.page);
 				self.$pageslabel.text(data.pages);
@@ -130,13 +135,15 @@
 				if (!rowHTML) rowHTML = self.placeholderRowHTML('0 ' + self.options.itemsText);
 
 				self.$tbody.html(rowHTML);
+				self.stretchHeight();
+
 				self.$element.trigger('loaded');
 			});
 
 		},
 
 		placeholderRowHTML: function (content) {
-			return '<tr><td style="text-align:center;padding:20px;" colspan="' +
+			return '<tr><td style="text-align:center;padding:20px;border-bottom:none;" colspan="' +
 				this.columns.length + '">' + content + '</td></tr>';
 		},
 
@@ -190,8 +197,58 @@
 		reload: function () {
 			this.options.dataOptions.pageIndex = 0;
 			this.renderData();
-		}
+		},
+
+		initStretchHeight: function () {
+			this.$gridContainer = this.$element.parent();
+
+			this.$element.wrap('<div class="datagrid-stretch-wrapper">');
+			this.$stretchWrapper = this.$element.parent();
+
+			this.$headerTable = $('<table>').attr('class', this.$element.attr('class'));
+			this.$footerTable = this.$headerTable.clone();
+
+			this.$headerTable.prependTo(this.$gridContainer).addClass('datagrid-stretch-header');
+			this.$thead.detach().appendTo(this.$headerTable);
+
+			this.$sizingHeader = this.$thead.clone();
+			this.$sizingHeader.find('tr:first').remove();
+
+			this.$footerTable.appendTo(this.$gridContainer).addClass('datagrid-stretch-footer');
+			this.$tfoot.detach().appendTo(this.$footerTable);
+		},
 
+		stretchHeight: function () {
+			if (!this.$gridContainer) return;
+
+			this.setColumnWidths();
+
+			var targetHeight = this.$gridContainer.height();
+			var headerHeight = this.$headerTable.outerHeight();
+			var footerHeight = this.$footerTable.outerHeight();
+			var overhead = headerHeight + footerHeight;
+
+			this.$stretchWrapper.height(targetHeight - overhead);
+		},
+
+		setColumnWidths: function () {
+			if (!this.$sizingHeader) return;
+
+			this.$element.prepend(this.$sizingHeader);
+
+			var $sizingCells = this.$sizingHeader.find('th');
+			var columnCount = $sizingCells.length;
+
+			function matchSizingCellWidth(i, el) {
+				if (i === columnCount - 1) return;
+				$(el).width($sizingCells.eq(i).width());
+			}
+
+			this.$colheader.find('th').each(matchSizingCellWidth);
+			this.$tbody.find('tr:first > td').each(matchSizingCellWidth);
+
+			this.$sizingHeader.detach();
+		}
 	};
 
 
@@ -217,4 +274,4 @@
 
 	$.fn.datagrid.Constructor = Datagrid;
 
-}(window.jQuery);
+}(window.jQuery);

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

@@ -2843,11 +2843,8 @@ define('fuelux/combobox',['require','jquery','./util'],function (require) {
 		setDefaultSelection: function () {
 			var selector = 'li[data-selected=true]:first';
 			var item = this.$element.find(selector);
-			if (item.length === 0) {
-				// select first item
-				this.selectByIndex(0);
-			}
-			else {
+
+			if (item.length > 0) {
 				// select by data-attribute
 				this.selectBySelector(selector);
 				item.removeData('selected');
@@ -2966,8 +2963,9 @@ define('fuelux/datagrid',['require','jquery'],function(require) {
 	var Datagrid = function (element, options) {
 		this.$element = $(element);
 		this.$thead = this.$element.find('thead');
+		this.$tfoot = this.$element.find('tfoot');
 		this.$footer = this.$element.find('tfoot th');
-		this.$footerchildren = this.$footer.children();
+		this.$footerchildren = this.$footer.children().show().css('visibility', 'hidden');
 		this.$topheader = this.$element.find('thead th');
 		this.$searchcontrol = this.$element.find('.search');
 		this.$pagesize = this.$element.find('.grid-pagesize');
@@ -2983,7 +2981,7 @@ define('fuelux/datagrid',['require','jquery'],function(require) {
 		this.$tbody = $('<tbody>').insertAfter(this.$thead);
 		this.$colheader = $('<tr>').appendTo(this.$thead);
 
-		this.options = $.extend({}, $.fn.datagrid.defaults, options);
+		this.options = $.extend(true, {}, $.fn.datagrid.defaults, options);
 		this.options.dataOptions.pageSize = parseInt(this.$pagesize.val(), 10);
 		this.columns = this.options.dataSource.columns();
 
@@ -2995,6 +2993,9 @@ define('fuelux/datagrid',['require','jquery'],function(require) {
 		this.$pageinput.on('change', $.proxy(this.pageChanged, this));
 
 		this.renderColumns();
+
+		if (this.options.stretchHeight) this.initStretchHeight();
+
 		this.renderData();
 	};
 
@@ -3055,13 +3056,14 @@ define('fuelux/datagrid',['require','jquery'],function(require) {
 			var self = this;
 
 			this.$tbody.html(this.placeholderRowHTML(this.options.loadingHTML));
-			this.$footerchildren.hide();
 
 			this.options.dataSource.data(this.options.dataOptions, function (data) {
 				var itemdesc = (data.count === 1) ? self.options.itemText : self.options.itemsText;
 				var rowHTML = '';
 
-				self.$footerchildren.toggle(data.count > 0);
+				self.$footerchildren.css('visibility', function () {
+					return (data.count > 0) ? 'visible' : 'hidden';
+				});
 
 				self.$pageinput.val(data.page);
 				self.$pageslabel.text(data.pages);
@@ -3083,13 +3085,15 @@ define('fuelux/datagrid',['require','jquery'],function(require) {
 				if (!rowHTML) rowHTML = self.placeholderRowHTML('0 ' + self.options.itemsText);
 
 				self.$tbody.html(rowHTML);
+				self.stretchHeight();
+
 				self.$element.trigger('loaded');
 			});
 
 		},
 
 		placeholderRowHTML: function (content) {
-			return '<tr><td style="text-align:center;padding:20px;" colspan="' +
+			return '<tr><td style="text-align:center;padding:20px;border-bottom:none;" colspan="' +
 				this.columns.length + '">' + content + '</td></tr>';
 		},
 
@@ -3143,8 +3147,58 @@ define('fuelux/datagrid',['require','jquery'],function(require) {
 		reload: function () {
 			this.options.dataOptions.pageIndex = 0;
 			this.renderData();
-		}
+		},
+
+		initStretchHeight: function () {
+			this.$gridContainer = this.$element.parent();
+
+			this.$element.wrap('<div class="datagrid-stretch-wrapper">');
+			this.$stretchWrapper = this.$element.parent();
+
+			this.$headerTable = $('<table>').attr('class', this.$element.attr('class'));
+			this.$footerTable = this.$headerTable.clone();
+
+			this.$headerTable.prependTo(this.$gridContainer).addClass('datagrid-stretch-header');
+			this.$thead.detach().appendTo(this.$headerTable);
+
+			this.$sizingHeader = this.$thead.clone();
+			this.$sizingHeader.find('tr:first').remove();
+
+			this.$footerTable.appendTo(this.$gridContainer).addClass('datagrid-stretch-footer');
+			this.$tfoot.detach().appendTo(this.$footerTable);
+		},
+
+		stretchHeight: function () {
+			if (!this.$gridContainer) return;
+
+			this.setColumnWidths();
+
+			var targetHeight = this.$gridContainer.height();
+			var headerHeight = this.$headerTable.outerHeight();
+			var footerHeight = this.$footerTable.outerHeight();
+			var overhead = headerHeight + footerHeight;
+
+			this.$stretchWrapper.height(targetHeight - overhead);
+		},
+
+		setColumnWidths: function () {
+			if (!this.$sizingHeader) return;
+
+			this.$element.prepend(this.$sizingHeader);
+
+			var $sizingCells = this.$sizingHeader.find('th');
+			var columnCount = $sizingCells.length;
+
+			function matchSizingCellWidth(i, el) {
+				if (i === columnCount - 1) return;
+				$(el).width($sizingCells.eq(i).width());
+			}
 
+			this.$colheader.find('th').each(matchSizingCellWidth);
+			this.$tbody.find('tr:first > td').each(matchSizingCellWidth);
+
+			this.$sizingHeader.detach();
+		}
 	};
 
 
@@ -3372,9 +3426,14 @@ define('fuelux/search',['require','jquery'],function(require) {
 	var Search = function (element, options) {
 		this.$element = $(element);
 		this.options = $.extend({}, $.fn.search.defaults, options);
-		this.$element.find('button').on('click', $.proxy(this.buttonclicked, this));
-		this.$input = this.$element.find('input').on('keydown', $.proxy(this.keypress, this));
-		this.$input = this.$element.find('input').on('keyup', $.proxy(this.keypressed, this));
+
+		this.$button = this.$element.find('button')
+			.on('click', $.proxy(this.buttonclicked, this));
+
+		this.$input = this.$element.find('input')
+			.on('keydown', $.proxy(this.keypress, this))
+			.on('keyup', $.proxy(this.keypressed, this));
+
 		this.$icon = this.$element.find('i');
 		this.activeSearch = '';
 	};
@@ -3430,6 +3489,16 @@ define('fuelux/search',['require','jquery'],function(require) {
 				inputPresentAndUnchanged = val && (val === this.activeSearch);
 				this.$icon.attr('class', inputPresentAndUnchanged ? 'icon-remove' : 'icon-search');
 			}
+		},
+
+		disable: function () {
+			this.$input.attr('disabled', 'disabled');
+			this.$button.addClass('disabled');
+		},
+
+		enable: function () {
+			this.$input.removeAttr('disabled');
+			this.$button.removeClass('disabled');
 		}
 
 	};
@@ -3509,6 +3578,8 @@ define('fuelux/spinner',['require','jquery'],function(require) {
 			this.switches.speed = 500;
 		}
 
+		this.lastValue = null;
+
 		this.render();
 
 		if (this.options.disabled) {
@@ -3535,12 +3606,25 @@ define('fuelux/spinner',['require','jquery'],function(require) {
 				this.options.value = newVal/1;
 			}
 
-			this.$element.trigger('change');
+			this.triggerChangedEvent();
 		},
 
 		stopSpin: function () {
 			clearTimeout(this.switches.timeout);
 			this.switches.count = 1;
+			this.triggerChangedEvent();
+		},
+
+		triggerChangedEvent: function () {
+			var currentValue = this.value();
+			if (currentValue === this.lastValue) return;
+
+			this.lastValue = currentValue;
+
+			// Primary changed event
+			this.$element.trigger('changed', currentValue);
+
+			// Undocumented, kept for backward compatibility
 			this.$element.trigger('change');
 		},
 
@@ -3644,7 +3728,7 @@ define('fuelux/spinner',['require','jquery'],function(require) {
 	$(function () {
 		$('body').on('mousedown.spinner.data-api', '.spinner', function (e) {
 			var $this = $(this);
-			if ($this.data('.spinner')) return;
+			if ($this.data('spinner')) return;
 			$this.spinner($this.data());
 		});
 	});
@@ -3998,153 +4082,157 @@ define('fuelux/tree',['require','jquery'],function(require) {
  * Licensed under the MIT license.
  */
 
-define('fuelux/wizard',['require','jquery'],function(require) {
+define('fuelux/wizard',['require','jquery'],function (require) {
 
-    var $ = require('jquery');
+	var $ = require('jquery');
 
 
-    // WIZARD CONSTRUCTOR AND PROTOTYPE
+	// WIZARD CONSTRUCTOR AND PROTOTYPE
 
-    var Wizard = function (element, options) {
-        this.$element = $(element);
-        this.options = $.extend({}, $.fn.wizard.defaults, options);
-        this.currentStep = 1;
-        this.numSteps = this.$element.find('li').length;
-        this.$prevBtn = this.$element.find('button.btn-prev');
-        this.$nextBtn = this.$element.find('button.btn-next');
-        this.nextText = this.$nextBtn.text();
-
-        // handle events
-        this.$prevBtn.on('click', $.proxy(this.previous, this));
-        this.$nextBtn.on('click', $.proxy(this.next, this));
-        this.$element.on('click', 'li.complete', $.proxy(this.stepclicked, this));
-    };
+	var Wizard = function (element, options) {
+		this.$element = $(element);
+		this.options = $.extend({}, $.fn.wizard.defaults, options);
+		this.currentStep = 1;
+		this.numSteps = this.$element.find('li').length;
+		this.$prevBtn = this.$element.find('button.btn-prev');
+		this.$nextBtn = this.$element.find('button.btn-next');
+		this.nextText = this.$nextBtn.text();
 
-    Wizard.prototype = {
-
-        constructor: Wizard,
-
-        setState: function() {
-            var canMoveNext = (this.currentStep + 1 <= this.numSteps);
-            var lastStep = (this.currentStep === this.numSteps);
-            var canMovePrev = (this.currentStep > 1);
-            var firstStep = (this.currentStep === 1);
-
-            // disable buttons based on current step
-            this.$prevBtn.attr('disabled', (firstStep === true || canMovePrev === false));
-            this.$nextBtn.attr('disabled', (lastStep === true || canMoveNext === false));
-
-            // change button text of last step, if specified
-            var data = this.$nextBtn.data();
-            if(data && data.last) {
-                this.lastText = data.last;
-                if(typeof this.lastText !== 'undefined') {
-                    var text = (lastStep !== true) ? this.nextText : this.lastText;
-                     this.$nextBtn
-                     .contents()
-                     .filter(function() {
-                     return this.nodeType === 3;
-                     }).replaceWith(text);
-                }
-            }
+		// handle events
+		this.$prevBtn.on('click', $.proxy(this.previous, this));
+		this.$nextBtn.on('click', $.proxy(this.next, this));
+		this.$element.on('click', 'li.complete', $.proxy(this.stepclicked, this));
+	};
 
-            // reset classes for all steps
-            var $steps = this.$element.find('li');
-            $steps.removeClass('active').removeClass('complete');
-            $steps.find('span.badge').removeClass('badge-info').removeClass('badge-success');
-
-            // set class for all previous steps
-            var prevSelector = 'li:lt(' + (this.currentStep - 1) + ')';
-            var $prevSteps = this.$element.find(prevSelector);
-            $prevSteps.addClass('complete');
-            $prevSteps.find('span.badge').addClass('badge-success');
-
-            // set class for current step
-            var currentSelector = 'li:eq(' + (this.currentStep - 1) + ')';
-            var $currentStep = this.$element.find(currentSelector);
-            $currentStep.addClass('active');
-            $currentStep.find('span.badge').addClass('badge-info');
-
-            // set display of target element
-            var target = $currentStep.data().target;
-            $('.step-pane').removeClass('active');
-            $(target).addClass('active');
-
-            this.$element.trigger('changed');
-        },
+	Wizard.prototype = {
+
+		constructor: Wizard,
+
+		setState: function () {
+			var canMovePrev = (this.currentStep > 1);
+			var firstStep = (this.currentStep === 1);
+			var lastStep = (this.currentStep === this.numSteps);
+
+			// disable buttons based on current step
+			this.$prevBtn.attr('disabled', (firstStep === true || canMovePrev === false));
+
+			// change button text of last step, if specified
+			var data = this.$nextBtn.data();
+			if (data && data.last) {
+				this.lastText = data.last;
+				if (typeof this.lastText !== 'undefined') {
+					// replace text
+					var text = (lastStep !== true) ? this.nextText : this.lastText;
+					this.$nextBtn
+						.contents()
+						.filter(function () {
+							return this.nodeType === 3;
+						}).replaceWith(text);
+				}
+			}
 
-        stepclicked: function(e) {
-            var li = $(e.currentTarget);
+			// reset classes for all steps
+			var $steps = this.$element.find('li');
+			$steps.removeClass('active').removeClass('complete');
+			$steps.find('span.badge').removeClass('badge-info').removeClass('badge-success');
+
+			// set class for all previous steps
+			var prevSelector = 'li:lt(' + (this.currentStep - 1) + ')';
+			var $prevSteps = this.$element.find(prevSelector);
+			$prevSteps.addClass('complete');
+			$prevSteps.find('span.badge').addClass('badge-success');
+
+			// set class for current step
+			var currentSelector = 'li:eq(' + (this.currentStep - 1) + ')';
+			var $currentStep = this.$element.find(currentSelector);
+			$currentStep.addClass('active');
+			$currentStep.find('span.badge').addClass('badge-info');
+
+			// set display of target element
+			var target = $currentStep.data().target;
+			$('.step-pane').removeClass('active');
+			$(target).addClass('active');
+
+			this.$element.trigger('changed');
+		},
 
-            var index = $('.steps li').index(li);
-            this.currentStep = (index + 1);
-            this.setState();
-        },
+		stepclicked: function (e) {
+			var li = $(e.currentTarget);
 
-        previous: function() {
-            var canMovePrev = (this.currentStep > 1);
-            if(canMovePrev) {
-                var e = $.Event('change');
-                this.$element.trigger(e, {step:this.currentStep, direction:'previous'});
-                if (e.isDefaultPrevented()) return;
+			var index = $('.steps li').index(li);
+			this.currentStep = (index + 1);
+			this.setState();
+		},
 
-                this.currentStep -= 1;
-                this.setState();
-            }
-        },
+		previous: function () {
+			var canMovePrev = (this.currentStep > 1);
+			if (canMovePrev) {
+				var e = $.Event('change');
+				this.$element.trigger(e, {step: this.currentStep, direction: 'previous'});
+				if (e.isDefaultPrevented()) return;
+
+				this.currentStep -= 1;
+				this.setState();
+			}
+		},
 
-        next: function() {
-            var canMoveNext = (this.currentStep + 1 <= this.numSteps);
-            if(canMoveNext) {
-                var e = $.Event('change');
-                this.$element.trigger(e, {step:this.currentStep, direction:'next'});
+		next: function () {
+			var canMoveNext = (this.currentStep + 1 <= this.numSteps);
+			var lastStep = (this.currentStep === this.numSteps);
 
-                if (e.isDefaultPrevented()) return;
+			if (canMoveNext) {
+				var e = $.Event('change');
+				this.$element.trigger(e, {step: this.currentStep, direction: 'next'});
 
-                this.currentStep += 1;
-                this.setState();
-            }
-        },
+				if (e.isDefaultPrevented()) return;
 
-        selectedItem: function(val) {
-            return {
-                step: this.currentStep
-            };
-        }
-    };
+				this.currentStep += 1;
+				this.setState();
+			}
+			else if (lastStep) {
+				this.$element.trigger('finished');
+			}
+		},
 
+		selectedItem: function (val) {
+			return {
+				step: this.currentStep
+			};
+		}
+	};
 
-    // WIZARD PLUGIN DEFINITION
 
-    $.fn.wizard = function (option,value) {
-        var methodReturn;
+	// WIZARD PLUGIN DEFINITION
 
-        var $set = this.each(function () {
-            var $this = $(this);
-            var data = $this.data('wizard');
-            var options = typeof option === 'object' && option;
+	$.fn.wizard = function (option, value) {
+		var methodReturn;
 
-            if (!data) $this.data('wizard', (data = new Wizard(this, options)));
-            if (typeof option === 'string') methodReturn = data[option](value);
-        });
+		var $set = this.each(function () {
+			var $this = $(this);
+			var data = $this.data('wizard');
+			var options = typeof option === 'object' && option;
 
-        return (methodReturn === undefined) ? $set : methodReturn;
-    };
+			if (!data) $this.data('wizard', (data = new Wizard(this, options)));
+			if (typeof option === 'string') methodReturn = data[option](value);
+		});
 
-    $.fn.wizard.defaults = {};
+		return (methodReturn === undefined) ? $set : methodReturn;
+	};
 
-    $.fn.wizard.Constructor = Wizard;
+	$.fn.wizard.defaults = {};
 
+	$.fn.wizard.Constructor = Wizard;
 
-    // WIZARD DATA-API
 
-    $(function () {
-        $('body').on('mousedown.wizard.data-api', '.wizard', function () {
-            var $this = $(this);
-            if ($this.data('wizard')) return;
-            $this.wizard($this.data());
-        });
-    });
+	// WIZARD DATA-API
+
+	$(function () {
+		$('body').on('mousedown.wizard.data-api', '.wizard', function () {
+			var $this = $(this);
+			if ($this.data('wizard')) return;
+			$this.wizard($this.data());
+		});
+	});
 
 });
 

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

@@ -65,5 +65,4 @@
 		});
 	});
 	
-}(window.jQuery);
-
+}(window.jQuery);  

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

@@ -13,9 +13,14 @@
 	var Search = function (element, options) {
 		this.$element = $(element);
 		this.options = $.extend({}, $.fn.search.defaults, options);
-		this.$element.find('button').on('click', $.proxy(this.buttonclicked, this));
-		this.$input = this.$element.find('input').on('keydown', $.proxy(this.keypress, this));
-		this.$input = this.$element.find('input').on('keyup', $.proxy(this.keypressed, this));
+
+		this.$button = this.$element.find('button')
+			.on('click', $.proxy(this.buttonclicked, this));
+
+		this.$input = this.$element.find('input')
+			.on('keydown', $.proxy(this.keypress, this))
+			.on('keyup', $.proxy(this.keypressed, this));
+
 		this.$icon = this.$element.find('i');
 		this.activeSearch = '';
 	};
@@ -71,6 +76,16 @@
 				inputPresentAndUnchanged = val && (val === this.activeSearch);
 				this.$icon.attr('class', inputPresentAndUnchanged ? 'icon-remove' : 'icon-search');
 			}
+		},
+
+		disable: function () {
+			this.$input.attr('disabled', 'disabled');
+			this.$button.addClass('disabled');
+		},
+
+		enable: function () {
+			this.$input.removeAttr('disabled');
+			this.$button.removeClass('disabled');
 		}
 
 	};
@@ -104,4 +119,4 @@
 		});
 	});
 
-}(window.jQuery);
+}(window.jQuery);  

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

@@ -39,6 +39,8 @@
 			this.switches.speed = 500;
 		}
 
+		this.lastValue = null;
+
 		this.render();
 
 		if (this.options.disabled) {
@@ -65,12 +67,25 @@
 				this.options.value = newVal/1;
 			}
 
-			this.$element.trigger('change');
+			this.triggerChangedEvent();
 		},
 
 		stopSpin: function () {
 			clearTimeout(this.switches.timeout);
 			this.switches.count = 1;
+			this.triggerChangedEvent();
+		},
+
+		triggerChangedEvent: function () {
+			var currentValue = this.value();
+			if (currentValue === this.lastValue) return;
+
+			this.lastValue = currentValue;
+
+			// Primary changed event
+			this.$element.trigger('changed', currentValue);
+
+			// Undocumented, kept for backward compatibility
 			this.$element.trigger('change');
 		},
 
@@ -174,9 +189,9 @@
 	$(function () {
 		$('body').on('mousedown.spinner.data-api', '.spinner', function (e) {
 			var $this = $(this);
-			if ($this.data('.spinner')) return;
+			if ($this.data('spinner')) return;
 			$this.spinner($this.data());
 		});
 	});
 
-}(window.jQuery);
+}(window.jQuery);  

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

@@ -23,4 +23,4 @@
 			return fuelTextExactCI(elem, match[3]);
 		};
 
-}(window.jQuery);
+}(window.jQuery);    

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

@@ -8,147 +8,151 @@
 
 !function ($) {
 
-    // WIZARD CONSTRUCTOR AND PROTOTYPE
-
-    var Wizard = function (element, options) {
-        this.$element = $(element);
-        this.options = $.extend({}, $.fn.wizard.defaults, options);
-        this.currentStep = 1;
-        this.numSteps = this.$element.find('li').length;
-        this.$prevBtn = this.$element.find('button.btn-prev');
-        this.$nextBtn = this.$element.find('button.btn-next');
-        this.nextText = this.$nextBtn.text();
-
-        // handle events
-        this.$prevBtn.on('click', $.proxy(this.previous, this));
-        this.$nextBtn.on('click', $.proxy(this.next, this));
-        this.$element.on('click', 'li.complete', $.proxy(this.stepclicked, this));
-    };
-
-    Wizard.prototype = {
-
-        constructor: Wizard,
-
-        setState: function() {
-            var canMoveNext = (this.currentStep + 1 <= this.numSteps);
-            var lastStep = (this.currentStep === this.numSteps);
-            var canMovePrev = (this.currentStep > 1);
-            var firstStep = (this.currentStep === 1);
-
-            // disable buttons based on current step
-            this.$prevBtn.attr('disabled', (firstStep === true || canMovePrev === false));
-            this.$nextBtn.attr('disabled', (lastStep === true || canMoveNext === false));
-
-            // change button text of last step, if specified
-            var data = this.$nextBtn.data();
-            if(data && data.last) {
-                this.lastText = data.last;
-                if(typeof this.lastText !== 'undefined') {
-                    var text = (lastStep !== true) ? this.nextText : this.lastText;
-                     this.$nextBtn
-                     .contents()
-                     .filter(function() {
-                     return this.nodeType === 3;
-                     }).replaceWith(text);
-                }
-            }
-
-            // reset classes for all steps
-            var $steps = this.$element.find('li');
-            $steps.removeClass('active').removeClass('complete');
-            $steps.find('span.badge').removeClass('badge-info').removeClass('badge-success');
-
-            // set class for all previous steps
-            var prevSelector = 'li:lt(' + (this.currentStep - 1) + ')';
-            var $prevSteps = this.$element.find(prevSelector);
-            $prevSteps.addClass('complete');
-            $prevSteps.find('span.badge').addClass('badge-success');
-
-            // set class for current step
-            var currentSelector = 'li:eq(' + (this.currentStep - 1) + ')';
-            var $currentStep = this.$element.find(currentSelector);
-            $currentStep.addClass('active');
-            $currentStep.find('span.badge').addClass('badge-info');
-
-            // set display of target element
-            var target = $currentStep.data().target;
-            $('.step-pane').removeClass('active');
-            $(target).addClass('active');
-
-            this.$element.trigger('changed');
-        },
-
-        stepclicked: function(e) {
-            var li = $(e.currentTarget);
-
-            var index = $('.steps li').index(li);
-            this.currentStep = (index + 1);
-            this.setState();
-        },
-
-        previous: function() {
-            var canMovePrev = (this.currentStep > 1);
-            if(canMovePrev) {
-                var e = $.Event('change');
-                this.$element.trigger(e, {step:this.currentStep, direction:'previous'});
-                if (e.isDefaultPrevented()) return;
-
-                this.currentStep -= 1;
-                this.setState();
-            }
-        },
-
-        next: function() {
-            var canMoveNext = (this.currentStep + 1 <= this.numSteps);
-            if(canMoveNext) {
-                var e = $.Event('change');
-                this.$element.trigger(e, {step:this.currentStep, direction:'next'});
-
-                if (e.isDefaultPrevented()) return;
-
-                this.currentStep += 1;
-                this.setState();
-            }
-        },
-
-        selectedItem: function(val) {
-            return {
-                step: this.currentStep
-            };
-        }
-    };
-
-
-    // WIZARD PLUGIN DEFINITION
-
-    $.fn.wizard = function (option,value) {
-        var methodReturn;
-
-        var $set = this.each(function () {
-            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);
-        });
-
-        return (methodReturn === undefined) ? $set : methodReturn;
-    };
-
-    $.fn.wizard.defaults = {};
-
-    $.fn.wizard.Constructor = Wizard;
-
-
-    // WIZARD DATA-API
-
-    $(function () {
-        $('body').on('mousedown.wizard.data-api', '.wizard', function () {
-            var $this = $(this);
-            if ($this.data('wizard')) return;
-            $this.wizard($this.data());
-        });
-    });
+	// WIZARD CONSTRUCTOR AND PROTOTYPE
+
+	var Wizard = function (element, options) {
+		this.$element = $(element);
+		this.options = $.extend({}, $.fn.wizard.defaults, options);
+		this.currentStep = 1;
+		this.numSteps = this.$element.find('li').length;
+		this.$prevBtn = this.$element.find('button.btn-prev');
+		this.$nextBtn = this.$element.find('button.btn-next');
+		this.nextText = this.$nextBtn.text();
+
+		// handle events
+		this.$prevBtn.on('click', $.proxy(this.previous, this));
+		this.$nextBtn.on('click', $.proxy(this.next, this));
+		this.$element.on('click', 'li.complete', $.proxy(this.stepclicked, this));
+	};
+
+	Wizard.prototype = {
+
+		constructor: Wizard,
+
+		setState: function () {
+			var canMovePrev = (this.currentStep > 1);
+			var firstStep = (this.currentStep === 1);
+			var lastStep = (this.currentStep === this.numSteps);
+
+			// disable buttons based on current step
+			this.$prevBtn.attr('disabled', (firstStep === true || canMovePrev === false));
+
+			// change button text of last step, if specified
+			var data = this.$nextBtn.data();
+			if (data && data.last) {
+				this.lastText = data.last;
+				if (typeof this.lastText !== 'undefined') {
+					// replace text
+					var text = (lastStep !== true) ? this.nextText : this.lastText;
+					this.$nextBtn
+						.contents()
+						.filter(function () {
+							return this.nodeType === 3;
+						}).replaceWith(text);
+				}
+			}
+
+			// reset classes for all steps
+			var $steps = this.$element.find('li');
+			$steps.removeClass('active').removeClass('complete');
+			$steps.find('span.badge').removeClass('badge-info').removeClass('badge-success');
+
+			// set class for all previous steps
+			var prevSelector = 'li:lt(' + (this.currentStep - 1) + ')';
+			var $prevSteps = this.$element.find(prevSelector);
+			$prevSteps.addClass('complete');
+			$prevSteps.find('span.badge').addClass('badge-success');
+
+			// set class for current step
+			var currentSelector = 'li:eq(' + (this.currentStep - 1) + ')';
+			var $currentStep = this.$element.find(currentSelector);
+			$currentStep.addClass('active');
+			$currentStep.find('span.badge').addClass('badge-info');
+
+			// set display of target element
+			var target = $currentStep.data().target;
+			$('.step-pane').removeClass('active');
+			$(target).addClass('active');
+
+			this.$element.trigger('changed');
+		},
+
+		stepclicked: function (e) {
+			var li = $(e.currentTarget);
+
+			var index = $('.steps li').index(li);
+			this.currentStep = (index + 1);
+			this.setState();
+		},
+
+		previous: function () {
+			var canMovePrev = (this.currentStep > 1);
+			if (canMovePrev) {
+				var e = $.Event('change');
+				this.$element.trigger(e, {step: this.currentStep, direction: 'previous'});
+				if (e.isDefaultPrevented()) return;
+
+				this.currentStep -= 1;
+				this.setState();
+			}
+		},
+
+		next: function () {
+			var canMoveNext = (this.currentStep + 1 <= this.numSteps);
+			var lastStep = (this.currentStep === this.numSteps);
+
+			if (canMoveNext) {
+				var e = $.Event('change');
+				this.$element.trigger(e, {step: this.currentStep, direction: 'next'});
+
+				if (e.isDefaultPrevented()) return;
+
+				this.currentStep += 1;
+				this.setState();
+			}
+			else if (lastStep) {
+				this.$element.trigger('finished');
+			}
+		},
+
+		selectedItem: function (val) {
+			return {
+				step: this.currentStep
+			};
+		}
+	};
+
+
+	// WIZARD PLUGIN DEFINITION
+
+	$.fn.wizard = function (option, value) {
+		var methodReturn;
+
+		var $set = this.each(function () {
+			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);
+		});
+
+		return (methodReturn === undefined) ? $set : methodReturn;
+	};
+
+	$.fn.wizard.defaults = {};
+
+	$.fn.wizard.Constructor = Wizard;
+
+
+	// WIZARD DATA-API
+
+	$(function () {
+		$('body').on('mousedown.wizard.data-api', '.wizard', function () {
+			var $this = $(this);
+			if ($this.data('wizard')) return;
+			$this.wizard($this.data());
+		});
+	});
 
-}(window.jQuery);
+}(window.jQuery);  

data/vendor/toolkit/fuelux/checkbox.less

@@ -4,7 +4,7 @@
 	}
 
 	i {
-		background-image: url(../img/form.png);
+		background-image: url(image-path('form.png'));
 		background-position: 0 1px;
 		background-repeat: no-repeat;
 		margin-left: -20px;

data/vendor/toolkit/fuelux/datagrid.less

@@ -95,4 +95,48 @@
 
 	}
 
-}
+}
+
+.datagrid-stretch-header {
+	border-bottom: 0;
+	.border-bottom-radius(0);
+
+	margin-bottom: 0;
+
+	thead:last-child tr:last-child > th:first-child,
+	thead:last-child tr:last-child > th:last-child {
+		.border-bottom-radius(0);
+	}
+}
+
+.datagrid-stretch-wrapper {
+	border: 1px solid @tableBorder;
+	overflow: auto;
+
+	.datagrid {
+		border: none;
+		border-collapse: collapse;
+		.border-radius(0);
+
+		margin-bottom: 0;
+
+		td, th {
+			border-bottom: 1px solid @tableBorder;
+
+			&:first-child {
+				border-left: none;
+				.border-radius(0);
+			}
+		}
+	}
+}
+
+.datagrid-stretch-footer {
+	border-top: 0;
+	.border-top-radius(0);
+
+	th {
+		border-top: 0;
+	}
+}
+

data/vendor/toolkit/fuelux/radio.less

@@ -49,4 +49,4 @@
 			}
 		}
 	}
-}
+}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fuelux-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0.beta.1
-  prerelease: 6
+  version: 2.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Stephen Baldwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -182,9 +182,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: fuelux-rails
 rubygems_version: 1.8.24