From aa9512313c0d382beec2bc9bb6a9182866f029b2 Mon Sep 17 00:00:00 2001 From: Pieter Vantorre Date: Wed, 25 Jan 2017 11:16:23 +0100 Subject: [PATCH 1/2] An iOS hack should only exist on iOS --- src/soundjs/webaudio/WebAudioSoundInstance.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/soundjs/webaudio/WebAudioSoundInstance.js b/src/soundjs/webaudio/WebAudioSoundInstance.js index ed9df439..8979d902 100644 --- a/src/soundjs/webaudio/WebAudioSoundInstance.js +++ b/src/soundjs/webaudio/WebAudioSoundInstance.js @@ -237,7 +237,9 @@ this.createjs = this.createjs || {}; audioNode.disconnect(0); // necessary to prevent leak on iOS Safari 7-9. will throw in almost all other // browser implementations. - try { audioNode.buffer = s._scratchBuffer; } catch(e) {} + if ( createjs.BrowserDetect.isIOS ) { + try { audioNode.buffer = s._scratchBuffer; } catch(e) {} + } audioNode = null; } return audioNode; From 6ce1ebe40c1c3426f14c142c3798c42c92bcb13f Mon Sep 17 00:00:00 2001 From: Pieter Vantorre Date: Wed, 25 Jan 2017 11:51:37 +0100 Subject: [PATCH 2/2] Fixed case of folder to correctly build with grunt on case sensitive OS --- build/config.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/config.json b/build/config.json index 9355b4b6..16d014b8 100644 --- a/build/config.json +++ b/build/config.json @@ -4,13 +4,13 @@ "../src/createjs/utils/extend.js", "../src/createjs/utils/promote.js", - "../src/createjs/utils/IndexOf.js", - "../src/createjs/utils/Proxy.js", + "../src/createjs/utils/indexOf.js", + "../src/createjs/utils/proxy.js", "../src/createjs/utils/BrowserDetect.js", "../src/createjs/events/EventDispatcher.js", "../src/createjs/events/Event.js", - "../src/createjs/events/ErrorEvent.js", + "../src/preloadjs/events/ProgressEvent.js", "../src/preloadjs/data/LoadItem.js", "../src/preloadjs/data/Methods.js", @@ -32,9 +32,9 @@ "../src/soundjs/Sound.js", "../src/soundjs/AbstractSoundInstance.js", "../src/soundjs/AbstractPlugin.js", - "../src/soundjs/webAudio/WebAudioLoader.js", - "../src/soundjs/webAudio/WebAudioSoundInstance.js", - "../src/soundjs/webAudio/WebAudioPlugin.js", + "../src/soundjs/webaudio/WebAudioLoader.js", + "../src/soundjs/webaudio/WebAudioSoundInstance.js", + "../src/soundjs/webaudio/WebAudioPlugin.js", "../src/soundjs/htmlaudio/HTMLAudioTagPool.js", "../src/soundjs/htmlaudio/HTMLAudioSoundInstance.js", "../src/soundjs/htmlaudio/HTMLAudioPlugin.js"