From 5d9fe5d83306f27fbbe58942f658f252af3602e3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 23 May 2013 23:33:33 -0400 Subject: [PATCH] fixes #121 - Item will not play in IE10 --- dashboard-ui/css/images/media/fullscreen.png | Bin 1606 -> 466 bytes dashboard-ui/css/images/media/reduce.png | Bin 537 -> 0 bytes dashboard-ui/css/site.css | 67 +- dashboard-ui/scripts/mediaplayer.js | 286 +- dashboard-ui/scripts/site.js | 3 +- .../thirdparty/video-js-3.2.0/captions.vtt | 41 - .../thirdparty/video-js-3.2.0/demo.html | 30 - .../thirdparty/video-js-3.2.0/tubesprite.png | Bin 7452 -> 0 bytes .../thirdparty/video-js-3.2.0/video-js.css | 499 -- .../video-js-3.2.0/video-js.min.css | 1 - .../thirdparty/video-js-3.2.0/video-js.png | Bin 8235 -> 0 bytes .../thirdparty/video-js-3.2.0/video-js.swf | Bin 9612 -> 0 bytes .../video-js-3.2.0/video-js.tube.min.css | 1 - .../thirdparty/video-js-3.2.0/video.js | 4569 ------------- .../thirdparty/video-js-3.2.0/video.min.js | 21 - .../thirdparty/video-js-4.0/demo.captions.vtt | 41 - .../thirdparty/video-js-4.0/demo.html | 30 - .../thirdparty/video-js-4.0/font/vjs.eot | Bin 2900 -> 0 bytes .../thirdparty/video-js-4.0/font/vjs.svg | 40 - .../thirdparty/video-js-4.0/font/vjs.ttf | Bin 2736 -> 0 bytes .../thirdparty/video-js-4.0/font/vjs.woff | Bin 2676 -> 0 bytes .../thirdparty/video-js-4.0/tubesprite.png | Bin 7452 -> 0 bytes .../thirdparty/video-js-4.0/video-js.css | 730 -- .../thirdparty/video-js-4.0/video-js.swf | Bin 14059 -> 0 bytes .../video-js-4.0/video-js.tube.min.css | 1 - .../thirdparty/video-js-4.0/video.dev.js | 6079 ----------------- dashboard-ui/thirdparty/video-js-4.0/video.js | 121 - 27 files changed, 184 insertions(+), 12376 deletions(-) delete mode 100644 dashboard-ui/css/images/media/reduce.png delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/captions.vtt delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/demo.html delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/tubesprite.png delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/video-js.css delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/video-js.min.css delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/video-js.png delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/video-js.swf delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/video-js.tube.min.css delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/video.js delete mode 100644 dashboard-ui/thirdparty/video-js-3.2.0/video.min.js delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/demo.captions.vtt delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/demo.html delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/font/vjs.eot delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/font/vjs.svg delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/font/vjs.ttf delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/font/vjs.woff delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/tubesprite.png delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/video-js.css delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/video-js.swf delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/video-js.tube.min.css delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/video.dev.js delete mode 100644 dashboard-ui/thirdparty/video-js-4.0/video.js diff --git a/dashboard-ui/css/images/media/fullscreen.png b/dashboard-ui/css/images/media/fullscreen.png index 87ca5cabb510a78bdc801129296c0e319224b712..0e33511113249b96f553b97658cf9bdd65fcea47 100644 GIT binary patch delta 425 zcmX@cbBS58Gr-TCmrII^fq{Y7)59eQNIQTq2OE%Fm05UiqM}JXW4fn{V@O5Z+uQs7 z4h2ZC7QFLKC`#C}aQcO_7cUB$o6FWP-fK8&@#@qQ?F~CEEH-66;x^b7J9*o|i|jAt z_b+P~ayCrOt~#%udCpc@{$#l#qv-LE(eFJnXXzb#{E=&`=pqfPa4*}1W??)E$9HbD zIiJ4oy?$V{BG2KK*M7Y)53X09dz4XOZfOSlnx{WC`+wis!LoMi^1pTexwf9$s&i6$ zj`mjO6Pw;#lK9+ri}RC}ysF%(ZHHwWO2pV9IINIY?D}E(Pcy4tR^AiOQh%`fkjT^y zbRe_vkinenwe2sWUti4l(p9V;k=@>WFrhChus%>Ea_JS8+H6hc84vGp&OVzqDRrjn z+7IoMJkkppAXs)6TX<2bPQks&DkswgSnjV_D{%bd%ptnBVmn>aSRmdKI;Vst E0L;z2l>h($ literal 1606 zcma)+`#%$U9LB$!EwfacEvdR%%rU3cGBpaa_PdN&`m_|9YDUDGh0EEa1a#_0K%*4B$U+w3{^5KMF zTQ|Pp^QBnDZN$`;tJRQ_&xdQfvx; zr0+iKc;Y?0ZP4EzEnGF%pdVXvI%pO)(kv6>0$Ci}hSC7N@(Gop`>`1rQD|J9M4O-d zwu$}Dw}w+~SqC!qi|>a{>KRZKxDQtQ4#6i)Gzu>?wLEc))YvOw_x%Hdn;ZjOp9b$Oj87E%Zlr|ry1NY#!*@#y-2+VGwP zSBnb#D1(redQ{CqmtOa!)4sBqpsmdR>qYzdx@8;{EJxjRbfo>-AI39sK6$LFu}&e@ zo2yM9NIvIc`rNlsunT`dy>2Rg7Sag^zAK-!r-|$YJPB0=>1ufvFgzYwP+?Obu3B%< z2}k8od+g`Bi-pMC4C8y3@)&LoV0bHx1S^j>2g7ujTz6Q4VQ&}-UhXNj=HGcGUBhKR zeau%al!Q*w!=WjloE?wJwt%DP8qJcnNwmkZ?S$5pr*jjlaJdV_RG1jhgJ23f%8W`JuWnxvf zJJ*bx6pis^MgRr7IQGl;tjK)}&;*>>8B9UZo z`GM{AcDcgeZ9@shtK*c7tM|gV{wp+q>#`B|%Je{W@D3!I^^$DMV5(N$OcRl2h^g!! z6P#}1dKgzr%1V6Nl9G4Klm9rjr08)5f>&`I5!ErPrKeo$<7Jcy@Z$vNi4o&F9Oy{W zIf>-6iN*_$W*QE)mRdU{y}h)1by*%he>p^r@9$~K-5+3!xeW<$coy8pw9Sw$Fo=Zr z-a|jRxjHg&<>6_IM0VV>+wBzZgw>~kt#D%d>nVlLC>GHlJ0;s;CZft;m`*)pGqkDBi7-jftw*SZnpVA zwD#pP>(C%`Ei^XAH#3arR~!gBc}v??25#H92&FuT_nffr(k4y(<|v~O9-f}KAfy~` zgihbDdTkQCE@nu6Qu+RD@hLW0ofCy^-K}HOMZl8{dn%k08!UHqqJ*W^8^ zW`@rmT6}r@Y1*WyZ6#ieCF{P(B>eg)`S5tfwfiYMUMii7PpKE1cskGIcXEmTIe8a7 zd83%_9bbOOTwBGU7WZuFCZ*%%$*aD93i6a=oEyvlMXUF5&8R!LIf}LBe4XdS&vi2I zjbpOc%BG?^^g(~feYJOY4S1|2*VT0XF#4V9TYp8$^8CK;oAruZ547%`@oleMx#i4P zzj=Bm|G~@#S^_kFN0;Q6yZ0Il=UestusQ5|z3`v=w{*dsd%Fzd(=EPg-riaa;_?fk(8>EV5eic@FLmj!=j{S$&*>1yIuXb$xcHz#0`JH$EB(k7~Adp{wJ*kje W;=N5UhfK_Tki4g>pUXO@geCwVJ=Y2V diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 982428aff..905a7aa36 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -723,10 +723,6 @@ progress { position: relative; } - #mediaElement.video { - width: 270px; - } - .nowPlayingMediaInfo div { display: inline-block; } @@ -750,18 +746,34 @@ progress { height: 24px; } -.itemVideo, .itemVideo.video-js { +.itemVideo { position: absolute; z-index: 99998; height: auto; - /*width: 180px;*/ - bottom: -5px; + width: 270px; + bottom: 44px; + left: -240px; + border: 1px solid #666; + border-bottom: 0; + background: #000; +} + +.fullscreenVideo { + position: fixed; + top: 0; + bottom: 0; + right: 0; + left: 0; + width: 100%; + border: 0; + z-index: 99996; } .currentTime { display: inline-block; position: relative; top: -10px; + width: 110px; } .mediaSlider { @@ -805,48 +817,29 @@ progress { margin-right: .5em!important; } -::-ms-fill-lower { - background: #777; -} - -::-ms-fill-upper { - background: #777; -} - ::-ms-thumb { - background: #000; - border-radius: 5px; - border: 1px solid #000; -} - -::-ms-ticks-after { - display: none; - color: #777!important; - background: #777; -} - -::-ms-ticks-before { - display: none; - color: #777!important; - background: #777; + background-image: linear-gradient(#fefefe,#dddddd); + width: 15px; } ::-ms-track { padding: 0; border: 0; + color: #777; +} + +input[type="range"]::-ms-fill-lower { + background-color: #777; +} + +input[type="range"]::-ms-fill-upper { + background-color: #777; } ::-ms-tooltip { display: none; /* display and visibility only */ } -@media all and (min-width: 650px) { - - .itemVideo { - width: 270px; - } -} - .userProfileIcon { width: 36px; } diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 488dc8c33..e4b3ba3f6 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -1,4 +1,4 @@ -(function (document, setTimeout, clearTimeout, screen, localStorage, _V_, $, setInterval, window) { +(function (document, setTimeout, clearTimeout, screen, localStorage, $, setInterval, window) { function mediaPlayer() { @@ -22,6 +22,34 @@ self.playing = ''; self.queue = []; + function requestFullScreen(element) { + // Supports most browsers and their versions. + var requestMethod = element.requestFullScreen || element.webkitRequestFullScreen || element.mozRequestFullScreen || element.msRequestFullScreen; + + if (requestMethod) { // Native full screen. + requestMethod.call(element); + } else if (typeof window.ActiveXObject !== "undefined") { // Older IE. + var wscript = new ActiveXObject("WScript.Shell"); + if (wscript !== null) { + wscript.SendKeys("{F11}"); + } + } + } + + function isFullScreen() { + return document.fullscreenEnabled || document.mozFullscreenEnabled || document.webkitIsFullScreen ? true : false; + } + + $(document).on('webkitfullscreenchange mozfullscreenchange fullscreenchange', function() { + + if (isFullScreen()) { + $('.itemVideo').addClass('fullscreenVideo'); + } else { + $('.itemVideo').removeClass('fullscreenVideo'); + } + + }); + function replaceQueryString(url, param, value) { var re = new RegExp("([?|&])" + param + "=.*?(&|$)", "i"); if (url.match(re)) @@ -43,7 +71,6 @@ function onPlaybackStopped() { - console.log('ended'); currentTimeElement.hide(); var endTime = this.currentTime; @@ -258,12 +285,7 @@ var html = ''; - var attributes = "autoplay"; - - if ($.browser.ipad || $.browser.iphone || $.browser.android) { - attributes += " controls"; - } - html += '