use flexible in x5

ElemeFE · Apr 24, 2017 · 9224784 · 9224784
1 parent 7e10df9
commit 9224784
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/build/flexible.debug.js b/build/flexible.debug.js
@@ -36,7 +36,8 @@
         var isChrome = win.chrome;
         var isIPhone = win.navigator.appVersion.match(/iphone/gi);
         var devicePixelRatio = win.devicePixelRatio;
-        if (isIPhone || isChrome) {
+        var isX5 = /TBS\/\d+/.test(win.navigator.userAgent)
+        if (isIPhone || isChrome || isX5) {
             // iOS下，对于2和3的屏，用2倍的方案，其余的用1倍方案
             if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {                
                 dpr = 3;
@@ -115,4 +116,4 @@
         return val;
     }
 
-})(window, window['lib'] || (window['lib'] = {}));
+})(window, window['lib'] || (window['lib'] = {}));
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": "0.3.2",
+  "version": "1.0.0",
   "homepage": "http://gitlab.alibaba-inc.com/mtb/lib-flexible",
   "author": [
     {

diff --git a/src/flexible.js b/src/flexible.js
@@ -36,7 +36,8 @@
         var isChrome = win.chrome;
         var isIPhone = win.navigator.appVersion.match(/iphone/gi);
         var devicePixelRatio = win.devicePixelRatio;
-        if (isIPhone || isChrome) {
+        var isX5 = /TBS\/\d+/.test(win.navigator.userAgent)
+        if (isIPhone || isChrome || isX5) {
             // iOS下，对于2和3的屏，用2倍的方案，其余的用1倍方案
             if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {                
                 dpr = 3;
@@ -115,4 +116,4 @@
         return val;
     }
 
-})(window, window['lib'] || (window['lib'] = {}));
+})(window, window['lib'] || (window['lib'] = {}));