CAMP/oxjstmp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Rolux 2010-02-11 00:14:26 +05:30
commit 082d26e553
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/js/ox.ui.js
View File

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