From fb3cce42c113d13ad5f102bbc39d2a7d8bb403ef Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Mon, 12 Dec 2016 13:49:16 +0800 Subject: [PATCH] Allow URL incoming parameters(review) --- cocos2d/core/load-pipeline/audio-downloader.js | 2 +- cocos2d/core/load-pipeline/loading-items.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/load-pipeline/audio-downloader.js b/cocos2d/core/load-pipeline/audio-downloader.js index fe6cf350a6..3a041319d0 100644 --- a/cocos2d/core/load-pipeline/audio-downloader.js +++ b/cocos2d/core/load-pipeline/audio-downloader.js @@ -97,7 +97,7 @@ function downloadAudio (item, callback) { item.content = item.url; // If WebAudio is not supported, load using DOM mode - if (!__audioSupport.WEB_AUDIO || (item.param && item.param['useDom'])) { + if (!__audioSupport.WEB_AUDIO || (item.urlParam && item.urlParam['useDom'])) { return loadDomAudio(item, callback); } diff --git a/cocos2d/core/load-pipeline/loading-items.js b/cocos2d/core/load-pipeline/loading-items.js index 234a544634..0a5dfe0d9b 100644 --- a/cocos2d/core/load-pipeline/loading-items.js +++ b/cocos2d/core/load-pipeline/loading-items.js @@ -75,7 +75,7 @@ function createItem (id, queueId) { result = { queueId: queueId, url: urlItem.url, - param: urlItem.param, + urlParam: urlItem.param, error: null, content: null, complete: false, @@ -90,6 +90,7 @@ function createItem (id, queueId) { queueId: queueId, id: urlItem.url, url: urlItem.url, + urlParam: urlItem.param, type: Path.extname(id).toLowerCase().substr(1), error: null, content: null,