Permalink
Browse files

Merge pull request #469 from adrientetar/upstream

Some MS Edge fixes
  • Loading branch information...
nvh committed Feb 22, 2017
2 parents 8db1dc8 + 9878028 commit 66eb6d4cff63ac32b9eae82ec491934f1a282353
Showing with 7 additions and 3 deletions.
  1. +1 −0 extras/templates/Project/index.html
  2. +1 −1 framer/Print.coffee
  3. +5 −2 framer/Utils.coffee
@@ -27,6 +27,7 @@
repeat scroll top left;
font: 28px/1em "Helvetica";
color: #FFF;
+ overflow: hidden;
-webkit-tap-highlight-color: rgba(0,0,0,0)
}
View
@@ -23,7 +23,7 @@ class Printer
@_printLayer.ignoreEvents = false
@_printLayer.html = ""
@_printLayer.style =
- "font": "12px/1.35em Menlo"
+ "font": "12px/1.35em Menlo, Consolas, monospace"
"color": "rgba(0, 0, 0, .7)"
"padding": "8px"
"padding-bottom": "30px"
View
@@ -312,7 +312,7 @@ Utils.callAfterCount = (total, callback) ->
# ENVIROMENT FUNCTIONS
Utils.isWebKit = ->
- window.WebKitCSSMatrix isnt undefined
+ window.WebKitCSSMatrix isnt undefined and not Utils.isEdge()
Utils.webkitVersion = ->
version = -1
@@ -327,6 +327,9 @@ Utils.isChrome = ->
Utils.isSafari = ->
return /Safari/.test(navigator.userAgent) and /Apple Computer/.test(navigator.vendor)
+Utils.isEdge = ->
+ return /Edge/.test(navigator.userAgent)
+
Utils.isAndroid = ->
return /(android)/i.test(navigator.userAgent)
@@ -968,7 +971,7 @@ Utils.frameCenterPoint = (frame) ->
y: Utils.frameGetMidY(frame)
Utils.frameInFrame = (frameA, frameB) ->
-
+
for point in Utils.pointsFromFrame(frameA)
return false unless Utils.pointInFrame(point, frameB)

0 comments on commit 66eb6d4

Please sign in to comment.