combo_auto_box 0.0.7 → 0.0.8

data/lib/combo_auto_box/version.rb

@@ -1,3 +1,3 @@
 module ComboAutoBox
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/vendor/assets/javascripts/combo-auto-box.js

@@ -4,7 +4,7 @@ var ComboAutoBox = {
 		// generatea an ID based on current time
 		var generateShortId = function(prefix) {
 			var now = 0;
-			while ($("#" + prefix +"-" + now).length != 0) {
+			while ($('input[name*="[' + prefix +"-" + now + ']"]').length != 0) {
 				now++;
 			}
 	
@@ -46,7 +46,17 @@ var ComboAutoBox = {
 						addItem(inputId, $('#' + inputId).val(), $('#' + inputId).val());
 						selectData($('#' + inputId).val());
 						$('#' + inputId).val('');
-					} 
+					} else if ((options.type == 'searchable') && ($('#' + inputId).val()) != '') {
+						try {
+							var item = sourceForSearchable(inputId)[0];
+							addSearchableItemForRansack(inputId, item.id, item.label);
+							selectData(item.id);
+							$('#' + inputId).val('');
+							$('#' + inputId).autocomplete('close');
+						} catch (error) {
+							
+						}
+					}
 					return false;
 				}
 			});
@@ -89,17 +99,7 @@ var ComboAutoBox = {
 		// set autocomplete source
 		var setAutoCompleteSource = function (inputId) {
 			if (options.type == 'searchable') {
-				var new_source = new Array();
-				var operators = i18nMath(options.lang);
-				$.each(options.source, function(i){
-					validIndexes = validSource(options.source[i]);
-					$.each(operators, function(j){
-						if (validIndexes.indexOf(j) >= 0) {
-							new_source.push( { id: options.source[i]['id'] + '_' + operators[j]['id'], label: options.source[i]['label'] + ' ' + operators[j]['label'] + ' ' + $('#' + inputId).val()} );
-						}
-					});
-				});
-				return new_source;
+				return sourceForSearchable(inputId);
 			} else if (typeof options.source == 'string') {
 				return function(request, response) {
 					var term = 'term=' + $('#' + inputId).val();
@@ -110,6 +110,21 @@ var ComboAutoBox = {
 				return options.source;
 			}
 		};
+		
+		// source items for searchable
+		var sourceForSearchable = function (inputId) {
+			var new_source = new Array();
+			var operators = i18nMath(options.lang);
+			$.each(options.source, function(i){
+				validIndexes = validSource(options.source[i]);
+				$.each(operators, function(j){
+					if (validIndexes.indexOf(j) >= 0) {
+						new_source.push( { id: options.source[i]['id'] + '_' + operators[j]['id'], label: options.source[i]['label'] + ' ' + operators[j]['label'] + ' ' + $('#' + inputId).val()} );
+					}
+				});
+			});
+			return new_source;			
+		}
 	
 		// get i18n math comparisons
 		var i18nMath = function (language) {
@@ -283,7 +298,7 @@ var ComboAutoBox = {
 		var addItem = function (inputId, selectedId, selectedData) {
 			if (selectedData != '') {
 				var id = generateAnId('item');
-				$('#' + inputId).before('<div class="item" title="Remove Item" id="' + id + '">'+ selectedData +'<span>x</span><input type="hidden" name="'+ options.html.name +'[]" value="'+ selectedId +'"></div>');
+				$('#' + inputId).before('<div class="item" id="' + id + '">'+ selectedData +'<span title="Remove Item">x</span><input type="hidden" name="'+ options.html.name +'[]" value="'+ selectedId +'"></div>');
 	
 				$('#' + id + ' > span').click(function() {
 					$(this).parent().remove();
@@ -304,7 +319,7 @@ var ComboAutoBox = {
 				fieldCondition = '<input type="hidden" name="q[g]['+ predicate['attribute'] +'][c]['+ ransackId +'][p]"           value="'+ predicate['condition'] +'">';
 				fieldValue =     '<input type="hidden" name="q[g]['+ predicate['attribute'] +'][c]['+ ransackId +'][v][0][value]" value="'+ getSearchableValue(selectedData) +'">';
 				var id = generateAnId('item');
-				$('#' + inputId).before('<div class="item" title="Remove Item" id="' + id + '">'+ selectedData +'<span>x</span>'+ fieldAttribute + fieldCondition + fieldValue +'</div>');
+				$('#' + inputId).before('<div class="item" id="' + id + '">'+ selectedData +'<span title="Remove Item">x</span>'+ fieldAttribute + fieldCondition + fieldValue +'</div>');
 	
 				$('#' + id + ' > span').click(function() {
 					$(this).parent().remove();
@@ -317,7 +332,7 @@ var ComboAutoBox = {
 		var addSearchableItem = function (inputId, selectedId, selectedData) {			
 			if (selectedData != '') {
 				var id = generateAnId('item');
-				$('#' + inputId).before('<div class="item" title="Remove Item" id="' + id + '">'+ selectedData +'<span>x</span><input type="hidden" name="'+ options.html.name +'['+ selectedId +'][]" value="'+ getSearchableValue(selectedData) +'"></div>');
+				$('#' + inputId).before('<div class="item" id="' + id + '">'+ selectedData +'<span title="Remove Item">x</span><input type="hidden" name="'+ options.html.name +'['+ selectedId +'][]" value="'+ getSearchableValue(selectedData) +'"></div>');
 	
 				$('#' + id + ' > span').click(function() {
 					$(this).parent().remove();
@@ -376,6 +391,11 @@ var ComboAutoBox = {
 				$('#' + inputId).focus();
 			});			
 		};
+		
+		var normalizeStyles = function(inputId) {
+			$('#' + container).css('background-color', $('#' + inputId).css('background-color'));
+			$('#' + inputId).css('border', '0px');
+		}
 			
 		// on select data
 		var selectData = function (selectedData) {
@@ -455,6 +475,7 @@ var ComboAutoBox = {
 	
 		if ((options.type == 'multiple') || (options.type == 'searchable')) {
 			bindContainerClick(textField.attr('id'));
+			normalizeStyles(textField.attr('id'));
 		}
 		
 		if ((options.type == 'multiple') && (options.initials != null)) {

data/vendor/assets/stylesheets/combo-auto-box.css

@@ -2,17 +2,21 @@ span.combo-auto-box-item-id { display:none; }
 div.container-combo-auto-box span.simple { position:absolute;cursor:pointer;display:block;margin:0px 0px 0px 0px; width:20px; }
 div.container-combo-auto-box span.simple i{ background-image:url(/assets/combo_auto_box_expand.png);width:19px;height:19px;display:block;font-size:0; }
 
-div.multiple { border: 1px solid #CDCDCD; display:table; }
+div.multiple { border: 1px solid #CDCDCD; display:table; width:100%; }
+div.multiple:hover {cursor:text}
 div.multiple span.multiple { font-family: arial,sans-serif; float:left; font-size: 13px; color:#9A9A9A; margin: 2px 2px 2px 2px; padding:2px 10px 2px 10px; }
 div.multiple input { border: 0px; float:left; height:22px; }
 div.multiple div.item { font-family: arial,sans-serif; float:left; font-size: 13px; color:#000000; background-color:#EDEDED; margin: 2px 10px 2px 2px; padding:2px 10px 2px 10px; -moz-border-radius:4px;-webkit-border-radius:4px; border:1px solid #CECECE; }
+div.multiple div.item:hover { cursor:default; }
 div.multiple div.item span { margin-left:10px; color:#CCCCCC; }
 div.multiple div.item span:hover { color:#9A9A9A; cursor:pointer;}
 div.multiple input:focus {outline:none; }
 
-div.searchable { border: 1px solid #CDCDCD; display:table; }
+div.searchable { border: 1px solid #CDCDCD; display:table; width:100%; }
+div.searchable:hover {cursor:text}
 div.searchable input { border: 0px; float:left; height:22px; }
 div.searchable div.item { font-family: arial,sans-serif; float:left; font-size: 13px; color:#FFFFFF; background-color:#008000; margin: 2px 10px 2px 2px; padding:2px 10px 2px 10px; -moz-border-radius:4px;-webkit-border-radius:4px; border:1px solid #ECECEC; }
+div.searchable div.item:hover { cursor:default; }
 div.searchable div.item span { margin-left:10px; color:#CCCCCC; }
 div.searchable div.item span:hover { color:#FFFFFF; cursor:pointer;}
 div.searchable input:focus {outline:none; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combo_auto_box
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport