Compare commits
5 commits
b8a46dbee4
...
3eb6e3f432
| Author | SHA1 | Date | |
|---|---|---|---|
| 3eb6e3f432 | |||
| 34e479dcfc | |||
| 98219dd001 | |||
| 874b68c8a6 | |||
| 88086fb5bd |
5 changed files with 8 additions and 3 deletions
|
|
@ -47,7 +47,7 @@ Ox.SCROLLBAR_SIZE = Ox.UI.SCROLLBAR_SIZE = $.browser.webkit ? 8 : (function() {
|
|||
width = 1 + width - (inner[0].offsetWidth == width
|
||||
? outer[0].clientWidth : inner[0].offsetWidth);
|
||||
outer.remove();
|
||||
return width + width % 2;
|
||||
return Math.max(width + width % 2, 8);
|
||||
})();
|
||||
|
||||
//@ Ox.UI.PATH <str> Path of Ox UI
|
||||
|
|
|
|||
|
|
@ -633,7 +633,7 @@ Ox.URL = function(options) {
|
|||
: canBeLocation && length == 4 ? 'location'
|
||||
// leaves us with [-]D[.D][,[-]D[.D]]
|
||||
: canBeDuration ? 'duration'
|
||||
: canBeDate && !/\./.test(str) && !/^\d{7}$/.test(str) ? 'date'
|
||||
: canBeDate && !/\./.test(str) && !/^\d{7}$/.test(str) && !/^\d{8}$/.test(str) ? 'date'
|
||||
: canBeLocation && length == 2 ? 'location'
|
||||
: canBeNumber && /^\d+$/.test(str) ? 'number'
|
||||
: canBeString && str.length ? 'string'
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ Ox.Filter = function(options, self) {
|
|||
.defaults({
|
||||
findKeys: [],
|
||||
list: null,
|
||||
listName: Ox._('Smart List'),
|
||||
sortKeys: [],
|
||||
value: {
|
||||
conditions: [],
|
||||
|
|
@ -174,7 +175,7 @@ Ox.Filter = function(options, self) {
|
|||
})
|
||||
],
|
||||
separators: [
|
||||
{title: Ox._('Save as Smart List'), width: 112}
|
||||
{title: Ox._('Save as {0}', [self.options.listName]), width: 112}
|
||||
]
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -143,6 +143,9 @@ Ox.Input = function(options, self) {
|
|||
setPlaceholder();
|
||||
} else if (key == 'readonly') {
|
||||
self.$input.attr({readonly: value});
|
||||
} else if (key == 'type') {
|
||||
// jQuery does not allow update via attr({type: value}) due to IE 6 bug
|
||||
self.$input[0].type = value
|
||||
} else if (key == 'value') {
|
||||
if (self.options.type == 'float' && self.options.decimals) {
|
||||
self.options.value = self.options.value.toFixed(self.options.decimals);
|
||||
|
|
|
|||
|
|
@ -287,6 +287,7 @@ Ox.ClipPanel = function(options, self) {
|
|||
}];
|
||||
updateSortElement();
|
||||
that.triggerEvent('sort', self.options.sort);
|
||||
self.$list.options({sortable: isSortable()});
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue