sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

add formatColor()

Browse source
This commit is contained in:
rlx 2011-09-04 04:14:58 +00:00
commit 6b0779fcab
3 changed files with 81 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/Ox.UI/js/Form/Ox.Button.js
View file

@ -74,8 +74,8 @@ Ox.Button = function(options, self) {
if (self.options.tooltip) {
self.tooltips = Ox.isArray(self.options.tooltip) ? self.options.tooltip : [self.options.tooltip];
self.$tooltip = Ox.Tooltip({
title: self.tooltips[self.selectedTitle]
});
title: self.tooltips[self.selectedTitle]
});
that.mouseenter(mouseenter)
.mouseleave(mouseleave);
}
@ -180,6 +180,8 @@ Ox.Button = function(options, self) {
that.toggleTitle = function() {
self.selectedTitle = 1 - self.selectedTitle;
setTitle(self.titles[self.selectedTitle].title);
// fixme: if the tooltip is visible
// we also need to call show()
self.$tooltip && self.$tooltip.options({
title: self.tooltips[self.selectedTitle]
});

1
source/Ox.UI/js/List/Ox.TextList.js
View file

@ -390,7 +390,6 @@ Ox.TextList = function(options, self) {
width: getItemWidth(true) + 'px'
});
self.visibleColumns.forEach(function(v, i) {
//Ox.print(data[v.id], '(--value--)')
var clickable = Ox.isBoolean(v.clickable) ? v.clickable : v.clickable(data),
editable = Ox.isBoolean(v.editable) ? v.editable : v.editable(data),
$cell = Ox.Element({