backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 06:59:52 +01:00
Code Issues Projects Releases Activity

vidrw: client rewrite: use client width/height if available, otherwise

Browse Source 
use 100% to allow replacement in dynamic containers
This commit is contained in:
Ilya Kreymer 2014-12-07 19:59:42 -08:00
parent 00c4e189ef
commit d45a23e07b
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pywb/static/vidrw.js
View File

@ -80,6 +80,7 @@ __wbvidrw = (function() {
} }
// special case: yt // special case: yt
/*
if (!found_embeds && wbinfo.url.indexOf("://www.youtube.com/watch") > 0) { if (!found_embeds && wbinfo.url.indexOf("://www.youtube.com/watch") > 0) {
var ytvideo = document.getElementsByTagName("video"); var ytvideo = document.getElementsByTagName("video");
@ -87,15 +88,17 @@ __wbvidrw = (function() {
if (ytvideo[0].getAttribute("data-youtube-id") != "") { if (ytvideo[0].getAttribute("data-youtube-id") != "") {
// Wait to see if video is playing, if so, don't replace it // Wait to see if video is playing, if so, don't replace it
window.setTimeout(function() { window.setTimeout(function() {
if (ytvideo[0].readyState == 0) { if (!ytvideo || !ytvideo.length || ytvideo[0].readyState == 0) {
delete window.yt; delete window.yt;
delete window.ytplayer; delete window.ytplayer;
console.log("REPLACING YT: " + wbinfo.url);
check_replacement(ytvideo[0], wbinfo.url); check_replacement(ytvideo[0], wbinfo.url);
} }
}, 4000); }, 4000);
} }
} }
} }
*/
} }
var VIMEO_RX = /^https?:\/\/.*vimeo.*clip_id=([^&]+).*/; var VIMEO_RX = /^https?:\/\/.*vimeo.*clip_id=([^&]+).*/;
@ -152,12 +155,29 @@ __wbvidrw = (function() {
function do_replace_iframe(elem, url) { function do_replace_iframe(elem, url) {
var iframe = document.createElement("iframe"); var iframe = document.createElement("iframe");
iframe.width = elem.clientWidth; var dim = get_dim(elem);
iframe.height = elem.clientHeight; iframe.width = dim[0];
iframe.height = dim[1];
iframe.src = url; iframe.src = url;
do_replace_elem(elem, iframe); do_replace_elem(elem, iframe);
} }
function get_dim(elem) {
var width = elem.width;
if (!width) {
width = "100%";
}
console.log(width);
var height = elem.height;
if (!height) {
height = "100%";
}
console.log(height);
return [width, height];
}
function do_replace_elem(elem, replacement) { function do_replace_elem(elem, replacement) {
var tag_name = elem.tagName.toLowerCase(); var tag_name = elem.tagName.toLowerCase();
@ -183,20 +203,8 @@ __wbvidrw = (function() {
var tag_name = elem.tagName.toLowerCase(); var tag_name = elem.tagName.toLowerCase();
var width, height; var dim = get_dim(elem);
var width = dim[0], height = dim[1];
if (tag_name == "video") {
elem = elem.parentNode;
elem = elem.parentNode;
width = elem.clientWidth;
height = elem.clientHeight;
elem = elem.parentNode;
} else {
width = elem.clientWidth;
height = elem.clientHeight;
}
// sort in reverse preference // sort in reverse preference
info.formats.sort(function(f1, f2) { info.formats.sort(function(f1, f2) {
@ -337,7 +345,14 @@ __wbvidrw = (function() {
{ {
var swf = wbinfo.static_prefix + "/flowplayer/flowplayer-3.2.18.swf"; var swf = wbinfo.static_prefix + "/flowplayer/flowplayer-3.2.18.swf";
var style = 'width: ' + width + 'px; height: ' + height + 'px; display: block'; if (width[width.length - 1] != '%') {
width += "px";
}
if (height[height.length - 1] != '%') {
height += "px";
}
var style = 'width: ' + width + '; height: ' + height + '; display: block';
document.getElementById(div_id).style.cssText += ';' + style; document.getElementById(div_id).style.cssText += ';' + style;
var url; var url;