diff options
author | Jukka Jylänki <jujjyl@gmail.com> | 2013-08-08 22:11:43 +0300 |
---|---|---|
committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-08-08 22:11:43 +0300 |
commit | 1b5f57912239c80c4d59a877b01ae614222f4ab1 (patch) | |
tree | 658164ba6238a976fc0fe64fc93f70bb0708b3a7 | |
parent | d92a3ab59d8446d3e2fc7e38a7090f097bc5af82 (diff) |
Do not attempt browser image decoding if the browser does not have the window.URL or window.webkitURL objects. Fix the warning print to appear in that case on Opera/9.80 (Windows NT 6.1; WOW64) Presto/2.12.388 Version/12.16.
-rw-r--r-- | src/library_browser.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/library_browser.js b/src/library_browser.js index 0db2cc44..571ed96c 100644 --- a/src/library_browser.js +++ b/src/library_browser.js @@ -60,7 +60,11 @@ mergeInto(LibraryManager.library, { console.log("warning: no blob constructor, cannot create blobs with mimetypes"); } Browser.BlobBuilder = typeof MozBlobBuilder != "undefined" ? MozBlobBuilder : (typeof WebKitBlobBuilder != "undefined" ? WebKitBlobBuilder : (!Browser.hasBlobConstructor ? console.log("warning: no BlobBuilder") : null)); - Browser.URLObject = typeof window != "undefined" ? (window.URL ? window.URL : window.webkitURL) : console.log("warning: cannot create object URLs"); + Browser.URLObject = typeof window != "undefined" ? (window.URL ? window.URL : window.webkitURL) : undefined; + if (!Module.noImageDecoding && typeof Browser.URLObject === 'undefined') { + console.log("warning: Browser does not support creating object URLs. Built-in browser image decoding will not be available."); + Module.noImageDecoding = true; + } // Support for plugins that can process preloaded files. You can add more of these to // your app by creating and appending to Module.preloadPlugins. |