diff --git a/source/UI/js/Core/URL.js b/source/UI/js/Core/URL.js index 784e27ec..c802d353 100644 --- a/source/UI/js/Core/URL.js +++ b/source/UI/js/Core/URL.js @@ -618,16 +618,6 @@ Ox.URL = function(options) { }); } - function isDate(str) { - var values = /^(-?\d+)-?(\d+)?-?(\d+)? ?(\d+)?:?(\d+)?:?(\d+)?\.?(\d+)?$/ - .exec(str); - return Boolean( - values && - parseInt(values[1]) <= 9999 && - (!values[2] || parseInt(values[2]) <= 12) && - (!values[3] || parseInt(values[3]) <= 31) - ) - } function getSpanType(str, types) { Ox.Log('Core', 'getSpanType', str, types) @@ -643,7 +633,7 @@ Ox.URL = function(options) { : canBeLocation && length == 4 ? 'location' // leaves us with [-]D[.D][,[-]D[.D]] : canBeDuration ? 'duration' - : canBeDate && isDate(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' @@ -809,10 +799,7 @@ Ox.URL = function(options) { } function parseURL(str, callback) { - // remove facebook spam - str = str.replace(/\?fbclid=[A-Za-z0-9_]+/, '') // fixme: removing trailing slash makes it impossible to search for '/' - var split = str.split('#'), parts = split.shift().replace(/(^\/|\/$)/g, '').split('/'), state = split.length && split[0].length diff --git a/source/UI/js/List/TableList.js b/source/UI/js/List/TableList.js index d72a7f06..63320f03 100644 --- a/source/UI/js/List/TableList.js +++ b/source/UI/js/List/TableList.js @@ -206,7 +206,7 @@ Ox.TableList = function(options, self) { .addClass('OxHead') .css({ right: self.options.scrollbarVisible - ? Math.max(Ox.UI.SCROLLBAR_SIZE, 8) + 'px' : 0 + ? Ox.UI.SCROLLBAR_SIZE + 'px' : 0 }) .appendTo(that.$bar); that.$head.$content.addClass('OxTitles'); diff --git a/source/UI/js/Video/VideoAnnotationPanel.js b/source/UI/js/Video/VideoAnnotationPanel.js index a3935b1e..4700b283 100644 --- a/source/UI/js/Video/VideoAnnotationPanel.js +++ b/source/UI/js/Video/VideoAnnotationPanel.js @@ -237,9 +237,7 @@ Ox.VideoAnnotationPanel = function(options, self) { setPoint('in', self.options.position); }, key_k: function togglePlaybackRate() { - that.options({ - playbackRate: self.options.playbackRate == 1 ? 2 : self.options.playbackRate == 2 ? 0.5 : 1 - }); + that.options({playbackRate: self.options.playbackRate == 1 ? 2 : 1}); }, key_l: toggleLoop, key_left: function() { diff --git a/source/UI/js/Video/VideoPlayer.js b/source/UI/js/Video/VideoPlayer.js index 36c2822b..0ffaab2b 100644 --- a/source/UI/js/Video/VideoPlayer.js +++ b/source/UI/js/Video/VideoPlayer.js @@ -321,11 +321,6 @@ Ox.VideoPlayer = function(options, self) { key_g: function() { goToNext('result', 1); }, - key_k: function togglePlaybackRate() { - that.options({ - playbackRate: self.options.playbackRate == 1 ? 2 : self.options.playbackRate == 2 ? 0.5 : 1 - }); - }, key_l: toggleLoop, key_left: function() { setPosition(self.options.position - self.secondsPerFrame); diff --git a/source/UI/js/Video/VideoPlayerPanel.js b/source/UI/js/Video/VideoPlayerPanel.js index 1b376d81..d59d4862 100644 --- a/source/UI/js/Video/VideoPlayerPanel.js +++ b/source/UI/js/Video/VideoPlayerPanel.js @@ -16,7 +16,6 @@ Ox.VideoPlayerPanel VideoPlayerPanel Object key_* key_* muted muted paused paused - playbackRate: playback rate position position resizecalendar resizecalendar resolution resolution @@ -63,7 +62,6 @@ Ox.VideoPlayerPanel = function(options, self) { muted: false, out: 0, paused: true, - playbackRate: 1, playInToOut: false, position: 0, poster: '', @@ -108,11 +106,6 @@ Ox.VideoPlayerPanel = function(options, self) { paused: function() { self.$video.options({paused: self.options.paused}); }, - playbackRate: function() { - self.$video.options({ - playbackRate: self.options.playbackRate - }); - }, position: function() { self.$video.options({position: self.options.position}); self.$timeline.options({position: self.options.position}); @@ -174,11 +167,6 @@ Ox.VideoPlayerPanel = function(options, self) { self.$annotationPanel.options({selected: ''}); setPoint('in', self.options.position, false, true); }, - key_k: function togglePlaybackRate() { - that.options({ - playbackRate: self.options.playbackRate == 1 ? 2 : self.options.playbackRate == 2 ? 0.5 : 1 - }); - }, key_l: toggleLoop, key_left: function() { movePositionBy(-1 / self.options.fps); diff --git a/source/UI/js/Video/VideoTimelinePanel.js b/source/UI/js/Video/VideoTimelinePanel.js index 917b32c3..7e51d077 100644 --- a/source/UI/js/Video/VideoTimelinePanel.js +++ b/source/UI/js/Video/VideoTimelinePanel.js @@ -106,11 +106,6 @@ Ox.VideoTimelinePanel = function(options, self) { key_equal: function() { self.$video.changeVolume(0.1); }, - key_k: function togglePlaybackRate() { - that.options({ - playbackRate: self.options.playbackRate == 1 ? 2 : self.options.playbackRate == 2 ? 0.5 : 1 - }); - }, key_minus: function() { self.$video.changeVolume(-0.1); }, diff --git a/source/UI/js/Video/VideoTimelinePlayer.js b/source/UI/js/Video/VideoTimelinePlayer.js index dacf864d..73887e92 100644 --- a/source/UI/js/Video/VideoTimelinePlayer.js +++ b/source/UI/js/Video/VideoTimelinePlayer.js @@ -34,7 +34,6 @@ Ox.VideoTimelinePlayer = function(options, self) { muted: false, out: 0, paused: false, - playbackRate: 1, position: 0, showMilliseconds: false, smallTimelineURL: '', @@ -53,9 +52,6 @@ Ox.VideoTimelinePlayer = function(options, self) { self.options.paused = !self.options.paused; togglePaused(); }, - playbackRate: function() { - self.$video.options({playbackRate: self.options.playbackRate}); - }, position: setPosition, timeline: function() { self.$menuButton.checkItem('timelines_' + self.options.timeline); @@ -199,11 +195,6 @@ Ox.VideoTimelinePlayer = function(options, self) { key_enter: function() { scrollToPosition(); }, - key_k: function togglePlaybackRate() { - that.options({ - playbackRate: self.options.playbackRate == 1 ? 2 : self.options.playbackRate == 2 ? 0.5 : 1 - }); - }, key_left: function() { self.options.position -= self.videoWidth / self.fps; setPosition(); @@ -402,7 +393,6 @@ Ox.VideoTimelinePlayer = function(options, self) { height: self.tileHeight, muted: self.options.muted, paused: self.options.paused, - playbackRate: self.options.playbackRate, position: self.options.position, scaleToFill: true, video: self.options.video,