Image: Fix image ssr (ElemeFE#16737) (ElemeFE#16747)

* fix ssr * refine
a631807682 · Aug 1, 2019 · b271338 · b271338
1 parent b25e374
commit b271338
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/image/src/image-viewer.vue b/packages/image/src/image-viewer.vue
@@ -53,7 +53,7 @@
 
 <script>
 import { on, off } from 'element-ui/src/utils/dom';
-import { rafThrottle } from 'element-ui/src/utils/util';
+import { rafThrottle, isFirefox } from 'element-ui/src/utils/util';
 
 const Mode = {
   CONTAIN: {
@@ -66,8 +66,7 @@ const Mode = {
   }
 };
 
-const isFirefox = !!window.navigator.userAgent.match(/firefox/i);
-const mousewheelEventName = isFirefox ? 'DOMMouseScroll' : 'mousewheel';
+const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel';
 
 export default {
   name: 'elImageViewer',

diff --git a/src/utils/util.js b/src/utils/util.js
@@ -122,6 +122,10 @@ export const isEdge = function() {
   return !Vue.prototype.$isServer && navigator.userAgent.indexOf('Edge') > -1;
 };
 
+export const isFirefox = function() {
+  return !Vue.prototype.$isServer && !!window.navigator.userAgent.match(/firefox/i);
+};
+
 export const autoprefixer = function(style) {
   if (typeof style !== 'object') return style;
   const rules = ['transform', 'transition', 'animation'];