merge
This commit is contained in:
commit
3911a4719b
1 changed files with 9 additions and 4 deletions
|
@ -1521,15 +1521,17 @@ requires
|
|||
|
||||
Ox.Input = function(options, self) {
|
||||
var self = self || {},
|
||||
that = new Ox.Element("input", self)
|
||||
that = new Ox.Element(options.type=='textarea'?'textarea':'input', self)
|
||||
.defaults({
|
||||
placeholder: "",
|
||||
size: "medium",
|
||||
type: "text"
|
||||
})
|
||||
.options(options || {});
|
||||
if(options.type != 'textarea') {
|
||||
that.attr({type: self.options.type})
|
||||
}
|
||||
that.attr({
|
||||
type: self.options.type,
|
||||
placeholder: self.options.placeholder
|
||||
})
|
||||
.addClass("OxInput Ox" +
|
||||
|
@ -2021,6 +2023,7 @@ requires
|
|||
Ox.Menu = function(options, self) {
|
||||
|
||||
/*
|
||||
|
||||
options:
|
||||
element the element the menu is attached to
|
||||
id the menu id
|
||||
|
@ -2029,12 +2032,14 @@ requires
|
|||
offset offset of the menu, in px
|
||||
parent the supermenu, if any
|
||||
selected the position of the selected item
|
||||
side "bottom" or "right"
|
||||
side open to "bottom" or "right"
|
||||
size "large", "medium" or "small"
|
||||
events
|
||||
|
||||
events:
|
||||
change_groupId {id, value} checked item of a group has changed
|
||||
click_itemId item not belonging to a group was clicked
|
||||
hide_menuId menu was hidden
|
||||
|
||||
*/
|
||||
|
||||
var self = self || {},
|
||||
|
|
Loading…
Reference in a new issue