Skip to content

Commit fcbe0f9

Browse files
committed
Fix loading remote image without extension issue
1 parent 5ab968a commit fcbe0f9

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Diff for: cocos2d/core/textures/CCTextureCache.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,13 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
358358

359359
tex = locTexs[url] = new cc.Texture2D();
360360
tex.url = url;
361-
var loadFunc = cc.loader._checkIsImageURL(url) ? cc.loader.load : cc.loader.loadImg;
362-
loadFunc.call(cc.loader, url, function (err, img) {
361+
cc.loader.loadImg(url, function (err, img) {
363362
if (err)
364363
return cb && cb.call(target, err);
364+
365+
if (!cc.loader.cache[url]) {
366+
cc.loader.cache[url] = img;
367+
}
365368
cc.textureCache.handleLoadedTexture(url);
366369

367370
var texResult = locTexs[url];

Diff for: cocos2d/core/textures/TexturesWebGL.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -914,10 +914,13 @@ cc._tmp.WebGLTextureCache = function () {
914914

915915
tex = locTexs[url] = new cc.Texture2D();
916916
tex.url = url;
917-
var loadFunc = cc.loader._checkIsImageURL(url) ? cc.loader.load : cc.loader.loadImg;
918-
loadFunc.call(cc.loader, url, function (err, img) {
917+
cc.loader.loadImg(url, function (err, img) {
919918
if (err)
920919
return cb && cb.call(target, err);
920+
921+
if (!cc.loader.cache[url]) {
922+
cc.loader.cache[url] = img;
923+
}
921924
cc.textureCache.handleLoadedTexture(url);
922925

923926
var texResult = locTexs[url];

0 commit comments

Comments
 (0)