From 6682aa999939c0b8b86549adcb7555329cb3ebad Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 10 May 2014 15:10:54 +0200 Subject: [PATCH] Input: support 'squared' style --- source/Ox.UI/js/Form/Input.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/Ox.UI/js/Form/Input.js b/source/Ox.UI/js/Form/Input.js index e0d2cd01..22d21c8e 100644 --- a/source/Ox.UI/js/Form/Input.js +++ b/source/Ox.UI/js/Form/Input.js @@ -260,6 +260,7 @@ Ox.Input = function(options, self) { if (self.options.clear) { self.$button = Ox.Button({ overlap: 'left', + style: self.options.style, title: 'close', tooltip: self.options.clearTooltip, type: 'image' @@ -792,7 +793,7 @@ Ox.Input = function(options, self) { - (self.options.arrows ? 32 : 0) - (self.options.clear ? 16 : 0) - (self.options.label ? self.options.labelWidth : 0) - - (self.options.style == 'rounded' ? 14 : 6); + - (Ox.contains(['rounded', 'squared'], self.options.style) ? 14 : 6); } function insert() {