Skip to content

Commit b175245

Browse files
terrillterrill
committed
Fix bug in handling of some data-* Boolean attributes
1 parent e840116 commit b175245

6 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎build/ableplayer.dist.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,31 +80,31 @@
8080
// The following variables CAN be overridden with HTML attributes
8181

8282
// autoplay
83-
if ($(media).attr('autoplay') !== undefined && $(media).attr('autoplay') !== "false") {
83+
if ($(media).attr('autoplay') !== undefined) {
8484
this.autoplay = true;
8585
}
8686
else {
8787
this.autoplay = false;
8888
}
8989

9090
// loop (NOT FULLY SUPPORTED)
91-
if ($(media).attr('loop') !== undefined && $(media).attr('loop') !== "false") {
91+
if ($(media).attr('loop') !== undefined && $(media).attr('loop') !== false) {
9292
this.loop = true;
9393
}
9494
else {
9595
this.loop = false;
9696
}
9797

9898
// start-time
99-
if ($(media).data('start-time') !== undefined && $(media).data('start-time') !== "") {
99+
if ($(media).data('start-time') !== undefined && $.isNumeric($(media).data('start-time'))) {
100100
this.startTime = $(media).data('start-time');
101101
}
102102
else {
103103
this.startTime = 0;
104104
}
105105

106106
// debug
107-
if ($(media).data('debug') !== undefined && $(media).data('debug') !== "false") {
107+
if ($(media).data('debug') !== undefined && $(media).data('debug') !== false) {
108108
this.debug = true;
109109
}
110110
else {
@@ -322,7 +322,7 @@
322322
// Now Playing
323323
// Shows "Now Playing:" plus the title of the current track above player
324324
// Only used if there is a playlist
325-
if ($(media).data('show-now-playing') !== undefined && $(media).data('show-now-playing') === "false") {
325+
if ($(media).data('show-now-playing') !== undefined && $(media).data('show-now-playing') === false) {
326326
this.showNowPlaying = false;
327327
}
328328
else {
@@ -348,14 +348,14 @@
348348

349349
if (this.fallback === 'jw') {
350350

351-
if ($(media).data('fallback-path') !== undefined && $(media).data('fallback-path') !== "false") {
351+
if ($(media).data('fallback-path') !== undefined && $(media).data('fallback-path') !== false) {
352352
this.fallbackPath = $(media).data('fallback-path');
353353
}
354354
else {
355355
this.fallbackPath = this.rootPath + 'thirdparty/';
356356
}
357357

358-
if ($(media).data('test-fallback') !== undefined && $(media).data('test-fallback') !== "false") {
358+
if ($(media).data('test-fallback') !== undefined && $(media).data('test-fallback') !== false) {
359359
this.testFallback = true;
360360
}
361361
}
@@ -373,7 +373,7 @@
373373
// 2. The value of this.lang, if a matching translation file is available
374374
// 3. English
375375
// To override this formula and force #2 to take precedence over #1, set data-force-lang="true"
376-
if ($(media).data('force-lang') !== undefined && $(media).data('force-lang') !== "false") {
376+
if ($(media).data('force-lang') !== undefined && $(media).data('force-lang') !== false) {
377377
this.forceLang = true;
378378
}
379379
else {

‎build/ableplayer.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,31 +80,31 @@
8080
// The following variables CAN be overridden with HTML attributes
8181

8282
// autoplay
83-
if ($(media).attr('autoplay') !== undefined && $(media).attr('autoplay') !== "false") {
83+
if ($(media).attr('autoplay') !== undefined) {
8484
this.autoplay = true;
8585
}
8686
else {
8787
this.autoplay = false;
8888
}
8989

9090
// loop (NOT FULLY SUPPORTED)
91-
if ($(media).attr('loop') !== undefined && $(media).attr('loop') !== "false") {
91+
if ($(media).attr('loop') !== undefined && $(media).attr('loop') !== false) {
9292
this.loop = true;
9393
}
9494
else {
9595
this.loop = false;
9696
}
9797

9898
// start-time
99-
if ($(media).data('start-time') !== undefined && $(media).data('start-time') !== "") {
99+
if ($(media).data('start-time') !== undefined && $.isNumeric($(media).data('start-time'))) {
100100
this.startTime = $(media).data('start-time');
101101
}
102102
else {
103103
this.startTime = 0;
104104
}
105105

106106
// debug
107-
if ($(media).data('debug') !== undefined && $(media).data('debug') !== "false") {
107+
if ($(media).data('debug') !== undefined && $(media).data('debug') !== false) {
108108
this.debug = true;
109109
}
110110
else {
@@ -322,7 +322,7 @@
322322
// Now Playing
323323
// Shows "Now Playing:" plus the title of the current track above player
324324
// Only used if there is a playlist
325-
if ($(media).data('show-now-playing') !== undefined && $(media).data('show-now-playing') === "false") {
325+
if ($(media).data('show-now-playing') !== undefined && $(media).data('show-now-playing') === false) {
326326
this.showNowPlaying = false;
327327
}
328328
else {
@@ -348,14 +348,14 @@
348348

349349
if (this.fallback === 'jw') {
350350

351-
if ($(media).data('fallback-path') !== undefined && $(media).data('fallback-path') !== "false") {
351+
if ($(media).data('fallback-path') !== undefined && $(media).data('fallback-path') !== false) {
352352
this.fallbackPath = $(media).data('fallback-path');
353353
}
354354
else {
355355
this.fallbackPath = this.rootPath + 'thirdparty/';
356356
}
357357

358-
if ($(media).data('test-fallback') !== undefined && $(media).data('test-fallback') !== "false") {
358+
if ($(media).data('test-fallback') !== undefined && $(media).data('test-fallback') !== false) {
359359
this.testFallback = true;
360360
}
361361
}
@@ -373,7 +373,7 @@
373373
// 2. The value of this.lang, if a matching translation file is available
374374
// 3. English
375375
// To override this formula and force #2 to take precedence over #1, set data-force-lang="true"
376-
if ($(media).data('force-lang') !== undefined && $(media).data('force-lang') !== "false") {
376+
if ($(media).data('force-lang') !== undefined && $(media).data('force-lang') !== false) {
377377
this.forceLang = true;
378378
}
379379
else {

0 commit comments

Comments
 (0)