fixed dom position

kode-team · Mar 14, 2018 · 1f0351d · 1f0351d
1 parent 8c0497a
commit 1f0351d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/addon/codemirror-colorpicker.js b/addon/codemirror-colorpicker.js
@@ -1308,10 +1308,15 @@ var Dom = function () {
     }, {
         key: 'position',
         value: function position() {
-            return {
-                top: parseFloat(this.el.style.top),
-                left: parseFloat(this.el.style.left)
-            };
+
+            if (this.el.style.top) {
+                return {
+                    top: parseFloat(this.css('top')),
+                    left: parseFloat(this.css('left'))
+                };
+            } else {
+                return this.el.getBoundingClientRect();
+            }
         }
     }, {
         key: 'width',

diff --git a/dist/codemirror-colorpicker.js b/dist/codemirror-colorpicker.js
@@ -1310,10 +1310,15 @@ var Dom = function () {
     }, {
         key: 'position',
         value: function position() {
-            return {
-                top: parseFloat(this.el.style.top),
-                left: parseFloat(this.el.style.left)
-            };
+
+            if (this.el.style.top) {
+                return {
+                    top: parseFloat(this.css('top')),
+                    left: parseFloat(this.css('left'))
+                };
+            } else {
+                return this.el.getBoundingClientRect();
+            }
         }
     }, {
         key: 'width',
@@ -3898,8 +3903,6 @@ var ChromeColorControl = function (_EventMachin) {
 
             var h = huePos.x / this.$hueContainer.width() * 360;
 
-            console.log(h);
-
             return { h: h };
         }
     }, {
@@ -5165,8 +5168,6 @@ var ChromeDevtool = function (_EventMachin) {
                 colorObj = color.parse(c);
             format = format || colorObj.type;
 
-            console.log(colorObj);
-
             this.setCurrentFormat(format);
 
             var hsv = this.getHSV(colorObj);

diff --git a/dist/codemirror-colorpicker.min.js b/dist/codemirror-colorpicker.min.js
diff --git a/src/util/Dom.js b/src/util/Dom.js
@@ -164,10 +164,16 @@ export default class Dom {
     }
 
     position () {
-        return {
-            top: parseFloat(this.el.style.top),
-            left: parseFloat(this.el.style.left)
-        };
+
+        if (this.el.style.top) {
+            return {
+                top: parseFloat(this.css('top')),
+                left: parseFloat(this.css('left'))
+            };
+        } else {
+            return this.el.getBoundingClientRect();
+        }
+
     }
 
     width () {