Merge pull request #2 from LiuXiangyu/master

+ get white list from crayfish
ElemeFE · Jul 7, 2017 · b0d9540 · b0d9540
2 parents ac8168d + 24ad787
commit b0d9540
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/build/flexible.debug.js b/build/flexible.debug.js
@@ -44,10 +44,13 @@
         var isIPhone = win.navigator.appVersion.match(/iphone/gi);
         var devicePixelRatio = win.devicePixelRatio;
         var isX5 = /TBS\/\d+/.test(win.navigator.userAgent)
-        var notInBlackList = blackUAList.every(function(ua) {
-            return !new RegExp(ua).test(navigator.userAgent)
-        })
-        if (isIPhone || isChrome || (isX5 && flexibleInX5) && notInBlackList) {
+        var isInWhiteList = false
+        try {
+          isInWhiteList = localStorage.getItem('IN_FLEXIBLE_WHITE_LIST') === 'true'
+        } catch (e) {
+          isInWhiteList = false
+        }
+        if (isIPhone || isChrome || (isX5 && flexibleInX5 && isInWhiteList)) {
             // iOS下，对于2和3的屏，用2倍的方案，其余的用1倍方案
             if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {
                 dpr = 3;

diff --git a/build/flexible.js b/build/flexible.js
diff --git a/build/package.json b/build/package.json
@@ -1,7 +1,7 @@
 {
   "name": "lib.flexible",
   "description": "移动端自适应方案",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "homepage": "http://gitlab.alibaba-inc.com/mtb/lib-flexible",
   "author": [
     {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "lib.flexible",
   "description": "移动端自适应方案",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "homepage": "http://gitlab.alibaba-inc.com/mtb/lib-flexible",
   "author": [
     {

diff --git a/src/flexible.js b/src/flexible.js
@@ -44,10 +44,13 @@
         var isIPhone = win.navigator.appVersion.match(/iphone/gi);
         var devicePixelRatio = win.devicePixelRatio;
         var isX5 = /TBS\/\d+/.test(win.navigator.userAgent)
-        var notInBlackList = blackUAList.every(function(ua) {
-            return !new RegExp(ua).test(navigator.userAgent)
-        })
-        if (isIPhone || isChrome || (isX5 && flexibleInX5) && notInBlackList) {
+        var isInWhiteList = false
+        try {
+          isInWhiteList = localStorage.getItem('IN_FLEXIBLE_WHITE_LIST') === 'true'
+        } catch (e) {
+          isInWhiteList = false
+        }
+        if (isIPhone || isChrome || (isX5 && flexibleInX5 && isInWhiteList)) {
             // iOS下，对于2和3的屏，用2倍的方案，其余的用1倍方案
             if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {
                 dpr = 3;