Move temporary URL parameter switches into _dcLoaded(), timing fix

dandv · Jul 31, 2011 · 19d86a7 · 19d86a7
1 parent fcc5c1b
commit 19d86a7
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 60 deletions.
diff --git a/script/soundmanager2-jsmin.js b/script/soundmanager2-jsmin.js
diff --git a/script/soundmanager2-nodebug-jsmin.js b/script/soundmanager2-nodebug-jsmin.js
diff --git a/script/soundmanager2-nodebug.js b/script/soundmanager2-nodebug.js
@@ -220,31 +220,6 @@ function SoundManager(smURL, smID) {
     }
   }
 
-  /*
-   * Temporary feature: allow force of HTML5 via URL params: sm2-usehtml5audio=0 or 1
-   * Ditto for sm2-preferFlash, too.
-  */
-  /*
-  (function(){
-    var a = 'sm2-usehtml5audio=', l = _wl.toLowerCase(), b = null,
-    a2 = 'sm2-preferflash=', b2 = null, hasCon = (typeof console !== 'undefined' && typeof console.log !== 'undefined');
-    if (l.indexOf(a) !== -1) {
-      b = (l.charAt(l.indexOf(a)+a.length) === '1');
-      if (hasCon) {
-        console.log((b?'Enabling ':'Disabling ')+'useHTML5Audio via URL parameter');
-      }
-      _s.useHTML5Audio = b;
-    }
-    if (l.indexOf(a2) !== -1) {
-      b2 = (l.charAt(l.indexOf(a2)+a2.length) === '1');
-      if (hasCon) {
-        console.log((b2?'Enabling ':'Disabling ')+'preferFlash via URL parameter');
-      }
-      _s.preferFlash = b2;
-    }
-  }());
-  */
-
   /*
    * public soundManager API
   */
@@ -3053,7 +3028,7 @@ function SoundManager(smURL, smID) {
     if (_s.useHTML5Audio && _s.hasHTML5) {
       for (item in _s.audioFormats) {
         if (_s.audioFormats.hasOwnProperty(item)) {
-          tests.push(item + ': ' + _s.html5[item] + (!_s.html5[item] && _hasFlash && _s.flash[item] ? ' (using flash)' : (_s.preferFlash && _s.flash[item] && _hasFlash ? ' (preferring flash)': (!_s.html5[item] ? ' (' + (_s.audioFormats[item].required ? 'required, ':'') + 'and no flash)' : ''))));
+          tests.push(item + ': ' + _s.html5[item] + (!_s.html5[item] && _hasFlash && _s.flash[item] ? ' (using flash)' : (_s.preferFlash && _s.flash[item] && _hasFlash ? ' (preferring flash)': (!_s.html5[item] ? ' (' + (_s.audioFormats[item].required ? 'required, ':'') + 'and no flash support)' : ''))));
         }
       }
       //_s._wD('-- SoundManager 2: HTML5 support tests ('+_s.html5Test+'): '+tests.join(', ')+' --',1);
@@ -3124,6 +3099,31 @@ function SoundManager(smURL, smID) {
     _didDCLoaded = true;
     _initDebug();
 
+    /*
+     * Temporary feature: allow force of HTML5 via URL params: sm2-usehtml5audio=0 or 1
+     * Ditto for sm2-preferFlash, too.
+    */
+    /*
+    (function(){
+      var a = 'sm2-usehtml5audio=', l = _wl.toLowerCase(), b = null,
+      a2 = 'sm2-preferflash=', b2 = null, hasCon = (typeof console !== 'undefined' && typeof console.log !== 'undefined');
+      if (l.indexOf(a) !== -1) {
+        b = (l.charAt(l.indexOf(a)+a.length) === '1');
+        if (hasCon) {
+          console.log((b?'Enabling ':'Disabling ')+'useHTML5Audio via URL parameter');
+        }
+        _s.useHTML5Audio = b;
+      }
+      if (l.indexOf(a2) !== -1) {
+        b2 = (l.charAt(l.indexOf(a2)+a2.length) === '1');
+        if (hasCon) {
+          console.log((b2?'Enabling ':'Disabling ')+'preferFlash via URL parameter');
+        }
+        _s.preferFlash = b2;
+      }
+    }());
+    */
+
     if (!_hasFlash && _s.hasHTML5) {
       //_s._wD('SoundManager: No Flash detected'+(!_s.useHTML5Audio?', enabling HTML5.':'. Trying HTML5-only mode.'));
       _s.useHTML5Audio = true;