Browse Source

Merging in latest from upstream (VISUAL/fineui:refs/heads/master)

* commit '2866ca78916332b81078ac141d2a2dfb7cdab825':
  update
  build
  无JIRA任务,BI.isSafari()方法判断的不对
master
Kira 6 years ago
parent
commit
c57cac286a
  1. 2
      dist/core.js
  2. 2
      dist/fineui.js
  3. 10
      dist/fineui.min.js
  4. 2
      src/core/platform/web/function.js

2
dist/core.js vendored

@ -19586,7 +19586,7 @@ _.extend(BI, {
if(!_global.navigator) { if(!_global.navigator) {
return false; return false;
} }
return /safari/i.test(navigator.userAgent.toLowerCase()); return /safari/i.test(navigator.userAgent.toLowerCase()) && !/chrome/i.test(navigator.userAgent.toLowerCase());
}, },
isKhtml: function () { isKhtml: function () {

2
dist/fineui.js vendored

@ -19828,7 +19828,7 @@ _.extend(BI, {
if(!_global.navigator) { if(!_global.navigator) {
return false; return false;
} }
return /safari/i.test(navigator.userAgent.toLowerCase()); return /safari/i.test(navigator.userAgent.toLowerCase()) && !/chrome/i.test(navigator.userAgent.toLowerCase());
}, },
isKhtml: function () { isKhtml: function () {

10
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
src/core/platform/web/function.js

@ -72,7 +72,7 @@ _.extend(BI, {
if(!_global.navigator) { if(!_global.navigator) {
return false; return false;
} }
return /safari/i.test(navigator.userAgent.toLowerCase()); return /safari/i.test(navigator.userAgent.toLowerCase()) && !/chrome/i.test(navigator.userAgent.toLowerCase());
}, },
isKhtml: function () { isKhtml: function () {

Loading…
Cancel
Save