Skip to content

Commit

Permalink
Merge branch 'mattfawcett-issue-213' #213 Add IE native fullscreen.
Browse files Browse the repository at this point in the history
  • Loading branch information
thepag committed Nov 21, 2014
2 parents 448ac43 + a9a4398 commit 507592d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 6 deletions.
14 changes: 12 additions & 2 deletions dist/jplayer/jquery.jplayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -353,13 +353,22 @@
'webkitExitFullscreen',
'',
''
],
ms: [
'',
'msFullscreenElement',
'msRequestFullscreen',
'msExitFullscreen',
'MSFullscreenChange',
'MSFullscreenError'
]
},
specOrder = [
'w3c',
'moz',
'webkit',
'webkitVideo'
'webkitVideo',
'ms'
],
fs, i, il;

Expand All @@ -368,7 +377,8 @@
w3c: !!d[spec.w3c[0]],
moz: !!d[spec.moz[0]],
webkit: typeof d[spec.webkit[3]] === 'function',
webkitVideo: typeof v[spec.webkitVideo[2]] === 'function'
webkitVideo: typeof v[spec.webkitVideo[2]] === 'function',
ms: typeof v[spec.ms[2]] === 'function'
},
used: {}
};
Expand Down
Loading

0 comments on commit 507592d

Please sign in to comment.