Fixed a bug about missing url

perivickylh · Dec 14, 2016 · 32d2f3d · 32d2f3d
1 parent b9bc328
commit 32d2f3d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cocos2d/core/load-pipeline/loading-items.js b/cocos2d/core/load-pipeline/loading-items.js
@@ -69,9 +69,9 @@ function createItem (id, queueId) {
     var result, urlItem;
     if (typeof id === 'object' && id.id) {
         if (!id.type) {
-            id.type = Path.extname(id.id).toLowerCase().substr(1);
+            id.type = Path.extname(id.url).toLowerCase().substr(1);
         }
-        urlItem = _parseUrl(id.url || id.id);
+        urlItem = _parseUrl(id.url);
         result = {
             queueId: queueId,
             url: urlItem.url,

diff --git a/cocos2d/core/load-pipeline/pack-downloader.js b/cocos2d/core/load-pipeline/pack-downloader.js
@@ -83,7 +83,7 @@ module.exports = {
     _loadNewPack: function (uuid, packUuid, callback) {
         var self = this;
         var packUrl = cc.AssetLibrary.getImportedDir(packUuid) + '/' + packUuid + '.json';
-        LoadingItems.create(cc.loader, [{id: packUrl, ignoreMaxConcurrency: true}], function (err, queue) {
+        LoadingItems.create(cc.loader, [{url: packUrl, ignoreMaxConcurrency: true}], function (err, queue) {
             if (err) {
                 cc.error('Failed to download package for ' + uuid);
                 return callback(err);

diff --git a/test/qunit/unit/test-pipeline.js b/test/qunit/unit/test-pipeline.js
@@ -40,7 +40,7 @@ test('items', function () {
     var items = cc.LoadingItems.create(pipeline, [
         'res/Background.png',
         {
-            id: 'res/scene.json',
+            url: 'res/scene.json',
             type: 'scene',
             name: 'scene'
         }
@@ -111,7 +111,7 @@ test('pipeline flow', function () {
     var items = cc.LoadingItems.create(pipeline, [
         'res/Background.png',
         {
-            id: 'res/scene.json',
+            url: 'res/scene.json',
             type: 'scene',
             name: 'scene'
         },
@@ -222,7 +222,7 @@ asyncTest('content manipulation', function () {
     var items = cc.LoadingItems.create(pipeline, [
         'res/Background.png',
         {
-            id: 'res/scene.json',
+            url: 'res/scene.json',
             type: 'scene'
         },
         'res/role.plist',
@@ -235,4 +235,4 @@ asyncTest('content manipulation', function () {
     }, 2);
 });
 
-})();
+})();