Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions css/freedomplayer.css
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,8 @@
width: 30%;
position: absolute;
left: 0;
height: 100%; }
height: 100%;
pointer-events: none; }
.freedomplayer .fp-rewind svg, .freedomplayer .fp-forward svg {
pointer-events: auto; }
.freedomplayer .fp-rewind svg:active, .freedomplayer .fp-forward svg:active {
Expand Down Expand Up @@ -994,4 +995,4 @@
width: 0 !important;
height: 0 !important;
overflow: hidden !important;
position: absolute; }
position: absolute; }
2 changes: 1 addition & 1 deletion css/freedomplayer.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions flowplayer/freedomplayer.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion flowplayer/fv-player.min.js

Large diffs are not rendered by default.

35 changes: 32 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const cleanCSS = require('gulp-clean-css'); // minify css
const wpPot = require('gulp-wp-pot'); // for generating the .pot file.
const sort = require('gulp-sort'); // recommended to prevent unnecessary changes in pot-file.
const zip = require('gulp-zip'); // zip project
const run = require('gulp-run'); // run commands

// project
const projectZipFile = 'fv-wordpress-flowplayer.zip';
Expand All @@ -23,15 +24,37 @@ const translationFile = 'fv-wordpress-flowplayer.pot';
const bugReport = 'https://foliovision.com/support';

// files to check
// const cssFrotend = ['./css/flowplayer.css', './css/fancybox.css', './css/lightbox.css', './css/colorbox.css'];
// const cssAdmin = ['./css/admin.css', './css/s3-browser.css', './css/s3-uploader.css'];
const freedomplayerDistCSS = ['./node_modules/freedomplayer/dist/skin/skin.css']
const freedomPlayerDistJS = ['./node_modules/freedomplayer/dist/freedomplayer.min.js']
const freedomPlayerCSS = ['./css/freedomplayer.css', './css/freedomplayer-additions.css'];
const modulesJs = ['./flowplayer/modules/fv-player.js', './flowplayer/modules/*.module.js'];
const youtubeJS = './flowplayer/fv-player-youtube.dev.js';
const dashJS = './flowplayer/fv-player-dashjs.dev.js';
const loaderJS = './flowplayer/fv-player-loader.dev.js'
const projectPHPWatchFiles = ['*.php', './controller/**/*.php', './models/**/*.php', './view/**/*.php'];

function updateBrowserList() {
return run('npx browserslist@latest --update-db --yes').exec();
}

function updateFreedomPlayerModule() {
return run('npm install freedomplayer@latest').exec();
}

function copyFreedomPlayerCSS() {
return src(freedomplayerDistCSS)
.pipe(rename(function (path) {
path.basename = "freedomplayer";
path.extname = ".css";
}))
.pipe(dest('./css/'));
}

function copyFreedomPlayerJS() {
return src(freedomPlayerDistJS)
.pipe(dest('./flowplayer/'));
}

// concat js files + uglify
function jsModulesMinify() {
return src(modulesJs)
Expand Down Expand Up @@ -100,11 +123,17 @@ function zipProject() {
};

// export tasks
exports.browserlist = updateBrowserList;
exports.zip = zipProject;
exports.pot = potFileGenerate;
exports.cssplayer = cssFreedomPlayer;
exports.freedomplayercss = copyFreedomPlayerCSS;
exports.freedomplayerjs= copyFreedomPlayerJS;
exports.freedomplayerupdate = updateFreedomPlayerModule;
exports.jsmodules = jsModulesMinify;
exports.jsfiles = jsFilessMinify;
exports.js = parallel( jsModulesMinify, jsFilessMinify );

exports.default = series( parallel(jsModulesMinify, jsFilessMinify, cssFreedomPlayer, potFileGenerate), zipProject );
exports.dev = series( parallel(jsModulesMinify, jsFilessMinify, cssFreedomPlayer) );

exports.release = series( updateFreedomPlayerModule, updateBrowserList, copyFreedomPlayerJS, copyFreedomPlayerCSS, parallel(jsModulesMinify, jsFilessMinify, cssFreedomPlayer, potFileGenerate), zipProject );
Loading