summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2014-03-25 10:06:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-25 10:06:36 +0000
commit27fa561f56bac8867e462fc793fecaf3449c5158 (patch)
tree1138b3ef4db2724a78bd0c97a8b163db83f5b631
parentcd64a9ba96bed7841e01fa125241d0410fc7b214 (diff)
parent52f449fd5a999aea77fa8df3628af7845d0cfcef (diff)
downloadframeworks_base-27fa561f56bac8867e462fc793fecaf3449c5158.zip
frameworks_base-27fa561f56bac8867e462fc793fecaf3449c5158.tar.gz
frameworks_base-27fa561f56bac8867e462fc793fecaf3449c5158.tar.bz2
am 52f449fd: fix size and behavior of video thumbnail when flash not available
* commit '52f449fd5a999aea77fa8df3628af7845d0cfcef': fix size and behavior of video thumbnail when flash not available
-rw-r--r--docs/html/wear/index.html13
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/html/wear/index.html b/docs/html/wear/index.html
index 4a71856..9660463 100644
--- a/docs/html/wear/index.html
+++ b/docs/html/wear/index.html
@@ -297,7 +297,7 @@ onkeyup="return search_changed(event, false, '/')" />
</div>
<script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
<div id="ytapiplayer">
- <a href="http://www.youtube.com/watch?v=0xQ3y902DEQ"><img width=600
+ <a href="http://www.youtube.com/watch?v=0xQ3y902DEQ"><img width=940
src="https://i1.ytimg.com/vi/0xQ3y902DEQ/maxresdefault.jpg"></a><!--You need Flash player 8+ and JavaScript enabled to view this video. -->
</div>
</div>
@@ -346,9 +346,14 @@ $("#watchVideo").on("click", function(e) {
});
$("#icon-video-close").on("click", function() {
ytplayer = document.getElementById("ytapiplayer");
- ytplayer.stopVideo();
- $(ytplayer).hide();
- $("#video-container").fadeOut(400);
+ try {
+ ytplayer.stopVideo();
+ $(ytplayer).hide();
+ $("#video-container").fadeOut(400);
+ } catch(e) {
+ console.log('Video not available');
+ $("#video-container").fadeOut(400);
+ }
});
</script>
</div>