Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'Gemmoroj/master' into V2.97a.20120624+DEV

  • Loading branch information...
commit 2be0088199f0115ddc20aedbb455dcada6c3669b 2 parents 600a442 + f500fc2
Scott Schiller authored
Showing with 4 additions and 4 deletions.
  1. +2 −2 script/soundmanager2-nodebug.js
  2. +2 −2 script/soundmanager2.js
4 script/soundmanager2-nodebug.js
View
@@ -1214,7 +1214,7 @@ function SoundManager(smURL, smID) {
if (_iO.autoLoad || _iO.autoPlay) {
_t._a = new Audio(_iO.url);
} else {
- _t._a = (_isOpera ? new Audio(null) : new Audio());
+ _t._a = (_isOpera && opera.version() < 10 ? new Audio(null) : new Audio());
}
_a = _t._a;
_a._called_load = false;
@@ -1722,7 +1722,7 @@ function SoundManager(smURL, smID) {
if (!_s.useHTML5Audio || typeof Audio === 'undefined') {
return false;
}
- var a = (typeof Audio !== 'undefined' ? (_isOpera ? new Audio(null) : new Audio()) : null),
+ var a = (typeof Audio !== 'undefined' ? (_isOpera && opera.version() < 10 ? new Audio(null) : new Audio()) : null),
item, lookup, support = {}, aF, i;
function _cp(m) {
var canPlay, i, j,
4 script/soundmanager2.js
View
@@ -2722,7 +2722,7 @@ function SoundManager(smURL, smID) {
} else {
// null for stupid Opera 9.64 case
- _t._a = (_isOpera ? new Audio(null) : new Audio());
+ _t._a = (_isOpera && opera.version() < 10 ? new Audio(null) : new Audio());
}
@@ -3817,7 +3817,7 @@ function SoundManager(smURL, smID) {
}
// double-whammy: Opera 9.64 throws WRONG_ARGUMENTS_ERR if no parameter passed to Audio(), and Webkit + iOS happily tries to load "null" as a URL. :/
- var a = (typeof Audio !== 'undefined' ? (_isOpera ? new Audio(null) : new Audio()) : null),
+ var a = (typeof Audio !== 'undefined' ? (_isOpera && opera.version() < 10 ? new Audio(null) : new Audio()) : null),
item, lookup, support = {}, aF, i;
function _cp(m) {
Please sign in to comment.
Something went wrong with that request. Please try again.