gm-util 5.12.3 → 5.12.6

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "gm-util",
-  "version": "5.12.3",
+  "version": "5.12.6",
   "description": "",
   "main": "src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "precommit": "eslint ./src/",
+    "precommit": "eslint --fix ./src/",
     "publishpatch": "git add --all; git commit -m 'c'; npm version patch; git push origin HEAD:master; npm publish --registry='https://registry.npmjs.org'; cnpm sync gm-util; npm version;"
   },
   "repository": {

package/src/index.js

@@ -36,6 +36,7 @@ import to from './to'
 import formatNumber from './formatNumber'
 import { getLocale, setLocale } from '../locales'
 import isZoom from './isZoom'
+import isZoom2 from './isZoom2'
 import { devWarnForHook, devWarn, warn } from './warn'
 
 export {
@@ -60,7 +61,7 @@ export {
   isElementOverViewport,
   getElementPosition,
   isZoom,
-
+  isZoom2,
   isPathMatch,
   setTitle, setIco,
   getScrollTop,

package/src/isZoom.js

@@ -1,5 +1,6 @@
 /**
  * 检测浏览器缩放. 文章: https://www.yuque.com/iyum9i/uur0qi/cup15r
+ * @deprecated 现在不起作用了
  */
 export default function isZoom () {
   const div = document.createElement('div')

package/src/isZoom2.js

@@ -0,0 +1,85 @@
+/**
+ * 检测浏览器缩放
+ */
+export default function isZoom2 () {
+  const detectZoomFunc = {
+    ie: () => { return window.screen.deviceXDPI / window.screen.logicalXDPI },
+    firefox: () => { return window.devicePixelRatio ? window.devicePixelRatio : n('min--moz-device-pixel-ratio', '', 0, 10, 20, 1e-4) },
+    opera: () => { return window.outerWidth / window.innerWidth },
+    chrome: () => {
+      if (window.devicePixelRatio) {
+        return window.devicePixelRatio
+      }
+      const o = window.document
+      const t = o.createElement('div')
+      t.innerHTML = '1'
+      t.setAttribute('style', 'font:100px/1em sans-serif-webkit-text-size-adjust:noneposition: absolutetop:-100%')
+      o.body.appendChild(t)
+      let n = 1e3 / t.clientHeight
+      n = Math.round(100 * n) / 100
+      o.body.removeChild(t)
+      return n
+    },
+    safari: () => { return window.outerWidth / window.innerWidth }
+  }
+
+  function round2 (number, fractionDigits) {
+    return Math.round(number * Math.pow(10, fractionDigits)) / Math.pow(10, fractionDigits)
+  }
+
+  function n (t, n, i, a, s, c) {
+    function l (e, o, i) {
+      const a = (e + o) / 2
+      if (i <= 0 || o - e < c) return a
+      const s = '(' + t + ':' + a + n + ')'
+      return r(s).matches ? l(a, o, i - 1) : l(e, a, i - 1)
+    }
+    let r, d, m, p
+    let e = window; let o = window.document
+    if (e.matchMedia) {
+      r = e.matchMedia
+    } else {
+      d = o.getElementsByTagName('head')[0]
+      m = o.createElement('style')
+      d.appendChild(m)
+      p = o.createElement('div')
+      p.className = 'mediaQueryBinarySearch'
+      p.style.display = 'none'
+      o.body.appendChild(p)
+      r = function (e) {
+        m.sheet.insertRule('@media ' + e + '{.mediaQueryBinarySearch {text-decoration: underline} }', 0)
+        const t = window.getComputedStyle(p, null).textDecoration === 'underline'
+        m.sheet.deleteRule(0)
+        return { matches: t }
+      }
+    }
+
+    let u = l(i, a, s)
+    if (p) {
+      d.removeChild(m)
+      o.body.removeChild(p)
+    }
+    return u
+  }
+
+  function system () {
+    let ua = navigator.userAgent.toLowerCase()
+    return ua.indexOf('win') >= 0 ? 'win' : ua.indexOf('mac') >= 0 ? 'mac' : false
+  }
+
+  function getBrowser () {
+    let ua = navigator.userAgent.toLowerCase()
+    return window.ActiveXObject || 'ActiveXObject' in window ? 'ie' : ua.indexOf('firefox') >= 0 ? 'firefox' : ua.indexOf('chrome') >= 0 ? 'chrome' : ua.indexOf('opera') >= 0 ? 'opera' : ua.indexOf('safari') >= 0 ? 'safari' : void 0
+  }
+
+  function detectZoom () {
+    return detectZoomFunc[getBrowser()]()
+  }
+
+  function iszoom (e) {
+    return (e.system === 'win' && e.zoom !== 1) || (e.system === 'mac' && e.zoom % 1 !== 0 && e.zoom % 2 !== 0)
+  }
+
+  const zoomData = { zoom: round2(detectZoom(), 2), system: system() }
+  return iszoom(zoomData)
+}

package/~/logs/fe/gmfe/gmfe.log

@@ -1,7 +0,0 @@
-[2019-11-07T21:41:25.027] [INFO] default - 执行命令 git rev-parse --git-dir
-[2019-11-07T21:41:25.117] [INFO] default - 切换目录 /Users/liyatang/gm/gm-util
-[2019-11-07T21:41:25.120] [INFO] default - 执行命令 git diff
-[2019-11-07T21:41:25.195] [INFO] default - 执行命令 git branch | sed -n '/\* /s///p'
-[2019-11-07T21:41:25.273] [INFO] default - 执行命令 cat package.json
-[2019-11-07T21:41:25.344] [INFO] default - 执行命令 npm version patch && git push origin master:master --tags
-[2019-11-07T21:41:39.695] [INFO] default - 执行命令 npm publish