aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2019-06-21 00:19:51 +1000
committerSam Potts <sam@potts.es>2019-06-21 00:19:51 +1000
commit6438baaddca338c22e25121afb10e15b91adfa7f (patch)
tree059c236189936bde02572ce70be6a96390b4a585 /src
parent95092edc93d713b927c637cefc27945f8537d565 (diff)
parent8fc6c2ba526bf1ef8cdb9476f1644089281ce60d (diff)
downloadplyr-6438baaddca338c22e25121afb10e15b91adfa7f.tar.lz
plyr-6438baaddca338c22e25121afb10e15b91adfa7f.tar.xz
plyr-6438baaddca338c22e25121afb10e15b91adfa7f.zip
Merge branch 'develop'
Diffstat (limited to 'src')
-rw-r--r--src/js/controls.js2
-rw-r--r--src/js/fullscreen.js1
-rw-r--r--src/js/plugins/ads.js2
-rw-r--r--src/js/plugins/preview-thumbnails.js (renamed from src/js/plugins/previewThumbnails.js)1
-rw-r--r--src/js/plugins/vimeo.js2
-rw-r--r--src/js/plugins/youtube.js4
-rw-r--r--src/js/plyr.js4
-rw-r--r--src/js/ui.js2
-rw-r--r--src/js/utils/load-image.js (renamed from src/js/utils/loadImage.js)0
-rw-r--r--src/js/utils/load-script.js (renamed from src/js/utils/loadScript.js)0
-rw-r--r--src/js/utils/load-sprite.js (renamed from src/js/utils/loadSprite.js)0
-rw-r--r--src/sass/plugins/preview-thumbnails.scss (renamed from src/sass/plugins/previewThumbnails.scss)0
-rw-r--r--src/sass/plyr.scss2
13 files changed, 9 insertions, 11 deletions
diff --git a/src/js/controls.js b/src/js/controls.js
index 43a92140..7afcd2c0 100644
--- a/src/js/controls.js
+++ b/src/js/controls.js
@@ -28,7 +28,7 @@ import {
import { off, on } from './utils/events';
import i18n from './utils/i18n';
import is from './utils/is';
-import loadSprite from './utils/loadSprite';
+import loadSprite from './utils/load-sprite';
import { extend } from './utils/objects';
import { getPercentage, replaceAll, toCamelCase, toTitleCase } from './utils/strings';
import { formatTime, getHours } from './utils/time';
diff --git a/src/js/fullscreen.js b/src/js/fullscreen.js
index d4d15b23..4de8da88 100644
--- a/src/js/fullscreen.js
+++ b/src/js/fullscreen.js
@@ -4,7 +4,6 @@
// https://webkit.org/blog/7929/designing-websites-for-iphone-x/
// ==========================================================================
-import { repaint } from './utils/animation';
import browser from './utils/browser';
import { hasClass, toggleClass, trapFocus } from './utils/elements';
import { on, triggerEvent } from './utils/events';
diff --git a/src/js/plugins/ads.js b/src/js/plugins/ads.js
index e6fab967..db55e499 100644
--- a/src/js/plugins/ads.js
+++ b/src/js/plugins/ads.js
@@ -10,7 +10,7 @@ import { createElement } from '../utils/elements';
import { triggerEvent } from '../utils/events';
import i18n from '../utils/i18n';
import is from '../utils/is';
-import loadScript from '../utils/loadScript';
+import loadScript from '../utils/load-script';
import { formatTime } from '../utils/time';
import { buildUrlParams } from '../utils/urls';
diff --git a/src/js/plugins/previewThumbnails.js b/src/js/plugins/preview-thumbnails.js
index 67367b95..61021d64 100644
--- a/src/js/plugins/previewThumbnails.js
+++ b/src/js/plugins/preview-thumbnails.js
@@ -2,7 +2,6 @@ import { createElement } from '../utils/elements';
import { once } from '../utils/events';
import fetch from '../utils/fetch';
import is from '../utils/is';
-import { extend } from '../utils/objects';
import { formatTime } from '../utils/time';
// Arg: vttDataString example: "WEBVTT\n\n1\n00:00:05.000 --> 00:00:10.000\n1080p-00001.jpg"
diff --git a/src/js/plugins/vimeo.js b/src/js/plugins/vimeo.js
index bef48708..91019abf 100644
--- a/src/js/plugins/vimeo.js
+++ b/src/js/plugins/vimeo.js
@@ -9,7 +9,7 @@ import { createElement, replaceElement, toggleClass } from '../utils/elements';
import { triggerEvent } from '../utils/events';
import fetch from '../utils/fetch';
import is from '../utils/is';
-import loadScript from '../utils/loadScript';
+import loadScript from '../utils/load-script';
import { extend } from '../utils/objects';
import { format, stripHTML } from '../utils/strings';
import { setAspectRatio } from '../utils/style';
diff --git a/src/js/plugins/youtube.js b/src/js/plugins/youtube.js
index 34c5de7e..31d22bb4 100644
--- a/src/js/plugins/youtube.js
+++ b/src/js/plugins/youtube.js
@@ -7,8 +7,8 @@ import { createElement, replaceElement, toggleClass } from '../utils/elements';
import { triggerEvent } from '../utils/events';
import fetch from '../utils/fetch';
import is from '../utils/is';
-import loadImage from '../utils/loadImage';
-import loadScript from '../utils/loadScript';
+import loadImage from '../utils/load-image';
+import loadScript from '../utils/load-script';
import { extend } from '../utils/objects';
import { format, generateId } from '../utils/strings';
import { setAspectRatio } from '../utils/style';
diff --git a/src/js/plyr.js b/src/js/plyr.js
index 84fa87fa..3835cf94 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -15,7 +15,7 @@ import Fullscreen from './fullscreen';
import Listeners from './listeners';
import media from './media';
import Ads from './plugins/ads';
-import PreviewThumbnails from './plugins/previewThumbnails';
+import PreviewThumbnails from './plugins/preview-thumbnails';
import source from './source';
import Storage from './storage';
import support from './support';
@@ -24,7 +24,7 @@ import { closest } from './utils/arrays';
import { createElement, hasClass, removeElement, replaceElement, toggleClass, wrap } from './utils/elements';
import { off, on, once, triggerEvent, unbindListeners } from './utils/events';
import is from './utils/is';
-import loadSprite from './utils/loadSprite';
+import loadSprite from './utils/load-sprite';
import { clamp } from './utils/numbers';
import { cloneDeep, extend } from './utils/objects';
import { getAspectRatio, reduceAspectRatio, setAspectRatio, validateRatio } from './utils/style';
diff --git a/src/js/ui.js b/src/js/ui.js
index df52eb64..953ecba2 100644
--- a/src/js/ui.js
+++ b/src/js/ui.js
@@ -10,7 +10,7 @@ import { getElement, toggleClass } from './utils/elements';
import { ready, triggerEvent } from './utils/events';
import i18n from './utils/i18n';
import is from './utils/is';
-import loadImage from './utils/loadImage';
+import loadImage from './utils/load-image';
const ui = {
addStyleHook() {
diff --git a/src/js/utils/loadImage.js b/src/js/utils/load-image.js
index 8acd2496..8acd2496 100644
--- a/src/js/utils/loadImage.js
+++ b/src/js/utils/load-image.js
diff --git a/src/js/utils/loadScript.js b/src/js/utils/load-script.js
index 81ae36f4..81ae36f4 100644
--- a/src/js/utils/loadScript.js
+++ b/src/js/utils/load-script.js
diff --git a/src/js/utils/loadSprite.js b/src/js/utils/load-sprite.js
index fe4add00..fe4add00 100644
--- a/src/js/utils/loadSprite.js
+++ b/src/js/utils/load-sprite.js
diff --git a/src/sass/plugins/previewThumbnails.scss b/src/sass/plugins/preview-thumbnails.scss
index b2b272c1..b2b272c1 100644
--- a/src/sass/plugins/previewThumbnails.scss
+++ b/src/sass/plugins/preview-thumbnails.scss
diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss
index 2b6cfa20..144297f7 100644
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@@ -41,7 +41,7 @@
@import 'states/fullscreen';
@import 'plugins/ads';
-@import 'plugins/previewThumbnails';
+@import 'plugins/preview-thumbnails';
@import 'utils/animation';
@import 'utils/hidden';