Add support for data-allow-fullscreen

terrill · terrill · commit 7f3fecdfd490 · 2016-04-16T12:41:45.000-07:00
diff --git a/README.md b/README.md
@@ -261,7 +261,8 @@ The following attributes make all this possible:
 
 
 The following attributes are supported on the `<video>` element only:
-    
+
+-   **data-allow-fullscreen** - optional; if set to "false" the player will not include a fullscreen button
 -   **data-youtube-id** - optional; 11-character YouTube ID, to play the YouTube video using *Able Player*.
 -   **data-youtube-desc-id** - optional; 11-character YouTube ID of the described version of a video. See the section below on *YouTube Support* for additional information. 
 -   **height** - height of the video in pixels. If not provided will
diff --git a/build/ableplayer.dist.js b/build/ableplayer.dist.js
@@ -178,6 +178,13 @@
       }
     }
 
+    if ($(media).data('allow-fullscreen') !== undefined && $(media).data('allow-fullscreen') === false) {
+      this.allowFullScreen = false;
+    }
+    else {
+      this.allowFullScreen = true;
+    }
+
     if ($(media).data('seek-interval') !== undefined && $(media).data('seek-interval') !== "") {
       var seekInterval = $(media).data('seek-interval');
       if (/^[1-9][0-9]*$/.test(seekInterval)) { // must be a whole number greater than 0
@@ -3411,7 +3418,7 @@
     // controlLayout['br'].push('help');
 
     // TODO: JW currently has a bug with fullscreen, anything that can be done about this?
-    if (this.mediaType === 'video' && this.player !== 'jw') {
+    if (this.mediaType === 'video' && this.allowFullScreen && this.player !== 'jw') {
       controlLayout['br'].push('fullscreen');
     }
 
diff --git a/build/ableplayer.js b/build/ableplayer.js
@@ -178,6 +178,13 @@
       }
     }
 
+    if ($(media).data('allow-fullscreen') !== undefined && $(media).data('allow-fullscreen') === false) {
+      this.allowFullScreen = false;
+    }
+    else {
+      this.allowFullScreen = true;
+    }
+
     if ($(media).data('seek-interval') !== undefined && $(media).data('seek-interval') !== "") {
       var seekInterval = $(media).data('seek-interval');
       if (/^[1-9][0-9]*$/.test(seekInterval)) { // must be a whole number greater than 0
@@ -3411,7 +3418,7 @@
     // controlLayout['br'].push('help');
 
     // TODO: JW currently has a bug with fullscreen, anything that can be done about this?
-    if (this.mediaType === 'video' && this.player !== 'jw') {
+    if (this.mediaType === 'video' && this.allowFullScreen && this.player !== 'jw') {
       controlLayout['br'].push('fullscreen');
     }
 
diff --git a/build/ableplayer.min.css b/build/ableplayer.min.css
diff --git a/build/ableplayer.min.js b/build/ableplayer.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ableplayer",
-  "version": "2.3.30",
+  "version": "2.3.31",
   "description": "fully accessible HTML5 media player",
   "homepage": "http://ableplayer.github.io/ableplayer",
   "bugs": "https://github.com/ableplayer/ableplayer/issues",
diff --git a/scripts/ableplayer-base.js b/scripts/ableplayer-base.js
@@ -178,6 +178,13 @@
       }
     }
 
+    if ($(media).data('allow-fullscreen') !== undefined && $(media).data('allow-fullscreen') === false) {
+      this.allowFullScreen = false;
+    }
+    else {
+      this.allowFullScreen = true;
+    }
+
     if ($(media).data('seek-interval') !== undefined && $(media).data('seek-interval') !== "") {
       var seekInterval = $(media).data('seek-interval');
       if (/^[1-9][0-9]*$/.test(seekInterval)) { // must be a whole number greater than 0
diff --git a/scripts/buildplayer.js b/scripts/buildplayer.js
@@ -836,7 +836,7 @@
     // controlLayout['br'].push('help');
 
     // TODO: JW currently has a bug with fullscreen, anything that can be done about this?
-    if (this.mediaType === 'video' && this.player !== 'jw') {
+    if (this.mediaType === 'video' && this.allowFullScreen && this.player !== 'jw') {
       controlLayout['br'].push('fullscreen');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,13 @@`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
	`181`	`+ if ($(media).data('allow-fullscreen') !== undefined && $(media).data('allow-fullscreen') === false) {`
	`182`	`+ this.allowFullScreen = false;`
	`183`	`+ }`
	`184`	`+ else {`
	`185`	`+ this.allowFullScreen = true;`
	`186`	`+ }`
	`187`	`+`
`181`	`188`	`if ($(media).data('seek-interval') !== undefined && $(media).data('seek-interval') !== "") {`
`182`	`189`	`var seekInterval = $(media).data('seek-interval');`
`183`	`190`	`if (/^[1-9][0-9]*$/.test(seekInterval)) { // must be a whole number greater than 0`
`@@ -3411,7 +3418,7 @@`
`3411`	`3418`	`// controlLayout['br'].push('help');`
`3412`	`3419`
`3413`	`3420`	`// TODO: JW currently has a bug with fullscreen, anything that can be done about this?`
`3414`		`- if (this.mediaType === 'video' && this.player !== 'jw') {`
	`3421`	`+ if (this.mediaType === 'video' && this.allowFullScreen && this.player !== 'jw') {`
`3415`	`3422`	`controlLayout['br'].push('fullscreen');`
`3416`	`3423`	`}`
`3417`	`3424`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ableplayer",`
`3`		`- "version": "2.3.30",`
	`3`	`+ "version": "2.3.31",`
`4`	`4`	`"description": "fully accessible HTML5 media player",`
`5`	`5`	`"homepage": "http://ableplayer.github.io/ableplayer",`
`6`	`6`	`"bugs": "https://github.com/ableplayer/ableplayer/issues",`
Original file line number	Diff line number	Diff line change
`@@ -836,7 +836,7 @@`
`836`	`836`	`// controlLayout['br'].push('help');`
`837`	`837`
`838`	`838`	`// TODO: JW currently has a bug with fullscreen, anything that can be done about this?`
`839`		`- if (this.mediaType === 'video' && this.player !== 'jw') {`
	`839`	`+ if (this.mediaType === 'video' && this.allowFullScreen && this.player !== 'jw') {`
`840`	`840`	`controlLayout['br'].push('fullscreen');`
`841`	`841`	`}`
`842`	`842`