Style tweaks for preview plugin
This commit is contained in:
Sam Potts
parent
263e88f6b3
commit
c577eb01ce
2
demo/dist/demo.css
vendored
2
demo/dist/demo.css
vendored
File diff suppressed because one or more lines are too long
2
dist/plyr.css
vendored
2
dist/plyr.css
vendored
File diff suppressed because one or more lines are too long
86
dist/plyr.js
vendored
86
dist/plyr.js
vendored
@ -3443,10 +3443,12 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
previewThumbnails: {
|
||||
// Tooltip thumbs
|
||||
thumbContainer: 'plyr__preview-thumb',
|
||||
thumbContainerShown: 'plyr__preview-thumb--is-shown',
|
||||
imageContainer: 'plyr__preview-thumb__image-container',
|
||||
timeContainer: 'plyr__preview-thumb__time-container',
|
||||
// Scrubber
|
||||
scrubbingContainer: 'plyr__preview-scrubber'
|
||||
// Scrubbing
|
||||
scrubbingContainer: 'plyr__preview-scrubbing',
|
||||
scrubbingContainerShown: 'plyr__preview-scrubbing--is-shown'
|
||||
}
|
||||
},
|
||||
// Embed attributes
|
||||
@ -6620,7 +6622,7 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
function () {
|
||||
/**
|
||||
* PreviewThumbnails constructor.
|
||||
* @param {object} player
|
||||
* @param {Plyr} player
|
||||
* @return {PreviewThumbnails}
|
||||
*/
|
||||
function PreviewThumbnails(player) {
|
||||
@ -6633,7 +6635,7 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
this.loadedImages = [];
|
||||
this.elements = {
|
||||
thumb: {},
|
||||
scrubber: {}
|
||||
scrubbing: {}
|
||||
};
|
||||
|
||||
if (this.enabled) {
|
||||
@ -6772,13 +6774,13 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
}); // Hide thumbnail preview - on mouse click, mouse leave, and video play/seek. All four are required, e.g., for buffering
|
||||
|
||||
on.call(this.player, this.player.elements.progress, 'mouseleave click', function () {
|
||||
_this4.hideThumbContainer(true);
|
||||
_this4.toggleThumbContainer(false, true);
|
||||
});
|
||||
this.player.on('play', function () {
|
||||
_this4.hideThumbContainer(true);
|
||||
_this4.toggleThumbContainer(false, true);
|
||||
});
|
||||
this.player.on('seeked', function () {
|
||||
_this4.hideThumbContainer(false);
|
||||
_this4.toggleThumbContainer(false);
|
||||
}); // Show scrubbing preview
|
||||
|
||||
on.call(this.player, this.player.elements.progress, 'mousedown touchstart', function (event) {
|
||||
@ -6787,9 +6789,9 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
_this4.mouseDown = true; // Wait until media has a duration
|
||||
|
||||
if (_this4.player.media.duration) {
|
||||
_this4.showScrubbingContainer();
|
||||
_this4.toggleScrubbingContainer(true);
|
||||
|
||||
_this4.hideThumbContainer(true); // Download and show image
|
||||
_this4.toggleThumbContainer(false, true); // Download and show image
|
||||
|
||||
|
||||
_this4.showImageAtCurrentTime();
|
||||
@ -6804,13 +6806,13 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
|
||||
if (Math.ceil(_this4.timeAtLastTimeupdate) === Math.ceil(_this4.player.media.currentTime)) {
|
||||
// The video was already seeked/loaded at the chosen time - hide immediately
|
||||
_this4.hideScrubbingContainer();
|
||||
_this4.toggleScrubbingContainer(false);
|
||||
} else {
|
||||
// The video hasn't seeked yet. Wait for that
|
||||
once.call(_this4.player, _this4.player.media, 'timeupdate', function () {
|
||||
// Re-check mousedown - we might have already started scrubbing again
|
||||
if (!_this4.mouseDown) {
|
||||
_this4.hideScrubbingContainer();
|
||||
_this4.toggleScrubbingContainer(false);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -6842,10 +6844,10 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
|
||||
this.player.elements.progress.appendChild(this.elements.thumb.container); // Create HTML element: plyr__preview-scrubbing-container
|
||||
|
||||
this.elements.scrubber.container = createElement('div', {
|
||||
this.elements.scrubbing.container = createElement('div', {
|
||||
class: this.player.config.classNames.previewThumbnails.scrubbingContainer
|
||||
});
|
||||
this.player.elements.wrapper.appendChild(this.elements.scrubber.container);
|
||||
this.player.elements.wrapper.appendChild(this.elements.scrubbing.container);
|
||||
}
|
||||
}, {
|
||||
key: "showImageAtCurrentTime",
|
||||
@ -6855,7 +6857,7 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
if (this.mouseDown) {
|
||||
this.setScrubbingContainerSize();
|
||||
} else {
|
||||
this.showThumbContainer();
|
||||
this.toggleThumbContainer(true);
|
||||
this.setThumbContainerSizeAndPos();
|
||||
} // Find the desired thumbnail index
|
||||
|
||||
@ -7053,32 +7055,29 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "showThumbContainer",
|
||||
value: function showThumbContainer() {
|
||||
this.elements.thumb.container.style.opacity = 1;
|
||||
}
|
||||
}, {
|
||||
key: "hideThumbContainer",
|
||||
value: function hideThumbContainer() {
|
||||
var clearShowing = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
||||
this.elements.thumb.container.style.opacity = 0;
|
||||
key: "toggleThumbContainer",
|
||||
value: function toggleThumbContainer() {
|
||||
var toggle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
||||
var clearShowing = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
||||
var className = this.player.config.classNames.previewThumbnails.thumbContainerShown;
|
||||
this.elements.thumb.container.classList.toggle(className, toggle);
|
||||
|
||||
if (clearShowing) {
|
||||
if (!toggle && clearShowing) {
|
||||
this.showingThumb = null;
|
||||
this.showingThumbFilename = null;
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "showScrubbingContainer",
|
||||
value: function showScrubbingContainer() {
|
||||
this.elements.scrubber.container.style.opacity = 1;
|
||||
}
|
||||
}, {
|
||||
key: "hideScrubbingContainer",
|
||||
value: function hideScrubbingContainer() {
|
||||
this.elements.scrubber.container.style.opacity = 0;
|
||||
this.showingThumb = null;
|
||||
this.showingThumbFilename = null;
|
||||
key: "toggleScrubbingContainer",
|
||||
value: function toggleScrubbingContainer() {
|
||||
var toggle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
||||
var className = this.player.config.classNames.previewThumbnails.scrubbingContainerShown;
|
||||
this.elements.scrubbing.container.classList.toggle(className, toggle);
|
||||
|
||||
if (!toggle) {
|
||||
this.showingThumb = null;
|
||||
this.showingThumbFilename = null;
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "determineContainerAutoSizing",
|
||||
@ -7126,9 +7125,9 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
}, {
|
||||
key: "setScrubbingContainerSize",
|
||||
value: function setScrubbingContainerSize() {
|
||||
this.elements.scrubber.container.style.width = "".concat(this.player.media.clientWidth, "px"); // Can't use media.clientHeight - html5 video goes big and does black bars above and below
|
||||
this.elements.scrubbing.container.style.width = "".concat(this.player.media.clientWidth, "px"); // Can't use media.clientHeight - html5 video goes big and does black bars above and below
|
||||
|
||||
this.elements.scrubber.container.style.height = "".concat(this.player.media.clientWidth / this.thumbAspectRatio, "px");
|
||||
this.elements.scrubbing.container.style.height = "".concat(this.player.media.clientWidth / this.thumbAspectRatio, "px");
|
||||
} // Sprites need to be offset to the correct location
|
||||
|
||||
}, {
|
||||
@ -7139,11 +7138,11 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
} // Find difference between height and preview container height
|
||||
|
||||
|
||||
var heightMulti = this.thumbContainerHeight / frame.h;
|
||||
previewImage.style.height = "".concat(Math.floor(previewImage.naturalHeight * heightMulti), "px");
|
||||
previewImage.style.width = "".concat(Math.floor(previewImage.naturalWidth * heightMulti), "px");
|
||||
previewImage.style.left = "-".concat(Math.ceil(frame.x * heightMulti), "px");
|
||||
previewImage.style.top = "-".concat(frame.y * heightMulti, "px"); // TODO: might need to round this one up too
|
||||
var multiplier = this.thumbContainerHeight / frame.h;
|
||||
previewImage.style.height = "".concat(Math.floor(previewImage.naturalHeight * multiplier), "px");
|
||||
previewImage.style.width = "".concat(Math.floor(previewImage.naturalWidth * multiplier), "px");
|
||||
previewImage.style.left = "-".concat(frame.x * multiplier, "px");
|
||||
previewImage.style.top = "-".concat(frame.y * multiplier, "px");
|
||||
}
|
||||
}, {
|
||||
key: "enabled",
|
||||
@ -7154,7 +7153,7 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
key: "currentImageContainer",
|
||||
get: function get() {
|
||||
if (this.mouseDown) {
|
||||
return this.elements.scrubber.container;
|
||||
return this.elements.scrubbing.container;
|
||||
}
|
||||
|
||||
return this.elements.thumb.imageContainer;
|
||||
@ -7177,7 +7176,8 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
key: "thumbContainerHeight",
|
||||
get: function get() {
|
||||
if (this.mouseDown) {
|
||||
return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio); // Can't use media.clientHeight - html5 video goes big and does black bars above and below
|
||||
// Can't use media.clientHeight - HTML5 video goes big and does black bars above and below
|
||||
return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio);
|
||||
}
|
||||
|
||||
return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio / 4);
|
||||
|
||||
2
dist/plyr.js.map
vendored
2
dist/plyr.js.map
vendored
File diff suppressed because one or more lines are too long
2
dist/plyr.min.js
vendored
2
dist/plyr.min.js
vendored
File diff suppressed because one or more lines are too long
2
dist/plyr.min.js.map
vendored
2
dist/plyr.min.js.map
vendored
File diff suppressed because one or more lines are too long
86
dist/plyr.polyfilled.js
vendored
86
dist/plyr.polyfilled.js
vendored
@ -6505,10 +6505,12 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
previewThumbnails: {
|
||||
// Tooltip thumbs
|
||||
thumbContainer: 'plyr__preview-thumb',
|
||||
thumbContainerShown: 'plyr__preview-thumb--is-shown',
|
||||
imageContainer: 'plyr__preview-thumb__image-container',
|
||||
timeContainer: 'plyr__preview-thumb__time-container',
|
||||
// Scrubber
|
||||
scrubbingContainer: 'plyr__preview-scrubber'
|
||||
// Scrubbing
|
||||
scrubbingContainer: 'plyr__preview-scrubbing',
|
||||
scrubbingContainerShown: 'plyr__preview-scrubbing--is-shown'
|
||||
}
|
||||
},
|
||||
// Embed attributes
|
||||
@ -9747,7 +9749,7 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
function () {
|
||||
/**
|
||||
* PreviewThumbnails constructor.
|
||||
* @param {object} player
|
||||
* @param {Plyr} player
|
||||
* @return {PreviewThumbnails}
|
||||
*/
|
||||
function PreviewThumbnails(player) {
|
||||
@ -9760,7 +9762,7 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
this.loadedImages = [];
|
||||
this.elements = {
|
||||
thumb: {},
|
||||
scrubber: {}
|
||||
scrubbing: {}
|
||||
};
|
||||
|
||||
if (this.enabled) {
|
||||
@ -9899,13 +9901,13 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
}); // Hide thumbnail preview - on mouse click, mouse leave, and video play/seek. All four are required, e.g., for buffering
|
||||
|
||||
on.call(this.player, this.player.elements.progress, 'mouseleave click', function () {
|
||||
_this4.hideThumbContainer(true);
|
||||
_this4.toggleThumbContainer(false, true);
|
||||
});
|
||||
this.player.on('play', function () {
|
||||
_this4.hideThumbContainer(true);
|
||||
_this4.toggleThumbContainer(false, true);
|
||||
});
|
||||
this.player.on('seeked', function () {
|
||||
_this4.hideThumbContainer(false);
|
||||
_this4.toggleThumbContainer(false);
|
||||
}); // Show scrubbing preview
|
||||
|
||||
on.call(this.player, this.player.elements.progress, 'mousedown touchstart', function (event) {
|
||||
@ -9914,9 +9916,9 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
_this4.mouseDown = true; // Wait until media has a duration
|
||||
|
||||
if (_this4.player.media.duration) {
|
||||
_this4.showScrubbingContainer();
|
||||
_this4.toggleScrubbingContainer(true);
|
||||
|
||||
_this4.hideThumbContainer(true); // Download and show image
|
||||
_this4.toggleThumbContainer(false, true); // Download and show image
|
||||
|
||||
|
||||
_this4.showImageAtCurrentTime();
|
||||
@ -9931,13 +9933,13 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
|
||||
if (Math.ceil(_this4.timeAtLastTimeupdate) === Math.ceil(_this4.player.media.currentTime)) {
|
||||
// The video was already seeked/loaded at the chosen time - hide immediately
|
||||
_this4.hideScrubbingContainer();
|
||||
_this4.toggleScrubbingContainer(false);
|
||||
} else {
|
||||
// The video hasn't seeked yet. Wait for that
|
||||
once.call(_this4.player, _this4.player.media, 'timeupdate', function () {
|
||||
// Re-check mousedown - we might have already started scrubbing again
|
||||
if (!_this4.mouseDown) {
|
||||
_this4.hideScrubbingContainer();
|
||||
_this4.toggleScrubbingContainer(false);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -9969,10 +9971,10 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
|
||||
this.player.elements.progress.appendChild(this.elements.thumb.container); // Create HTML element: plyr__preview-scrubbing-container
|
||||
|
||||
this.elements.scrubber.container = createElement('div', {
|
||||
this.elements.scrubbing.container = createElement('div', {
|
||||
class: this.player.config.classNames.previewThumbnails.scrubbingContainer
|
||||
});
|
||||
this.player.elements.wrapper.appendChild(this.elements.scrubber.container);
|
||||
this.player.elements.wrapper.appendChild(this.elements.scrubbing.container);
|
||||
}
|
||||
}, {
|
||||
key: "showImageAtCurrentTime",
|
||||
@ -9982,7 +9984,7 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
if (this.mouseDown) {
|
||||
this.setScrubbingContainerSize();
|
||||
} else {
|
||||
this.showThumbContainer();
|
||||
this.toggleThumbContainer(true);
|
||||
this.setThumbContainerSizeAndPos();
|
||||
} // Find the desired thumbnail index
|
||||
|
||||
@ -10180,32 +10182,29 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "showThumbContainer",
|
||||
value: function showThumbContainer() {
|
||||
this.elements.thumb.container.style.opacity = 1;
|
||||
}
|
||||
}, {
|
||||
key: "hideThumbContainer",
|
||||
value: function hideThumbContainer() {
|
||||
var clearShowing = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
||||
this.elements.thumb.container.style.opacity = 0;
|
||||
key: "toggleThumbContainer",
|
||||
value: function toggleThumbContainer() {
|
||||
var toggle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
||||
var clearShowing = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
||||
var className = this.player.config.classNames.previewThumbnails.thumbContainerShown;
|
||||
this.elements.thumb.container.classList.toggle(className, toggle);
|
||||
|
||||
if (clearShowing) {
|
||||
if (!toggle && clearShowing) {
|
||||
this.showingThumb = null;
|
||||
this.showingThumbFilename = null;
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "showScrubbingContainer",
|
||||
value: function showScrubbingContainer() {
|
||||
this.elements.scrubber.container.style.opacity = 1;
|
||||
}
|
||||
}, {
|
||||
key: "hideScrubbingContainer",
|
||||
value: function hideScrubbingContainer() {
|
||||
this.elements.scrubber.container.style.opacity = 0;
|
||||
this.showingThumb = null;
|
||||
this.showingThumbFilename = null;
|
||||
key: "toggleScrubbingContainer",
|
||||
value: function toggleScrubbingContainer() {
|
||||
var toggle = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
||||
var className = this.player.config.classNames.previewThumbnails.scrubbingContainerShown;
|
||||
this.elements.scrubbing.container.classList.toggle(className, toggle);
|
||||
|
||||
if (!toggle) {
|
||||
this.showingThumb = null;
|
||||
this.showingThumbFilename = null;
|
||||
}
|
||||
}
|
||||
}, {
|
||||
key: "determineContainerAutoSizing",
|
||||
@ -10253,9 +10252,9 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
}, {
|
||||
key: "setScrubbingContainerSize",
|
||||
value: function setScrubbingContainerSize() {
|
||||
this.elements.scrubber.container.style.width = "".concat(this.player.media.clientWidth, "px"); // Can't use media.clientHeight - html5 video goes big and does black bars above and below
|
||||
this.elements.scrubbing.container.style.width = "".concat(this.player.media.clientWidth, "px"); // Can't use media.clientHeight - html5 video goes big and does black bars above and below
|
||||
|
||||
this.elements.scrubber.container.style.height = "".concat(this.player.media.clientWidth / this.thumbAspectRatio, "px");
|
||||
this.elements.scrubbing.container.style.height = "".concat(this.player.media.clientWidth / this.thumbAspectRatio, "px");
|
||||
} // Sprites need to be offset to the correct location
|
||||
|
||||
}, {
|
||||
@ -10266,11 +10265,11 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
} // Find difference between height and preview container height
|
||||
|
||||
|
||||
var heightMulti = this.thumbContainerHeight / frame.h;
|
||||
previewImage.style.height = "".concat(Math.floor(previewImage.naturalHeight * heightMulti), "px");
|
||||
previewImage.style.width = "".concat(Math.floor(previewImage.naturalWidth * heightMulti), "px");
|
||||
previewImage.style.left = "-".concat(Math.ceil(frame.x * heightMulti), "px");
|
||||
previewImage.style.top = "-".concat(frame.y * heightMulti, "px"); // TODO: might need to round this one up too
|
||||
var multiplier = this.thumbContainerHeight / frame.h;
|
||||
previewImage.style.height = "".concat(Math.floor(previewImage.naturalHeight * multiplier), "px");
|
||||
previewImage.style.width = "".concat(Math.floor(previewImage.naturalWidth * multiplier), "px");
|
||||
previewImage.style.left = "-".concat(frame.x * multiplier, "px");
|
||||
previewImage.style.top = "-".concat(frame.y * multiplier, "px");
|
||||
}
|
||||
}, {
|
||||
key: "enabled",
|
||||
@ -10281,7 +10280,7 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
key: "currentImageContainer",
|
||||
get: function get() {
|
||||
if (this.mouseDown) {
|
||||
return this.elements.scrubber.container;
|
||||
return this.elements.scrubbing.container;
|
||||
}
|
||||
|
||||
return this.elements.thumb.imageContainer;
|
||||
@ -10304,7 +10303,8 @@ typeof navigator === "object" && (function (global, factory) {
|
||||
key: "thumbContainerHeight",
|
||||
get: function get() {
|
||||
if (this.mouseDown) {
|
||||
return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio); // Can't use media.clientHeight - html5 video goes big and does black bars above and below
|
||||
// Can't use media.clientHeight - HTML5 video goes big and does black bars above and below
|
||||
return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio);
|
||||
}
|
||||
|
||||
return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio / 4);
|
||||
|
||||
2
dist/plyr.polyfilled.js.map
vendored
2
dist/plyr.polyfilled.js.map
vendored
File diff suppressed because one or more lines are too long
2
dist/plyr.polyfilled.min.js
vendored
2
dist/plyr.polyfilled.min.js
vendored
File diff suppressed because one or more lines are too long
2
dist/plyr.polyfilled.min.js.map
vendored
2
dist/plyr.polyfilled.min.js.map
vendored
File diff suppressed because one or more lines are too long
14
package.json
14
package.json
@ -39,9 +39,9 @@
|
||||
"babel-eslint": "^10.0.1",
|
||||
"@babel/preset-env": "^7.2.3",
|
||||
"del": "^3.0.0",
|
||||
"eslint": "^5.12.0",
|
||||
"eslint": "^5.12.1",
|
||||
"eslint-config-airbnb-base": "^13.1.0",
|
||||
"eslint-config-prettier": "^3.3.0",
|
||||
"eslint-config-prettier": "^3.6.0",
|
||||
"eslint-plugin-import": "^2.14.0",
|
||||
"fastly-purge": "^1.0.1",
|
||||
"git-branch": "^2.0.1",
|
||||
@ -68,21 +68,21 @@
|
||||
"prettier-eslint": "^8.8.2",
|
||||
"prettier-stylelint": "^0.4.2",
|
||||
"remark-cli": "^6.0.1",
|
||||
"remark-validate-links": "^7.1.2",
|
||||
"rollup-plugin-babel": "^4.2.0",
|
||||
"remark-validate-links": "^8.0.0",
|
||||
"rollup-plugin-babel": "^4.3.2",
|
||||
"rollup-plugin-commonjs": "^9.2.0",
|
||||
"rollup-plugin-node-resolve": "^4.0.0",
|
||||
"stylelint": "^9.9.0",
|
||||
"stylelint": "^9.10.1",
|
||||
"stylelint-config-prettier": "^4.0.0",
|
||||
"stylelint-config-recommended": "^2.1.0",
|
||||
"stylelint-config-sass-guidelines": "^5.3.0",
|
||||
"stylelint-order": "^2.0.0",
|
||||
"stylelint-scss": "^3.4.4",
|
||||
"stylelint-scss": "^3.5.1",
|
||||
"stylelint-selector-bem-pattern": "^2.0.0",
|
||||
"through2": "^3.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"core-js": "^2.6.1",
|
||||
"core-js": "^2.6.2",
|
||||
"custom-event-polyfill": "^1.0.6",
|
||||
"loadjs": "^3.5.5",
|
||||
"raven-js": "^3.27.0",
|
||||
|
||||
@ -377,10 +377,12 @@ const defaults = {
|
||||
previewThumbnails: {
|
||||
// Tooltip thumbs
|
||||
thumbContainer: 'plyr__preview-thumb',
|
||||
thumbContainerShown: 'plyr__preview-thumb--is-shown',
|
||||
imageContainer: 'plyr__preview-thumb__image-container',
|
||||
timeContainer: 'plyr__preview-thumb__time-container',
|
||||
// Scrubber
|
||||
scrubbingContainer: 'plyr__preview-scrubber',
|
||||
// Scrubbing
|
||||
scrubbingContainer: 'plyr__preview-scrubbing',
|
||||
scrubbingContainerShown: 'plyr__preview-scrubbing--is-shown',
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ const parseVtt = vttDataString => {
|
||||
class PreviewThumbnails {
|
||||
/**
|
||||
* PreviewThumbnails constructor.
|
||||
* @param {object} player
|
||||
* @param {Plyr} player
|
||||
* @return {PreviewThumbnails}
|
||||
*/
|
||||
constructor(player) {
|
||||
@ -78,7 +78,7 @@ class PreviewThumbnails {
|
||||
|
||||
this.elements = {
|
||||
thumb: {},
|
||||
scrubber: {},
|
||||
scrubbing: {},
|
||||
};
|
||||
|
||||
if (this.enabled) {
|
||||
@ -210,13 +210,13 @@ class PreviewThumbnails {
|
||||
|
||||
// Hide thumbnail preview - on mouse click, mouse leave, and video play/seek. All four are required, e.g., for buffering
|
||||
on.call(this.player, this.player.elements.progress, 'mouseleave click', () => {
|
||||
this.hideThumbContainer(true);
|
||||
this.toggleThumbContainer(false, true);
|
||||
});
|
||||
this.player.on('play', () => {
|
||||
this.hideThumbContainer(true);
|
||||
this.toggleThumbContainer(false, true);
|
||||
});
|
||||
this.player.on('seeked', () => {
|
||||
this.hideThumbContainer(false);
|
||||
this.toggleThumbContainer(false);
|
||||
});
|
||||
|
||||
// Show scrubbing preview
|
||||
@ -226,8 +226,8 @@ class PreviewThumbnails {
|
||||
this.mouseDown = true;
|
||||
// Wait until media has a duration
|
||||
if (this.player.media.duration) {
|
||||
this.showScrubbingContainer();
|
||||
this.hideThumbContainer(true);
|
||||
this.toggleScrubbingContainer(true);
|
||||
this.toggleThumbContainer(false, true);
|
||||
|
||||
// Download and show image
|
||||
this.showImageAtCurrentTime();
|
||||
@ -243,13 +243,13 @@ class PreviewThumbnails {
|
||||
// Hide scrubbing preview. But wait until the video has successfully seeked before hiding the scrubbing preview
|
||||
if (Math.ceil(this.timeAtLastTimeupdate) === Math.ceil(this.player.media.currentTime)) {
|
||||
// The video was already seeked/loaded at the chosen time - hide immediately
|
||||
this.hideScrubbingContainer();
|
||||
this.toggleScrubbingContainer(false);
|
||||
} else {
|
||||
// The video hasn't seeked yet. Wait for that
|
||||
once.call(this.player, this.player.media, 'timeupdate', () => {
|
||||
// Re-check mousedown - we might have already started scrubbing again
|
||||
if (!this.mouseDown) {
|
||||
this.hideScrubbingContainer();
|
||||
this.toggleScrubbingContainer(false);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -285,18 +285,18 @@ class PreviewThumbnails {
|
||||
this.player.elements.progress.appendChild(this.elements.thumb.container);
|
||||
|
||||
// Create HTML element: plyr__preview-scrubbing-container
|
||||
this.elements.scrubber.container = createElement('div', {
|
||||
this.elements.scrubbing.container = createElement('div', {
|
||||
class: this.player.config.classNames.previewThumbnails.scrubbingContainer,
|
||||
});
|
||||
|
||||
this.player.elements.wrapper.appendChild(this.elements.scrubber.container);
|
||||
this.player.elements.wrapper.appendChild(this.elements.scrubbing.container);
|
||||
}
|
||||
|
||||
showImageAtCurrentTime() {
|
||||
if (this.mouseDown) {
|
||||
this.setScrubbingContainerSize();
|
||||
} else {
|
||||
this.showThumbContainer();
|
||||
this.toggleThumbContainer(true);
|
||||
this.setThumbContainerSizeAndPos();
|
||||
}
|
||||
|
||||
@ -486,7 +486,7 @@ class PreviewThumbnails {
|
||||
|
||||
get currentImageContainer() {
|
||||
if (this.mouseDown) {
|
||||
return this.elements.scrubber.container;
|
||||
return this.elements.scrubbing.container;
|
||||
}
|
||||
|
||||
return this.elements.thumb.imageContainer;
|
||||
@ -506,7 +506,8 @@ class PreviewThumbnails {
|
||||
|
||||
get thumbContainerHeight() {
|
||||
if (this.mouseDown) {
|
||||
return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio); // Can't use media.clientHeight - html5 video goes big and does black bars above and below
|
||||
// Can't use media.clientHeight - HTML5 video goes big and does black bars above and below
|
||||
return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio);
|
||||
}
|
||||
|
||||
return Math.floor(this.player.media.clientWidth / this.thumbAspectRatio / 4);
|
||||
@ -528,27 +529,24 @@ class PreviewThumbnails {
|
||||
}
|
||||
}
|
||||
|
||||
showThumbContainer() {
|
||||
this.elements.thumb.container.style.opacity = 1;
|
||||
}
|
||||
toggleThumbContainer(toggle = false, clearShowing = false) {
|
||||
const className = this.player.config.classNames.previewThumbnails.thumbContainerShown;
|
||||
this.elements.thumb.container.classList.toggle(className, toggle);
|
||||
|
||||
hideThumbContainer(clearShowing = false) {
|
||||
this.elements.thumb.container.style.opacity = 0;
|
||||
|
||||
if (clearShowing) {
|
||||
if (!toggle && clearShowing) {
|
||||
this.showingThumb = null;
|
||||
this.showingThumbFilename = null;
|
||||
}
|
||||
}
|
||||
|
||||
showScrubbingContainer() {
|
||||
this.elements.scrubber.container.style.opacity = 1;
|
||||
}
|
||||
toggleScrubbingContainer(toggle = false) {
|
||||
const className = this.player.config.classNames.previewThumbnails.scrubbingContainerShown;
|
||||
this.elements.scrubbing.container.classList.toggle(className, toggle);
|
||||
|
||||
hideScrubbingContainer() {
|
||||
this.elements.scrubber.container.style.opacity = 0;
|
||||
this.showingThumb = null;
|
||||
this.showingThumbFilename = null;
|
||||
if (!toggle) {
|
||||
this.showingThumb = null;
|
||||
this.showingThumbFilename = null;
|
||||
}
|
||||
}
|
||||
|
||||
determineContainerAutoSizing() {
|
||||
@ -594,9 +592,9 @@ class PreviewThumbnails {
|
||||
|
||||
// Can't use 100% width, in case the video is a different aspect ratio to the video container
|
||||
setScrubbingContainerSize() {
|
||||
this.elements.scrubber.container.style.width = `${this.player.media.clientWidth}px`;
|
||||
this.elements.scrubbing.container.style.width = `${this.player.media.clientWidth}px`;
|
||||
// Can't use media.clientHeight - html5 video goes big and does black bars above and below
|
||||
this.elements.scrubber.container.style.height = `${this.player.media.clientWidth / this.thumbAspectRatio}px`;
|
||||
this.elements.scrubbing.container.style.height = `${this.player.media.clientWidth / this.thumbAspectRatio}px`;
|
||||
}
|
||||
|
||||
// Sprites need to be offset to the correct location
|
||||
@ -606,12 +604,12 @@ class PreviewThumbnails {
|
||||
}
|
||||
|
||||
// Find difference between height and preview container height
|
||||
const heightMulti = this.thumbContainerHeight / frame.h;
|
||||
const multiplier = this.thumbContainerHeight / frame.h;
|
||||
|
||||
previewImage.style.height = `${Math.floor(previewImage.naturalHeight * heightMulti)}px`;
|
||||
previewImage.style.width = `${Math.floor(previewImage.naturalWidth * heightMulti)}px`;
|
||||
previewImage.style.left = `-${Math.ceil(frame.x * heightMulti)}px`;
|
||||
previewImage.style.top = `-${frame.y * heightMulti}px`; // TODO: might need to round this one up too
|
||||
previewImage.style.height = `${Math.floor(previewImage.naturalHeight * multiplier)}px`;
|
||||
previewImage.style.width = `${Math.floor(previewImage.naturalWidth * multiplier)}px`;
|
||||
previewImage.style.left = `-${frame.x * multiplier}px`;
|
||||
previewImage.style.top = `-${frame.y * multiplier}px`;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -12,9 +12,16 @@
|
||||
padding: 3px;
|
||||
pointer-events: none;
|
||||
position: absolute;
|
||||
transition: opacity 0.2s 0.1s ease;
|
||||
transform: translate(0, 10px) scale(0.8);
|
||||
transform-origin: 50% 100%;
|
||||
transition: transform 0.2s 0.1s ease, opacity 0.2s 0.1s ease;
|
||||
z-index: 2;
|
||||
|
||||
&--is-shown {
|
||||
opacity: 1;
|
||||
transform: translate(0, 0) scale(1);
|
||||
}
|
||||
|
||||
// The background triangle
|
||||
&::before {
|
||||
border-left: $plyr-tooltip-arrow-size solid transparent;
|
||||
@ -31,6 +38,7 @@
|
||||
}
|
||||
|
||||
&__image-container {
|
||||
background: $plyr-color-heather;
|
||||
border-radius: 2px;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
@ -66,12 +74,13 @@
|
||||
}
|
||||
}
|
||||
|
||||
.plyr__preview-scrubber {
|
||||
.plyr__preview-scrubbing {
|
||||
bottom: 0;
|
||||
filter: blur(1px);
|
||||
height: 100%;
|
||||
left: 0;
|
||||
margin: auto; // Required when video is different dimensions to container (e.g., fullscreen)
|
||||
opacity: 0;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
@ -90,4 +99,8 @@
|
||||
top: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
&--is-shown {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user