diff options
| author | root <root@dino.fm> | 2017-12-31 03:28:05 -0500 |
|---|---|---|
| committer | root <root@dino.fm> | 2017-12-31 03:28:05 -0500 |
| commit | c1975b505d5adff9421a03be980e22884d0d7b65 (patch) | |
| tree | a7a8460e146ec908b6a1c099af81075618507c79 | |
| parent | 410a5d6adcdb7dd8c22bdafb3f5c8e56b0b00667 (diff) | |
| parent | f4720c570fe87d1401ef5973f9f3ed360ba28a34 (diff) | |
Merge branch 'master' of ghghgh.us:scannerjammer
| -rwxr-xr-x | frontend/static/js/sj_compiled.js | 8 | ||||
| -rw-r--r-- | frontend/static/js/src/soundcloud.js | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/frontend/static/js/sj_compiled.js b/frontend/static/js/sj_compiled.js index 748950e..eed4401 100755 --- a/frontend/static/js/sj_compiled.js +++ b/frontend/static/js/sj_compiled.js @@ -2212,7 +2212,7 @@ var Soundcloud = if (e.success === false) return Soundcloud.error("failed to load") d.warn("LOADED") - Soundcloud.player = swfobject.getObjectById('soundcloud') + // Soundcloud.player = swfobject.getObjectById('soundcloud') $("#ytscreen").css("z-index", -2) // instead of raising events, the soundcloud swf calls it's js api directly window.soundcloud = { onPlayerReady: Soundcloud.ready, onMediaEnd: Soundcloud.finish } @@ -2221,7 +2221,7 @@ var Soundcloud = { d.warn("READY") Soundcloud.playing = true - Soundcloud.player = swfobject.getObjectById('soundcloud') + // Soundcloud.player = swfobject.getObjectById('soundcloud') if (Soundcloud.player) { Soundcloud.player.api_play() @@ -2304,7 +2304,7 @@ var Soundcloud = { d.warn("SOUNDCLOUD FINISH") Soundcloud.playing = false - swfobject.removeSWF("soundcloud") + // swfobject.removeSWF("soundcloud") Player.finish() }, load: function () @@ -2315,7 +2315,7 @@ var Soundcloud = unload: function () { d.warn("SOUNDCLOUD UNLOADED") - swfobject.removeSWF("soundcloud") + // swfobject.removeSWF("soundcloud") Soundcloud.loaded = false Soundcloud.playing = false }, diff --git a/frontend/static/js/src/soundcloud.js b/frontend/static/js/src/soundcloud.js index 4061f99..e2f0435 100644 --- a/frontend/static/js/src/soundcloud.js +++ b/frontend/static/js/src/soundcloud.js @@ -40,7 +40,7 @@ var Soundcloud = if (e.success === false) return Soundcloud.error("failed to load") d.warn("LOADED") - Soundcloud.player = swfobject.getObjectById('soundcloud') + // Soundcloud.player = swfobject.getObjectById('soundcloud') $("#ytscreen").css("z-index", -2) // instead of raising events, the soundcloud swf calls it's js api directly window.soundcloud = { onPlayerReady: Soundcloud.ready, onMediaEnd: Soundcloud.finish } @@ -49,7 +49,7 @@ var Soundcloud = { d.warn("READY") Soundcloud.playing = true - Soundcloud.player = swfobject.getObjectById('soundcloud') + // Soundcloud.player = swfobject.getObjectById('soundcloud') if (Soundcloud.player) { Soundcloud.player.api_play() @@ -132,7 +132,7 @@ var Soundcloud = { d.warn("SOUNDCLOUD FINISH") Soundcloud.playing = false - swfobject.removeSWF("soundcloud") + // swfobject.removeSWF("soundcloud") Player.finish() }, load: function () @@ -143,7 +143,7 @@ var Soundcloud = unload: function () { d.warn("SOUNDCLOUD UNLOADED") - swfobject.removeSWF("soundcloud") + // swfobject.removeSWF("soundcloud") Soundcloud.loaded = false Soundcloud.playing = false }, |