Merge pull request #1 from NeoGuo/NeoGuo-patch-1

增加对base64图片的支持
egret-labs · Jun 13, 2015 · 0d1b8b6 · 0d1b8b6
2 parents 9781580 + 1365b57
commit 0d1b8b6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/egret/display/Texture.ts b/src/egret/display/Texture.ts
@@ -273,7 +273,7 @@ module egret {
             var winURL = window["URL"] || window["webkitURL"];
             if (Texture._bitmapCallbackMap[url] == null) {//非正在加载中
                 Texture._addToCallbackList(url, callback);
-                if (url.indexOf("http:") != 0 && url.indexOf("https:") != 0 && (Browser.getInstance().isIOS() && parseInt(Browser.getInstance().getIOSVersion().charAt(0)) >= 7) && winURL) {
+                if (url.indexOf("data:") != 0 && url.indexOf("http:") != 0 && url.indexOf("https:") != 0 && (Browser.getInstance().isIOS() && parseInt(Browser.getInstance().getIOSVersion().charAt(0)) >= 7) && winURL) {
                     var xhr = new XMLHttpRequest();
                     xhr.open("get", url, true);
                     xhr.responseType = "blob";
@@ -411,4 +411,4 @@ declare module egret_native {
 
         function removeTexture(filePath:string):void;
     }
-}
+}