forked from 0x2620/oxjs
add Ox.Editable
This commit is contained in:
parent
f9360db0b4
commit
db4b33cf24
6 changed files with 121 additions and 48 deletions
|
|
@ -47,6 +47,7 @@ Ox.Input <f:Ox.Element> Input Element
|
|||
//trackStep <n> number, 0 for 'scroll here', positive for step
|
||||
trackValues <b> boolean
|
||||
serialize <f> function used to serialize value in submit
|
||||
style <s> 'rounded' or 'square'
|
||||
textAlign <s> 'left', 'center' or 'right'
|
||||
type <s> 'float', 'int', 'password', 'text', 'textarea'
|
||||
value <s> string
|
||||
|
|
@ -76,6 +77,7 @@ Ox.Input = function(options, self) {
|
|||
clear: false,
|
||||
decimals: 0,
|
||||
disabled: false,
|
||||
height: 16,
|
||||
key: '',
|
||||
min: -Infinity,
|
||||
max: Infinity,
|
||||
|
|
@ -568,13 +570,16 @@ Ox.Input = function(options, self) {
|
|||
}
|
||||
// fixme: for some reason, if options.type is set, no change event fires
|
||||
// as a workaround, blur sends a value. remove later...
|
||||
that.triggerEvent('blur', {
|
||||
!self.cancelled && that.triggerEvent('blur', {
|
||||
value: self.options.value
|
||||
});
|
||||
}
|
||||
|
||||
function cancel() {
|
||||
self.$input.blur();
|
||||
self.cancelled = true;
|
||||
self.$input.blur().val(self.originalValue);
|
||||
self.cancelled = false;
|
||||
that.triggerEvent('cancel');
|
||||
}
|
||||
|
||||
function change() {
|
||||
|
|
@ -648,6 +653,7 @@ Ox.Input = function(options, self) {
|
|||
) {
|
||||
return;
|
||||
}
|
||||
self.originalValue = self.options.value;
|
||||
that.gainFocus();
|
||||
that.is('.OxError') && that.removeClass('OxError');
|
||||
self.options.placeholder && setPlaceholder();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue