fuelux-rails 2.1.02 → 2.1.3

data/lib/fuelux-rails/version.rb

@@ -1,3 +1,3 @@
 module FueluxRails
-  VERSION = "2.1.02"
+  VERSION = "2.1.3"
 end

data/vendor/assets/javascripts/fuelux.js

@@ -1,3 +1,4 @@
+//= require fuelux/combobox
 //= require fuelux/datagrid
 //= require fuelux/pillbox
 //= require fuelux/search

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

@@ -0,0 +1,67 @@
+/*
+ * Fuel UX Combobox
+ * https://github.com/ExactTarget/fuelux
+ *
+ * Copyright (c) 2012 ExactTarget
+ * Licensed under the MIT license.
+ */
+
+!function($){
+
+
+	// COMBOBOX CONSTRUCTOR AND PROTOTYPE
+
+	var Combobox = function (element, options) {
+		this.$element = $(element);
+		this.options = $.extend({}, $.fn.combobox.defaults, options);
+		this.$element.on('click', 'a', $.proxy(this.itemclicked, this));
+		this.$input = this.$element.find('input');
+	};
+
+	Combobox.prototype = {
+
+		constructor: Combobox,
+
+		select: function (val) {
+			this.$input.val(val).change();
+			return this;
+		},
+
+		itemclicked: function (e) {
+			this.select($(e.target).text());
+			$('body').click();
+			e.preventDefault();
+		}
+
+	};
+
+
+	// COMBOBOX PLUGIN DEFINITION
+
+	$.fn.combobox = function (option) {
+		return this.each(function () {
+			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') data[option]();
+		});
+	};
+
+	$.fn.combobox.defaults = {};
+
+	$.fn.combobox.Constructor = Combobox;
+
+
+	// COMBOBOX DATA-API
+
+	$(function () {
+		$('body').on('mousedown.combobox.data-api', '.combobox', function (e) {
+			var $this = $(this);
+			if ($this.data('combobox')) return;
+			$this.combobox($this.data());
+		});
+	});
+
+}(window.jQuery);

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

@@ -6,7 +6,8 @@
  * Licensed under the MIT license.
  */
 
-!function ($) {
+!function($){
+
 
 	// DATAGRID CONSTRUCTOR AND PROTOTYPE
 

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

@@ -2874,6 +2874,7 @@ define('fuelux/search',['require','jquery'],function(require) {
 		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.$icon = this.$element.find('i');
 		this.activeSearch = '';
@@ -2913,6 +2914,12 @@ define('fuelux/search',['require','jquery'],function(require) {
 			this.action();
 		},
 
+		keypress: function (e) {
+			if (e.which === 13) {
+				e.preventDefault();
+			}
+		},
+
 		keypressed: function (e) {
 			var val, inputPresentAndUnchanged;
 

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

@@ -6,8 +6,7 @@
  * Licensed under the MIT license.
  */
 
-!function ($) {
-
+!function($){
 
 	// PILLBOX CONSTRUCTOR AND PROTOTYPE
 
@@ -67,4 +66,3 @@
 	});
 	
 }(window.jQuery);
-

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

@@ -6,7 +6,7 @@
  * Licensed under the MIT license.
  */
 
-!function ($) {
+!function($){
 
 
 	// SEARCH CONSTRUCTOR AND PROTOTYPE
@@ -15,6 +15,7 @@
 		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.$icon = this.$element.find('i');
 		this.activeSearch = '';
@@ -54,6 +55,12 @@
 			this.action();
 		},
 
+		keypress: function (e) {
+			if (e.which === 13) {
+				e.preventDefault();
+			}
+		},
+
 		keypressed: function (e) {
 			var val, inputPresentAndUnchanged;
 

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

@@ -6,7 +6,7 @@
  * Licensed under the MIT license.
  */
 
-!function ($) {
+!function($){
 
 
 	// SPINNER CONSTRUCTOR AND PROTOTYPE
@@ -181,4 +181,3 @@
 	});
 
 }(window.jQuery);
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuelux-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.02
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -105,6 +105,7 @@ files:
 - lib/fuelux-rails.rb
 - lib/generators/fuelux/install_generator.rb
 - lib/tasks/fuelux-rails_tasks.rake
+- vendor/assets/javascripts/fuelux/combobox.js
 - vendor/assets/javascripts/fuelux/datagrid.js
 - vendor/assets/javascripts/fuelux/loader.js
 - vendor/assets/javascripts/fuelux/pillbox.js