From 58036338352dff45535f8ec92a92fd0bd8354537 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Fri, 23 Dec 2011 05:05:41 +0000 Subject: [PATCH] fix bugs in map and video player --- source/Ox.UI/js/Map/Ox.Map.js | 19 ++++++++++++++----- source/Ox.UI/js/Video/Ox.VideoPlayer.js | 5 +---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js index bfadb5ba..5f06b562 100644 --- a/source/Ox.UI/js/Map/Ox.Map.js +++ b/source/Ox.UI/js/Map/Ox.Map.js @@ -860,11 +860,20 @@ Ox.Map = function(options, self) { $placeControl.appendTo(self.$map); }); setTimeout(function() { - var element = self.$map.$element[0].children[0].children[2].children[0]; - element.style.backgroundImage = '-webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0px, rgba(255, 255, 255, 0.1) 50px)'; - element.style.color = 'rgb(192, 192, 192)'; - element.style.textShadow = '1px 1px 0 rgb(64, 64, 64)'; - element.children[3].style.color = 'rgb(192, 192, 192)'; + var $element; + try { + $element = $(self.$map.find('a[href$="terms_maps.html"]').parent()).css({ + color: 'rgb(192, 192, 192)', + textShadow: '1px 1px 0 rgb(64, 64, 64)' + }); + ['moz', 'o', 'webkit'].forEach(function(browser) { + $element.css({ + backgroundImage: '-' + browser + + '-linear-gradient(left, rgba(255, 255, 255, 0) 0px, rgba(255, 255, 255, 0.1) 50px)', + }); + }); + $element.children().css({color: 'rgb(192, 192, 192)'}); + } catch (e) {} }, 0) } } diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index a51f6f36..c1638b00 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -1000,9 +1000,7 @@ Ox.VideoPlayer = function(options, self) { } } - setSizes(function() { - self.options.fullscreen && enterFullscreen(); - }); + self.options.fullscreen ? setSizes(enterFullscreen) : setSizes(); function censor() { if (self.options.type == 'play') { @@ -2102,7 +2100,6 @@ Ox.VideoPlayer = function(options, self) { } function toggleFullscreen(from) { - // FIXME: hiding controls won't work if video begins in fullscreen var parentOffset, playOnFullscreen; self.options.fullscreen = !self.options.fullscreen; if (!self.options.paused) {