💩 So WebKitCSSMatrix is broken in Chrome 45

So I have to use top/left positioning in tests to make sure the good offsets are computed.
atom-minimap · Oct 30, 2015 · 6495df2 · 6495df2
1 parent 3bb81d3
commit 6495df2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/lib/minimap-element.coffee b/lib/minimap-element.coffee
@@ -343,10 +343,17 @@ class MinimapElement extends HTMLElement
     visibleAreaTop = @minimap.getTextEditorScaledScrollTop() - @minimap.getScrollTop()
     visibleWidth = Math.min(@canvas.width / devicePixelRatio, @width)
 
-    @applyStyles @visibleArea,
-      width: visibleWidth + 'px'
-      height: @minimap.getTextEditorScaledHeight() + 'px'
-      transform: @makeTranslate(visibleAreaLeft, visibleAreaTop)
+    if atom.inSpecMode()
+      @applyStyles @visibleArea,
+        width: visibleWidth + 'px'
+        height: @minimap.getTextEditorScaledHeight() + 'px'
+        top: visibleAreaTop + 'px'
+        left: visibleAreaLeft + 'px'
+    else
+      @applyStyles @visibleArea,
+        width: visibleWidth + 'px'
+        height: @minimap.getTextEditorScaledHeight() + 'px'
+        transform: @makeTranslate(visibleAreaLeft, visibleAreaTop)
 
     @applyStyles @controls,
       width: visibleWidth + 'px'
@@ -355,7 +362,11 @@ class MinimapElement extends HTMLElement
 
     canvasTransform = @makeTranslate(0, canvasTop)
     canvasTransform += " " + @makeScale(1 / devicePixelRatio) if devicePixelRatio isnt 1
-    @applyStyles @canvas, transform: canvasTransform
+
+    if atom.inSpecMode()
+      @applyStyles @canvas, top: canvasTop + 'px'
+    else
+      @applyStyles @canvas, transform: canvasTransform
 
     if @minimapScrollIndicator and @minimap.canScroll() and not @scrollIndicator
       @initializeScrollIndicator()
@@ -365,9 +376,14 @@ class MinimapElement extends HTMLElement
       indicatorHeight = minimapScreenHeight * (minimapScreenHeight / @minimap.getHeight())
       indicatorScroll = (minimapScreenHeight - indicatorHeight) * @minimap.getCapedTextEditorScrollRatio()
 
-      @applyStyles @scrollIndicator,
-        height: indicatorHeight + 'px'
-        transform: @makeTranslate(0, indicatorScroll)
+      if atom.inSpecMode()
+        @applyStyles @scrollIndicator,
+          height: indicatorHeight + 'px'
+          top: indicatorScroll + 'px'
+      else
+        @applyStyles @scrollIndicator,
+          height: indicatorHeight + 'px'
+          transform: @makeTranslate(0, indicatorScroll)
 
       @disposeScrollIndicator() if not @minimap.canScroll()
 

diff --git a/spec/minimap-element-spec.coffee b/spec/minimap-element-spec.coffee
@@ -7,12 +7,14 @@ stylesheetPath = path.resolve __dirname, '..', 'styles', 'minimap.less'
 stylesheet = atom.themes.loadStylesheet(stylesheetPath)
 
 realOffsetTop = (o) ->
-  transform = new WebKitCSSMatrix window.getComputedStyle(o).transform
-  o.offsetTop + transform.m42
+  # transform = new WebKitCSSMatrix window.getComputedStyle(o).transform
+  # o.offsetTop + transform.m42
+  o.offsetTop
 
 realOffsetLeft = (o) ->
-  transform = new WebKitCSSMatrix window.getComputedStyle(o).transform
-  o.offsetLeft + transform.m41
+  # transform = new WebKitCSSMatrix window.getComputedStyle(o).transform
+  # o.offsetLeft + transform.m41
+  o.offsetLeft
 
 isVisible = (node) -> node.offsetWidth > 0 or node.offsetHeight > 0