Merge branch 'develop' of github.com:sampotts/plyr into develop

# Conflicts:
#	src/js/captions.js
#	src/js/controls.js
#	src/js/fullscreen.js
#	src/js/html5.js
#	src/js/listeners.js
#	src/js/plugins/youtube.js
#	src/js/plyr.js
#	src/js/utils.js

1 files changed, 4 insertions, 4 deletions

diff --git a/src/js/fullscreen.js b/src/js/fullscreen.js
index 180853c5..998dc613 100644
--- a/src/js/fullscreen.js
+++ b/src/js/fullscreen.js
@@ -5,7 +5,7 @@
 
 import browser from './utils/browser';
 import { hasClass, toggleClass, toggleState, trapFocus } from './utils/elements';
-import { on, trigger } from './utils/events';
+import { on, triggerEvent } from './utils/events';
 import is from './utils/is';
 
 function onChange() {
@@ -20,7 +20,7 @@ function onChange() {
     }
 
     // Trigger an event
-    trigger.call(this.player, this.target, this.active ? 'enterfullscreen' : 'exitfullscreen', true);
+    triggerEvent.call(this.player, this.target, this.active ? 'enterfullscreen' : 'exitfullscreen', true);
 
     // Trap focus in container
     if (!browser.isIos) {
@@ -63,13 +63,13 @@ class Fullscreen {
 
         // Register event listeners
         // Handle event (incase user presses escape etc)
-        on(document, this.prefix === 'ms' ? 'MSFullscreenChange' : `${this.prefix}fullscreenchange`, () => {
+        on.call(this.player, document, this.prefix === 'ms' ? 'MSFullscreenChange' : `${this.prefix}fullscreenchange`, () => {
             // TODO: Filter for target??
             onChange.call(this);
         });
 
         // Fullscreen toggle on double click
-        on(this.player.elements.container, 'dblclick', event => {
+        on.call(this.player, this.player.elements.container, 'dblclick', event => {
             // Ignore double click in controls
             if (is.element(this.player.elements.controls) && this.player.elements.controls.contains(event.target)) {
                 return;