diff --git a/source/UI/js/Core/UI.js b/source/UI/js/Core/UI.js index b3b7aebe..5875480f 100644 --- a/source/UI/js/Core/UI.js +++ b/source/UI/js/Core/UI.js @@ -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 Path of Ox UI diff --git a/source/UI/js/Core/URL.js b/source/UI/js/Core/URL.js index 15c96072..c802d353 100644 --- a/source/UI/js/Core/URL.js +++ b/source/UI/js/Core/URL.js @@ -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' diff --git a/source/UI/js/Form/Filter.js b/source/UI/js/Form/Filter.js index 9f427886..1ad8fa25 100644 --- a/source/UI/js/Form/Filter.js +++ b/source/UI/js/Form/Filter.js @@ -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} ] }); diff --git a/source/UI/js/Form/Input.js b/source/UI/js/Form/Input.js index 0d079e63..bce4e153 100644 --- a/source/UI/js/Form/Input.js +++ b/source/UI/js/Form/Input.js @@ -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); diff --git a/source/UI/js/Video/ClipPanel.js b/source/UI/js/Video/ClipPanel.js index 43e430e4..275da1d9 100644 --- a/source/UI/js/Video/ClipPanel.js +++ b/source/UI/js/Video/ClipPanel.js @@ -287,6 +287,7 @@ Ox.ClipPanel = function(options, self) { }]; updateSortElement(); that.triggerEvent('sort', self.options.sort); + self.$list.options({sortable: isSortable()}); } });