0x2620/oxjs
2
0
Fork 2
Code Issues 172 Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:3eb6e3f432434a01cbbb703b9f2594bcea4db2f7
Branches Tags
0x2620:master
0x2620:maplibre
0x2620:maplibre-big-bbox
0x2620:maplibre-fix-editing
0x2620:stable
0x2620:leaflet
..
compare: 0x2620:b8a46dbee48c5673bc7d956cca00bfff8acb4184
Branches Tags
0x2620:maplibre
0x2620:maplibre-big-bbox
0x2620:maplibre-fix-editing
0x2620:master
0x2620:stable
0x2620:leaflet

No commits in common. "3eb6e3f432434a01cbbb703b9f2594bcea4db2f7" and "b8a46dbee48c5673bc7d956cca00bfff8acb4184" have entirely different histories.
3eb6e3f432 ... b8a46dbee4

5 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/UI/js/Core/UI.js
View file

@ -47,7 +47,7 @@ Ox.SCROLLBAR_SIZE = Ox.UI.SCROLLBAR_SIZE = $.browser.webkit ? 8 : (function() {
width = 1 + width - (inner[0].offsetWidth == width width = 1 + width - (inner[0].offsetWidth == width
? outer[0].clientWidth : inner[0].offsetWidth); ? outer[0].clientWidth : inner[0].offsetWidth);
outer.remove(); outer.remove();
return Math.max(width + width % 2, 8); return width + width % 2;
})(); })();
//@ Ox.UI.PATH <str> Path of Ox UI //@ Ox.UI.PATH <str> Path of Ox UI

2
source/UI/js/Core/URL.js
View file

@ -633,7 +633,7 @@ Ox.URL = function(options) {
: canBeLocation && length == 4 ? 'location' : canBeLocation && length == 4 ? 'location'
// leaves us with [-]D[.D][,[-]D[.D]] // leaves us with [-]D[.D][,[-]D[.D]]
: canBeDuration ? 'duration' : canBeDuration ? 'duration'
: canBeDate && !/\./.test(str) && !/^\d{7}$/.test(str) && !/^\d{8}$/.test(str) ? 'date' : canBeDate && !/\./.test(str) && !/^\d{7}$/.test(str) ? 'date'
: canBeLocation && length == 2 ? 'location' : canBeLocation && length == 2 ? 'location'
: canBeNumber && /^\d+$/.test(str) ? 'number' : canBeNumber && /^\d+$/.test(str) ? 'number'
: canBeString && str.length ? 'string' : canBeString && str.length ? 'string'

3
source/UI/js/Form/Filter.js
View file

@ -28,7 +28,6 @@ Ox.Filter = function(options, self) {
.defaults({ .defaults({
findKeys: [], findKeys: [],
list: null, list: null,
listName: Ox._('Smart List'),
sortKeys: [], sortKeys: [],
value: { value: {
conditions: [], conditions: [],
@ -175,7 +174,7 @@ Ox.Filter = function(options, self) {
}) })
], ],
separators: [ separators: [
{title: Ox._('Save as {0}', [self.options.listName]), width: 112} {title: Ox._('Save as Smart List'), width: 112}
] ]
}); });

3
source/UI/js/Form/Input.js
View file

@ -143,9 +143,6 @@ Ox.Input = function(options, self) {
setPlaceholder(); setPlaceholder();
} else if (key == 'readonly') { } else if (key == 'readonly') {
self.$input.attr({readonly: value}); 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') { } else if (key == 'value') {
if (self.options.type == 'float' && self.options.decimals) { if (self.options.type == 'float' && self.options.decimals) {
self.options.value = self.options.value.toFixed(self.options.decimals); self.options.value = self.options.value.toFixed(self.options.decimals);

1
source/UI/js/Video/ClipPanel.js
View file

@ -287,7 +287,6 @@ Ox.ClipPanel = function(options, self) {
}]; }];
updateSortElement(); updateSortElement();
that.triggerEvent('sort', self.options.sort); that.triggerEvent('sort', self.options.sort);
self.$list.options({sortable: isSortable()});
} }
}); });