Skip to content

Commit

Permalink
Update VideoJS Player to latest revision, switch to CB 5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
MacWarrior committed Nov 1, 2018
1 parent 00665dc commit a2be537
Show file tree
Hide file tree
Showing 26 changed files with 106,262 additions and 43,777 deletions.
4 changes: 2 additions & 2 deletions VERSION
@@ -1,6 +1,6 @@
Product: ClipBucket - https://clipbucket.com
Version: 5.1.0 - STABLE
Last Updated: 22-05-2018
Version: 5.2.0 - STABLE
Last Updated: 01-11-2018
Copyright: ClipBucket
License: Attribution Assurance License
http://www.opensource.org/licenses/attribution.php
4 changes: 3 additions & 1 deletion upload/admin_area/styles/cb_2014/layout/index.html
Expand Up @@ -192,7 +192,7 @@ <h5>Recent Comments</h5>
</div>

<div class="well" style="margin-top: 14px;border:1px solid rgba(128, 213, 255, 1);" >
<h3>5.1.0 Changelogs <small><i>(Non-official version)</i></small></h3>
<h3>5.2.0 Changelogs <small><i>(Non-official version)</i></small></h3>
<ul>
<li><b>Refactor data storage<small>*</small></b></li>
<i>Data are not transformed before storage anymore (<b>"</b>Greeting: "Hello, World!"<b>"</b> was stored as <b>"</b>Greeting: &amp;quot;Hello, World!&amp;quot;<b>"</b>)</i>
Expand Down Expand Up @@ -222,6 +222,8 @@ <h3>5.1.0 Changelogs <small><i>(Non-official version)</i></small></h3>
<i>New permissions to limit the access to photos, collections, apply existing permissions on missing spots (like search)</i>
<li><b>Easy installation scripts</b></li>
<i>Don't search anymore for Debian 9, Ubuntu 17.10 & 16.04, CentOS 7 installation, there's a script for that now</i>
<li><b>Update VideoJS Player</b></li>
<i>VideoJS Player has been updated to latest revision</i>
<li><b>Fixs</b></li>
<i>Fix HTML/CSS/JS error/warnings/notices, many broken configurations, installation process, infinite loops, email tester, back office and front office pagination, many thumbs display, ...</i>
<li><b>Others</b></li>
Expand Down
6 changes: 3 additions & 3 deletions upload/cb_install/clipbucket.php
Expand Up @@ -9,9 +9,9 @@
*/

define("ClipBucket","ClipBucket - Open Source Media Sharing Script by Arslan Hassan");
define("VERSION","5.1.0");
define("VERSION","5.2.0");
define("STATE","STABLE");
define("REV","5194");
define("RELEASED","22-05-2018");
define("REV","5319");
define("RELEASED","01-11-2018");
define("AUTHORS","ARSLAN HASSAN, FAHAD ABBAS, MACWARRIOR");

4 changes: 2 additions & 2 deletions upload/cb_install/sql/configs.sql
@@ -1,7 +1,7 @@
-- Configurations

INSERT INTO `{tbl_prefix}config` (`name`, `value`) VALUES
('site_title', 'ClipBucket v5.1'),
('site_title', 'ClipBucket v5.2'),
('site_slogan', 'A way to broadcast yourself'),
('baseurl', ''),
('basedir', ''),
Expand Down Expand Up @@ -52,7 +52,7 @@ INSERT INTO `{tbl_prefix}config` (`name`, `value`) VALUES
('captcha_type', '0'),
('allow_upload', ''),
('allowed_video_types', 'wmv,avi,divx,3gp,mov,mpeg,mpg,xvid,flv,asf,rm,dat,mp4,mkv,webm'),
('version', '5.1'),
('version', '5.2'),
('version_type', 'Alpha'),
('allow_template_change', '1'),
('allow_language_change', '1'),
Expand Down
12 changes: 8 additions & 4 deletions upload/player/CB_video_js/cb_video_js.html
Expand Up @@ -72,7 +72,11 @@

{if config('chromecast')=='yes'}
<script type="text/javascript" src="{$cb_vjs_player_url}/js/cast_sender.js"></script>
{if $development_mode}
<script type="text/javascript" src="{$cb_vjs_player_url}/js/videojs-chromecast.js"></script>
{else}
<script type="text/javascript" src="{$cb_vjs_player_url}/js/videojs-chromecast.min.js"></script>
{/if}
<link rel="stylesheet" href="{$cb_vjs_player_url}/css/videojs-chromecast.css">
{/if}

Expand Down Expand Up @@ -143,7 +147,7 @@
//player settings
var cb_player_setup = {
plugins : { },
"techOrder" : ['html5', 'flash'],
"techOrder" : ['html5'],
"controls": controls,
"autoplay": autoplay,
"preload": "auto",
Expand Down Expand Up @@ -265,11 +269,11 @@
//Initializing
var cb_player = videojs('cb_video_js_'+vid_id, cb_player_setup , cb_vjs_callback);

$(document).ready(function() {
/*$(document).ready(function() {
$(".video-js").on("contextmenu",function() {
return false;
});
});
});
});*/

$(window).resize(function(event) {
new_player_height(vid_id);
Expand Down
11 changes: 6 additions & 5 deletions upload/player/CB_video_js/cb_video_js.php
@@ -1,12 +1,13 @@
<?php
/*
Player Name: cb video js 1.0 STABLE
Description: New Official cb video js player
Author: Fahad Abbas
ClipBucket Version: 2.8.1
Player Name: CB5.X VideoJS
Description: Official CB 5.X VideoJS 7.2.4 Player
Author: Arslan Hassan, MacWarrior
ClipBucket Version: 5.2
Website: https://github.com/MacWarrior/clipbucket
* @Author : Arslan Hassan
* @Author : Arslan Hassan, MacWarrior
* @Script : ClipBucket v2
* @License : Attribution Assurance License -- http://www.opensource.org/licenses/attribution.php
* @Since : September 15 2009
Expand Down
36 changes: 11 additions & 25 deletions upload/player/CB_video_js/css/cb_vjs_resolution.css
Expand Up @@ -3,33 +3,19 @@
font-family: VideoJS;
}

.vjs-resolution-button .vjs-resolution-button-staticlabel:before {
content: '\f110';
font-size: 1.8em;
line-height: 1.67;
.vjs-resolution-button:before {
content: '\f110';
font-size: 1.8em;
line-height: 1.67em;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
text-align: center;
box-sizing: inherit;
}

/*.vjs-resolution-button .vjs-resolution-button-label {
font-size: 1em;
line-height: 3em;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
text-align: center;
box-sizing: inherit;
font-family: Arial, Helvetica, sans-serif;
}
.vjs-resolution-button ul.vjs-menu-content {
width: 4em !important;
}
.vjs-resolution-button .vjs-menu {
left: 0;
}*/

.vjs-captions-button .vjs-menu li,
.vjs-resolution-button .vjs-menu li {
text-transform: none;
Expand Down

0 comments on commit a2be537

Please sign in to comment.