forked from 0x2620/oxjs
various improvements in OxJS and OxUI
This commit is contained in:
parent
74b9a25387
commit
7380595c7e
48 changed files with 184 additions and 161 deletions
|
|
@ -14,7 +14,7 @@ Ox.Button = function(options, self) {
|
|||
*/
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('input', self)
|
||||
that = new Ox.Element('<input>', self)
|
||||
.defaults({
|
||||
disabled: false,
|
||||
group: false,
|
||||
|
|
@ -117,7 +117,7 @@ Ox.Button = function(options, self) {
|
|||
}
|
||||
}
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
if (key == 'disabled') {
|
||||
that.attr({
|
||||
disabled: value ? 'disabled' : ''
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ Ox.Checkbox = function(options, self) {
|
|||
*/
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
disabled: false,
|
||||
id: '',
|
||||
|
|
@ -85,7 +85,7 @@ Ox.Checkbox = function(options, self) {
|
|||
!self.options.disabled && self.$button.trigger('click');
|
||||
}
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
if (key == 'checked') {
|
||||
that.toggleChecked();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Ox.CheckboxGroup = function(options, self) {
|
|||
*/
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
checkboxes: [],
|
||||
max: 1,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Ox.ColorPicker = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
id: '',
|
||||
value: '0, 0, 0'
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Ox.Filter = function(options, self) {
|
|||
***/
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
findKeys: [],
|
||||
query: {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Ox.Form = function(options, self) {
|
|||
*/
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
error: '',
|
||||
id: '',
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Ox.FormElementGroup = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
id: '',
|
||||
elements: [],
|
||||
|
|
@ -49,7 +49,7 @@ Ox.FormElementGroup = function(options, self) {
|
|||
|
||||
}
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Ox.FormItem = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
element: null,
|
||||
error: '',
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ Ox.Input = function(options, self) {
|
|||
*/
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
arrows: false,
|
||||
arrowStep: 1,
|
||||
|
|
@ -701,7 +701,7 @@ Ox.Input = function(options, self) {
|
|||
});
|
||||
}
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
var inputWidth, val;
|
||||
if (['autocomplete', 'autocompleteReplace', 'autocompleteSelect', 'autovalidate'].indexOf(key) > -1) {
|
||||
if (self.options.autocomplete && self.options.autocompleteSelect) {
|
||||
|
|
@ -806,7 +806,7 @@ Ox.Input_ = function(options, self) {
|
|||
*/
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
autocomplete: null,
|
||||
autocorrect: null,
|
||||
|
|
@ -1217,7 +1217,7 @@ Ox.Input_ = function(options, self) {
|
|||
);
|
||||
}
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
if (key == 'height') {
|
||||
height(value);
|
||||
} else if (key == 'width') {
|
||||
|
|
@ -1537,7 +1537,7 @@ Ox.InputElement_ = function(options, self) {
|
|||
|
||||
}
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
if (key == 'placeholder') {
|
||||
that.$element.hasClass('OxPlaceholder') && that.$element.val(value);
|
||||
} else if (key == 'value') {
|
||||
|
|
@ -1753,7 +1753,7 @@ Ox.Range_ = function(options, self) {
|
|||
shared functions
|
||||
*/
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ Ox.InputGroup = function(options, self) {
|
|||
***/
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
id: '',
|
||||
inputs: [],
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Ox.Label = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
disabled: false,
|
||||
id: '',
|
||||
|
|
@ -24,7 +24,7 @@ Ox.Label = function(options, self) {
|
|||
}))
|
||||
.html(self.options.title);
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
if (key == 'title') {
|
||||
that.html(value);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Ox.Picker = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self)
|
||||
that = new Ox.Element({}, self)
|
||||
.defaults({
|
||||
element: null,
|
||||
elementHeight: 128,
|
||||
|
|
@ -20,7 +20,7 @@ Ox.Picker = function(options, self) {
|
|||
.click(showMenu)
|
||||
.appendTo(that);
|
||||
|
||||
self.$menu = new Ox.Element('div')
|
||||
self.$menu = new Ox.Element({})
|
||||
.addClass('OxPicker')
|
||||
.css({
|
||||
width: self.options.elementWidth + 'px',
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ Ox.PlacePicker = function(options, self) {
|
|||
}),
|
||||
that;
|
||||
|
||||
self.$element = new Ox.Element('div')
|
||||
self.$element = new Ox.Element({})
|
||||
.css({
|
||||
width: '256px',
|
||||
height: '192px'
|
||||
|
|
@ -33,7 +33,7 @@ Ox.PlacePicker = function(options, self) {
|
|||
)
|
||||
)
|
||||
.append(
|
||||
self.$container = new Ox.Element('div')
|
||||
self.$container = new Ox.Element({})
|
||||
.css({
|
||||
width: '256px',
|
||||
height: '160px'
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ Ox.Range = function(options, self) {
|
|||
}
|
||||
}
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
if (key == 'size') {
|
||||
setSizes();
|
||||
} else if (key == 'trackColors') {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Ox.Select = function(options, self) {
|
|||
|
||||
// fixme: selected item needs attribute "checked", not "selected" ... that's strange
|
||||
var self = self || {},
|
||||
that = new Ox.Element('div', self) // fixme: do we use 'div', or {}, or '', by default?
|
||||
that = new Ox.Element({}, self) // fixme: do we use 'div', or {}, or '', by default?
|
||||
.defaults({
|
||||
id: '',
|
||||
items: [],
|
||||
|
|
@ -126,7 +126,7 @@ Ox.Select = function(options, self) {
|
|||
self.$menu.showMenu();
|
||||
}
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ Ox.TimeInput = function(options, self) {
|
|||
});
|
||||
}
|
||||
|
||||
self.onChange = function(key, value) {
|
||||
self.setOption = function(key, value) {
|
||||
if (key == 'value') {
|
||||
setValues();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue