keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to v4.0.0; point to local host of SWF

Browse source
This commit is contained in:
Zach Prezkuta 2013-05-11 10:49:54 -06:00
parent 3ce41a78b4
commit 35358baac9
26 changed files with 6837 additions and 4949 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/text.php
View file

@ -1306,8 +1306,12 @@ function prepare_body($item,$attach = false) {
if(strpos($mime, 'video') !== false) { if(strpos($mime, 'video') !== false) {
if(!$vhead) { if(!$vhead) {
$vhead = true; $vhead = true;
$a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array()); $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array(
$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array()); '$baseurl' => $a->get_baseurl(),
));
$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array(
'$baseurl' => $a->get_baseurl(),
));
} }
$id = end(explode('/', $the_url)); $id = end(explode('/', $the_url));

2
js/main.js
View file

@ -387,7 +387,7 @@
$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");
// setup videos, since VideoJS won't take care of any loaded via AJAX // setup videos, since VideoJS won't take care of any loaded via AJAX
if(typeof _V_ != 'undefined') _V_.autoSetup(); if(typeof videojs != 'undefined') videojs.autoSetup();
}); });
} }

2
js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

0
library/video-js/captions.vtt → library/video-js/demo.captions.vtt
View file

2
library/video-js/demo.html
View file

@ -23,7 +23,7 @@
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' /> <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' /> <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
<source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' /> <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
<track kind="captions" src="captions.vtt" srclang="en" label="English" /> <track kind="captions" src="demo.captions.vtt" srclang="en" label="English" />
</video> </video>
</body> </body>

BIN
library/video-js/font/vjs.eot Normal file
View file

Binary file not shown.

40
library/video-js/font/vjs.svg Normal file
View file

@ -0,0 +1,40 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
This is a custom SVG font generated by IcoMoon.
<iconset grid="16"></iconset>
</metadata>
<defs>
<font id="VideoJS" horiz-adv-x="512" >
<font-face units-per-em="512" ascent="480" descent="-32" />
<missing-glyph horiz-adv-x="512" />
<glyph unicode="&#xe000;" d="M 512.00,480.00 L 512.00,272.00 L 432.00,352.00 L 336.00,256.00 L 288.00,304.00 L 384.00,400.00 L 304.00,480.00 ZM 224.00,144.00 L 128.00,48.00 L 208.00-32.00 L 0.00-32.00 L 0.00,176.00 L 80.00,96.00 L 176.00,192.00 Z" />
<glyph unicode="&#xe001;" d="M 96.00,416.00L 416.00,224.00L 96.00,32.00 z" />
<glyph unicode="&#xe002;" d="M 64.00,416.00L 224.00,416.00L 224.00,32.00L 64.00,32.00zM 288.00,416.00L 448.00,416.00L 448.00,32.00L 288.00,32.00z" />
<glyph unicode="&#xe003;" d="M 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" />
<glyph unicode="&#xe004;" d="M 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941
c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00
c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" />
<glyph unicode="&#xe005;" d="M 359.765,64.235c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0.00,33.941
c 65.503,65.503, 65.503,172.085,0.00,237.588c-9.372,9.373-9.372,24.569,0.00,33.941c 9.372,9.371, 24.569,9.372, 33.941,0.00
C 417.532,335.938, 440.00,281.696, 440.00,224.00c0.00-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941
c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00
c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" />
<glyph unicode="&#xe006;" d="M 445.02,18.98c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.373-9.372,24.568,0.00,33.941
C 471.868,103.771, 496.001,162.03, 496.001,224.00c0.00,61.969-24.133,120.229-67.952,164.049c-9.372,9.373-9.372,24.569,0.00,33.941
c 9.372,9.372, 24.569,9.372, 33.941,0.00c 52.885-52.886, 82.011-123.20, 82.011-197.99c0.00-74.791-29.126-145.104-82.011-197.99
C 457.304,21.323, 451.162,18.98, 445.02,18.98zM 359.765,64.235c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0.00,33.941
c 65.503,65.503, 65.503,172.085,0.00,237.588c-9.372,9.373-9.372,24.569,0.00,33.941c 9.372,9.371, 24.569,9.372, 33.941,0.00
C 417.532,335.938, 440.00,281.696, 440.00,224.00c0.00-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941
c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00
c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" horiz-adv-x="544" />
<glyph unicode="&#xe007;" d="M 256.00,480.00L 96.00,224.00L 256.00-32.00L 416.00,224.00 z" />
<glyph unicode="&#xe008;" d="M 0.00,480.00 L 687.158,480.00 L 687.158-35.207 L 0.00-35.207 L 0.00,480.00 z M 622.731,224.638 C 621.878,314.664 618.46,353.922 597.131,381.656 C 593.291,387.629 586.038,391.042 580.065,395.304 C 559.158,410.669 460.593,416.211 346.247,416.211 C 231.896,416.211 128.642,410.669 108.162,395.304 C 101.762,391.042 94.504,387.629 90.242,381.656 C 69.331,353.922 66.349,314.664 65.069,224.638 C 66.349,134.607 69.331,95.353 90.242,67.62 C 94.504,61.22 101.762,58.233 108.162,53.967 C 128.642,38.18 231.896,33.06 346.247,32.207 C 460.593,33.06 559.158,38.18 580.065,53.967 C 586.038,58.233 593.291,61.22 597.131,67.62 C 618.46,95.353 621.878,134.607 622.731,224.638 z M 331.179,247.952 C 325.389,318.401 287.924,359.905 220.901,359.905 C 159.672,359.905 111.54,304.689 111.54,215.965 C 111.54,126.859 155.405,71.267 227.907,71.267 C 285.79,71.267 326.306,113.916 332.701,184.742 L 263.55,184.742 C 260.81,158.468 249.843,138.285 226.69,138.285 C 190.136,138.285 183.435,174.462 183.435,212.92 C 183.435,265.854 198.665,292.886 223.951,292.886 C 246.492,292.886 260.81,276.511 262.939,247.952 L 331.179,247.952 z M 570.013,247.952 C 564.228,318.401 526.758,359.905 459.74,359.905 C 398.507,359.905 350.379,304.689 350.379,215.965 C 350.379,126.859 394.244,71.267 466.746,71.267 C 524.625,71.267 565.14,113.916 571.536,184.742 L 502.384,184.742 C 499.649,158.468 488.682,138.285 465.529,138.285 C 428.971,138.285 422.27,174.462 422.27,212.92 C 422.27,265.854 437.504,292.886 462.785,292.886 C 485.327,292.886 499.649,276.511 501.778,247.952 L 570.013,247.952 z " horiz-adv-x="687.1578947368421" />
<glyph unicode="&#xe009;" d="M 64.00,416.00L 448.00,416.00L 448.00,32.00L 64.00,32.00z" />
<glyph unicode="&#xe00a;" d="M 192.00,416.00A64.00,64.00 12780.00 1 1 320.00,416A64.00,64.00 12780.00 1 1 192.00,416zM 327.765,359.765A64.00,64.00 12780.00 1 1 455.765,359.765A64.00,64.00 12780.00 1 1 327.765,359.765zM 416.00,224.00A32.00,32.00 12780.00 1 1 480.00,224A32.00,32.00 12780.00 1 1 416.00,224zM 359.765,88.235A32.00,32.00 12780.00 1 1 423.765,88.23500000000001A32.00,32.00 12780.00 1 1 359.765,88.23500000000001zM 224.001,32.00A32.00,32.00 12780.00 1 1 288.001,32A32.00,32.00 12780.00 1 1 224.001,32zM 88.236,88.235A32.00,32.00 12780.00 1 1 152.236,88.23500000000001A32.00,32.00 12780.00 1 1 88.236,88.23500000000001zM 72.236,359.765A48.00,48.00 12780.00 1 1 168.236,359.765A48.00,48.00 12780.00 1 1 72.236,359.765zM 28.00,224.00A36.00,36.00 12780.00 1 1 100.00,224A36.00,36.00 12780.00 1 1 28.00,224z" />
<glyph unicode="&#xe00b;" d="M 224.00,192.00 L 224.00-16.00 L 144.00,64.00 L 48.00-32.00 L 0.00,16.00 L 96.00,112.00 L 16.00,192.00 ZM 512.00,432.00 L 416.00,336.00 L 496.00,256.00 L 288.00,256.00 L 288.00,464.00 L 368.00,384.00 L 464.00,480.00 Z" />
<glyph unicode="&#xe00c;" d="M 256.00,448.00 C 397.385,448.00 512.00,354.875 512.00,240.00 C 512.00,125.124 397.385,32.00 256.00,32.00 C 242.422,32.00 229.095,32.867 216.088,34.522 C 161.099-20.467 95.463-30.328 32.00-31.776 L 32.00-18.318 C 66.268-1.529 96.00,29.052 96.00,64.00 C 96.00,68.877 95.621,73.665 94.918,78.348 C 37.02,116.48 0.00,174.725 0.00,240.00 C 0.00,354.875 114.615,448.00 256.00,448.00 Z" />
<glyph unicode="&#x20;" horiz-adv-x="256" />
<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
</font></defs></svg>
Side by side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
library/video-js/font/vjs.ttf Normal file
View file

Binary file not shown.

BIN
library/video-js/font/vjs.woff Normal file
View file

Binary file not shown.

907
library/video-js/video-js.css
View file

File diff suppressed because it is too large Load diff

1
library/video-js/video-js.min.css vendored
View file

File diff suppressed because one or more lines are too long

BIN
library/video-js/video-js.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8 KiB

BIN
library/video-js/video-js.swf
View file

Binary file not shown.

6079
library/video-js/video.dev.js Normal file
View file

File diff suppressed because it is too large Load diff

4690
library/video-js/video.js
View file

File diff suppressed because it is too large Load diff

21
library/video-js/video.min.js vendored
View file

File diff suppressed because one or more lines are too long

8
mod/videos.php
View file

@ -74,10 +74,14 @@ function videos_init(&$a) {
$tpl = get_markup_template("videos_head.tpl"); $tpl = get_markup_template("videos_head.tpl");
$a->page['htmlhead'] .= replace_macros($tpl,array()); $a->page['htmlhead'] .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(),
));
$tpl = get_markup_template("videos_end.tpl"); $tpl = get_markup_template("videos_end.tpl");
$a->page['end'] .= replace_macros($tpl,array()); $a->page['end'] .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(),
));
} }

6
view/templates/videos_head.tpl
View file

@ -1,6 +1,6 @@
<link href="library/video-js/video-js.min.css" rel="stylesheet"> <link href="library/video-js/video-js.css" rel="stylesheet">
<script src="library/video-js/video.min.js"></script> <script src="library/video-js/video.js"></script>
<script> <script>
_V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf" videojs.options.flash.swf = "{{$baseurl}}/library/video-js/video-js.swf"
</script> </script>

2
view/theme/frost-mobile/js/main.js
View file

@ -395,7 +395,7 @@
$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); $j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");
// setup videos, since VideoJS won't take care of any loaded via AJAX // setup videos, since VideoJS won't take care of any loaded via AJAX
if(typeof _V_ != 'undefined') _V_.autoSetup(); if(typeof videojs != 'undefined') videojs.autoSetup();
}); });
} }

2
view/theme/frost-mobile/js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
view/theme/frost-mobile/templates/videos_end.tpl
View file

@ -1,5 +1,5 @@
<script src="library/video-js/video.min.js"></script> <script src="library/video-js/video.js"></script>
<script> <script>
_V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf" videojs.options.flash.swf = "{{$baseurl}}/library/video-js/video-js.swf"
</script> </script>

2
view/theme/frost-mobile/templates/videos_head.tpl
View file

@ -1,2 +1,2 @@
<link href="library/video-js/video-js.min.css" rel="stylesheet"> <link href="library/video-js/video-js.css" rel="stylesheet">

2
view/theme/frost/js/main.js
View file

@ -410,7 +410,7 @@
collapseHeight(); collapseHeight();
// setup videos, since VideoJS won't take care of any loaded via AJAX // setup videos, since VideoJS won't take care of any loaded via AJAX
if(typeof _V_ != 'undefined') _V_.autoSetup(); if(typeof videojs != 'undefined') videojs.autoSetup();
}); });
} }

2
view/theme/frost/js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
view/theme/frost/templates/videos_end.tpl
View file

@ -1,5 +1,5 @@
<script src="library/video-js/video.min.js"></script> <script src="library/video-js/video.js"></script>
<script> <script>
_V_.options.flash.swf = "https://f.shmuz.in/library/video-js/video-js.swf" videojs.options.flash.swf = "{{$baseurl}}/library/video-js/video-js.swf"
</script> </script>

2
view/theme/frost/templates/videos_head.tpl
View file

@ -1,2 +1,2 @@
<link href="library/video-js/video-js.min.css" rel="stylesheet"> <link href="library/video-js/video-js.css" rel="stylesheet">