combo_auto_box 0.0.19 → 0.0.20

data/lib/combo_auto_box/version.rb

@@ -1,3 +1,3 @@
 module ComboAutoBox
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 end

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

@@ -211,15 +211,27 @@ var ComboAutoBox = {
 			}
 		
 			spanTag = $('#' + container + ' > div.container-combo-auto-box > span.simple');
-			var paddingRight = 1;
-			try {
-				paddingRight = parseInt(textField.css('padding-right').replace(/px/, ''));
-			} catch (error) {
-				paddingRight = 1;
+			
+			inputWidth = getTextFieldWidth(textField);
+			inputHeight = getTextFieldHeight(textField);
+
+			inputBorderTop = getTextFieldBorder(textField, 'top');
+			inputBorderBottom = getTextFieldBorder(textField, 'bottom');
+
+			if (inputHeight % 2 != 0) {
+				inputBorderTop = inputBorderTop + 2;
 			}
-			spanTag.css('margin', '3px 0px 0px ' + (getTextFieldWidth(textField) - 13).toString() + 'px');
 			
-			spanTag.children(':first').css('height', (getTextFieldHeight(textField) - 10).toString() + 'px');
+			iWidth = 20;
+			if (inputWidth < 20) {
+				iWidth = 10;
+			}
+			
+			spanTag.css('margin-top', inputBorderTop.toString() + 'px');
+			spanTag.css('margin-left', (inputWidth - iWidth + 4).toString() + 'px');
+
+			spanTag.children(':first').css('width', iWidth.toString() + 'px');
+			spanTag.children(':first').css('height', inputHeight.toString() + 'px');
 		
 			return true;
 		}
@@ -239,9 +251,21 @@ var ComboAutoBox = {
 			return widthTotal;
 		}
 		
+		var getTextFieldBorder = function (textField, side) {
+			var heightTotal = 0;
+
+			var matched = textField.css('border-' + side).match(/(\d+)(px)/);
+			try {
+				heightTotal = heightTotal + parseInt(matched[1]);
+			} catch (error) {
+			}
+
+			return heightTotal;
+		}
+		
 		var getTextFieldHeight = function (textField) {
 			var heightTotal = 0;
-			
+
 			if (textField.height() != null) {
 				heightTotal = heightTotal + textField.height();
 			}

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

@@ -1,7 +1,6 @@
 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.container-combo-auto-box span.simple i { background:url(/assets/dark-grey-disclosure-arrow-down.png) no-repeat center;width:4px;height:5px;display:block;padding: 3px 6px 7px 6px; background-color:#EFEFEF;}
+div.container-combo-auto-box span.simple { position:absolute;cursor:pointer;display:block;margin:0px 0px 0px 0px; }
+div.container-combo-auto-box span.simple i { background:url(/assets/dark-grey-disclosure-arrow-down.png) no-repeat center;display:block;background-color:#EFEFEF;}
 div.container-combo-auto-box span.simple i:hover { background:url(/assets/light-grey-disclosure-arrow-down.png) no-repeat center; background-color:#EFEFEF;}
 
 div.multiple { border: 1px solid #CDCDCD; display:table; width:100%; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combo_auto_box
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport