From a65cc4e6878e220fa0ec1c2836765d7b347aac7d Mon Sep 17 00:00:00 2001 From: defcc Date: Mon, 29 Feb 2016 21:59:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=20isImage=20=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/qiniu.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/qiniu.js b/src/qiniu.js index fda85e94..780acb2e 100644 --- a/src/qiniu.js +++ b/src/qiniu.js @@ -182,21 +182,7 @@ function QiniuJsSDK() { * @return {Boolean} file is a image or not */ this.isImage = function(url) { - var res, suffix = ""; - var imageSuffixes = ["png", "jpg", "jpeg", "gif", "bmp"]; - var suffixMatch = /\.([a-zA-Z0-9]+)(\?|\@|$)/; - - if (!url || !suffixMatch.test(url)) { - return false; - } - res = suffixMatch.exec(url); - suffix = res[1].toLowerCase(); - for (var i = 0, l = imageSuffixes.length; i < l; i++) { - if (suffix === imageSuffixes[i]) { - return true; - } - } - return false; + return /\.(png|jpg|jpeg|gif|bmp)$/i.test(url); }; /** From 9f0ecb96c1404e60b77b86125e515e5c5ba09407 Mon Sep 17 00:00:00 2001 From: defcc Date: Tue, 1 Mar 2016 20:20:34 +0800 Subject: [PATCH 2/3] add paren --- src/qiniu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qiniu.js b/src/qiniu.js index 780acb2e..8fe99417 100644 --- a/src/qiniu.js +++ b/src/qiniu.js @@ -182,7 +182,7 @@ function QiniuJsSDK() { * @return {Boolean} file is a image or not */ this.isImage = function(url) { - return /\.(png|jpg|jpeg|gif|bmp)$/i.test(url); + return (/\.(png|jpg|jpeg|gif|bmp)$/i).test(url); }; /** From a46940fe50c05eab2187321b5944acfef1714095 Mon Sep 17 00:00:00 2001 From: defcc Date: Fri, 4 Mar 2016 22:30:13 +0800 Subject: [PATCH 3/3] strip hash and querystring --- src/qiniu.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qiniu.js b/src/qiniu.js index 8fe99417..7bfbd599 100644 --- a/src/qiniu.js +++ b/src/qiniu.js @@ -182,6 +182,7 @@ function QiniuJsSDK() { * @return {Boolean} file is a image or not */ this.isImage = function(url) { + url = url.split(/[?#]/)[0]; return (/\.(png|jpg|jpeg|gif|bmp)$/i).test(url); };