combo_auto_box 0.0.30 → 0.0.31

data/lib/combo_auto_box/version.rb

@@ -1,3 +1,3 @@
 module ComboAutoBox
-  VERSION = '0.0.30'
+  VERSION = '0.0.31'
 end

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

@@ -293,7 +293,7 @@ var ComboAutoBox = {
 			    html = html + ' id="' + generateAnId('combo-auto-box') + '"';
 			}
 			
-			if (options.bootstrap) {
+			if ((options.bootstrap) && (options.type == "simple")) {
 				html = html + ' class="form-control" '
 			}
 	
@@ -309,12 +309,12 @@ var ComboAutoBox = {
 		        	return '<span class="simple" title="' + i18nShowSearchOptions(options.lang) + '"><i></i></span>';
 				}
 			} else if (options.type == 'multiple') {
-		        	return '<span class="multiple">' + options.label + ':</span>';
+		        return '<span class="multiple">' + options.label + ':</span>';
 			}
 		};
 	
 		var adjustExpanderImage = function() {
-			if (options.bootstrap) {
+			if ((options.bootstrap) && (options.type == "simple")) {
 				return true;
 			}
 			
@@ -416,7 +416,10 @@ var ComboAutoBox = {
 		var generateDivTag = function () {
 			var klass = 'container-combo-auto-box'
 			if (options.type == 'multiple') {
-				klass =  klass + ' multiple'
+				if (options.bootstrap) {
+					klass = klass + '-bootstrap';
+				}
+				klass =  klass + ' multiple';
 			} else if (options.type == 'searchable') {
 				klass =  klass + ' searchable'				
 			} else if ((options.type == 'simple') && (options.bootstrap)) {
@@ -446,19 +449,19 @@ var ComboAutoBox = {
 		
 			$("#" + modalDialogId).siblings('div.ui-dialog-titlebar').remove();
 		
-			if ((options.type == 'simple') && (options.bootstrap)) {
-				$('#' + container + ' > div.container-combo-auto-box-bootstrap > span > button').click(function() { 
-					openModalDialog(modalDialogId) 
-				});				
-			} else {
-				$('#' + container + ' > div.container-combo-auto-box > span.' + options.type).click(function() { 
-					openModalDialog(modalDialogId) 
-				});
-			}
+			$('#' + container + ' > div.container-combo-auto-box > span.' + options.type).click(function() { 
+				openModalDialog(modalDialogId) 
+			});
 		};
 	
 		// dialog modal
 		var generateBootstrapDialogModal = function (modalDialogId) {
+			var targetObject = ('#' + container + ' > div.container-combo-auto-box-bootstrap > span');
+			
+			if (options.type == "simple") {
+				targetObject = targetObject + ' > button';
+			}
+
 			modal = '<div class="modal fade" id="' + modalDialogId + '" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">' +
 			  '<div class="modal-dialog">' +
 			    '<div class="modal-content">' +
@@ -477,7 +480,7 @@ var ComboAutoBox = {
 			
 			getListForModalDialog(modalDialogId);
 		
-			$('#' + container + ' > div.container-combo-auto-box-bootstrap > span > button').click(function() { 
+			$(targetObject).click(function() { 
 				$('#' + modalDialogId).modal('show');
 			});				
 		};
@@ -554,9 +557,9 @@ var ComboAutoBox = {
 					$('#' + container + ' > div.container-combo-auto-box-bootstrap > input').val(thisLabel);
 					selectData(thisId, thisLabel);
 				} else if (options.type == 'multiple') {
-					$('#' + container + ' > div.container-combo-auto-box > input').val('');
-					addMultipleItem($('#' + container + ' > div.container-combo-auto-box > input').attr('id'), thisId, thisLabel);
-					$('#' + container + ' > div.container-combo-auto-box > input[type="text"]').focus();
+					$('#' + container + ' > div.container-combo-auto-box-bootstrap > input').val('');
+					addMultipleItem($('#' + container + ' > div.container-combo-auto-box-bootstrap > input').attr('id'), thisId, thisLabel);
+					$('#' + container + ' > div.container-combo-auto-box-bootstrap > input[type="text"]').focus();
 					selectData(thisId, thisLabel);
 				}
 				
@@ -573,7 +576,11 @@ var ComboAutoBox = {
 		// starting generate modial dialog
 		var generateModalDialog = function (textField) {
 			if (options.bootstrap) {
-				$(generateExpander()).appendTo('#' + container + ' > div.container-combo-auto-box-bootstrap');
+				if (options.type == 'simple') {
+					$(generateExpander()).appendTo('#' + container + ' > div.container-combo-auto-box-bootstrap');					
+				} else {
+					$(generateExpander()).prependTo('#' + container + ' > div.container-combo-auto-box-bootstrap');					
+				}
 				generateBootstrapDialogModal(generateAnId('model-dialog'));
 			} else {
 				$(generateExpander()).prependTo('#' + container + ' > div.container-combo-auto-box');

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

@@ -0,0 +1,21 @@
+span.combo-auto-box-item-id { display:none; }
+
+div.multiple { border: 1px solid #CDCDCD; display:table; width:100%; padding: 6px 6px; }
+div.multiple:hover {cursor:text}
+div.multiple span.multiple { font-family: inherit; float:left; font-size: 18px; color:#9A9A9A; margin: 1px 2px 2px 2px; padding:2px 10px 2px 10px; vertical-align: middle; }
+div.multiple span.multiple:hover { cursor:pointer; }
+div.multiple input { border: 0px; float:left; min-height:25px; font-size:15px; margin-top:2px; }
+div.multiple input:focus { outline:none; }
+div.multiple div.item { font-family: arial,sans-serif; float:left; font-size: 15px; color:#000000; background-color:#EDEDED; margin: 2px 10px 2px 2px; padding:2px 10px 2px 10px; border-radius: .25em; vertical-align: baseline; display:inline; white-space: nowrap; }
+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.searchable { border: 1px solid #CDCDCD; display:table; width:100%; padding: 6px 6px; }
+div.searchable:hover {cursor:text}
+div.searchable input { border: 0px; float:left; min-height:25px; font-size:15px; margin-top:2px; }
+div.searchable input:focus { outline:none; }
+div.searchable div.item { font-family: inherit; float:left; font-size: 15px; color:#FFFFFF; background-color:#008000; margin: 2px 10px 2px 2px; padding:2px 10px 2px 10px; border-radius: .25em; vertical-align: baseline; display:inline; white-space: nowrap; }
+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;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combo_auto_box
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -43,6 +43,7 @@ files:
 - vendor/assets/images/dark-grey-disclosure-arrow-down.png
 - vendor/assets/images/light-grey-disclosure-arrow-down.png
 - vendor/assets/javascripts/combo-auto-box.js
+- vendor/assets/stylesheets/combo-auto-box-bootstrap.css
 - vendor/assets/stylesheets/combo-auto-box.css
 - spec/combo_auto_box_spec.rb
 - spec/database.yml