Exported offset in parts/Utilities.ts

Jessica7 · Nov 28, 2019 · 853a007 · 853a007
1 parent 0bb2557
commit 853a007
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/js/masters/highcharts.src.js b/js/masters/highcharts.src.js
@@ -58,6 +58,7 @@ extend(Highcharts, {
     isString: U.isString,
     numberFormat: U.numberFormat,
     objectEach: U.objectEach,
+    offset: U.offset,
     pad: U.pad,
     pick: U.pick,
     pInt: U.pInt,

diff --git a/js/modules/oldie.src.js b/js/modules/oldie.src.js
@@ -12,7 +12,7 @@
 'use strict';
 import H from '../parts/Globals.js';
 import U from '../parts/Utilities.js';
-var defined = U.defined, discardElement = U.discardElement, erase = U.erase, extend = U.extend, extendClass = U.extendClass, isArray = U.isArray, isNumber = U.isNumber, isObject = U.isObject, pick = U.pick, pInt = U.pInt;
+var defined = U.defined, discardElement = U.discardElement, erase = U.erase, extend = U.extend, extendClass = U.extendClass, isArray = U.isArray, isNumber = U.isNumber, isObject = U.isObject, offset = U.offset, pick = U.pick, pInt = U.pInt;
 import '../parts/SvgRenderer.js';
 var VMLRenderer, VMLRendererExtension, VMLElement, Chart = H.Chart, createElement = H.createElement, css = H.css, deg2rad = H.deg2rad, doc = H.doc, merge = H.merge, noop = H.noop, svg = H.svg, SVGElement = H.SVGElement, SVGRenderer = H.SVGRenderer, win = H.win;
 /**
@@ -86,7 +86,7 @@ if (!svg) {
         }
         // Get mouse position
         if (!chartPosition) {
-            this.chartPosition = chartPosition = H.offset(this.chart.container);
+            this.chartPosition = chartPosition = offset(this.chart.container);
         }
         return extend(e, {
             // #2005, #2129: the second case is for IE10 quirks mode within

diff --git a/js/parts/Pointer.js b/js/parts/Pointer.js
@@ -94,10 +94,10 @@ import Highcharts from './Globals.js';
 * @type {Array<Highcharts.SelectDataObject>}
 */
 import U from './Utilities.js';
-var attr = U.attr, defined = U.defined, extend = U.extend, isNumber = U.isNumber, isObject = U.isObject, objectEach = U.objectEach, pick = U.pick, splat = U.splat;
+var attr = U.attr, defined = U.defined, extend = U.extend, isNumber = U.isNumber, isObject = U.isObject, objectEach = U.objectEach, offset = U.offset, pick = U.pick, splat = U.splat;
 import './Tooltip.js';
 import './Color.js';
-var H = Highcharts, addEvent = H.addEvent, charts = H.charts, color = H.color, css = H.css, find = H.find, fireEvent = H.fireEvent, offset = H.offset, Tooltip = H.Tooltip;
+var H = Highcharts, addEvent = H.addEvent, charts = H.charts, color = H.color, css = H.css, find = H.find, fireEvent = H.fireEvent, Tooltip = H.Tooltip;
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /**
  * The mouse and touch tracker object. Each {@link Chart} item has one

diff --git a/js/parts/Utilities.js b/js/parts/Utilities.js
@@ -1929,7 +1929,7 @@ H.keys = Object.keys;
  *         An object containing `left` and `top` properties for the position in
  *         the page.
  */
-H.offset = function (el) {
+function offset(el) {
     var docElem = doc.documentElement, box = (el.parentElement || el.parentNode) ?
         el.getBoundingClientRect() :
         { top: 0, left: 0 };
@@ -1939,7 +1939,7 @@ H.offset = function (el) {
         left: box.left + (win.pageXOffset || docElem.scrollLeft) -
             (docElem.clientLeft || 0)
     };
-};
+}
 /**
  * Stop running animation.
  *
@@ -2536,6 +2536,7 @@ var utils = {
     isString: isString,
     numberFormat: numberFormat,
     objectEach: objectEach,
+    offset: offset,
     pad: pad,
     pick: pick,
     pInt: pInt,

diff --git a/ts/modules/oldie.src.ts b/ts/modules/oldie.src.ts
@@ -325,6 +325,7 @@ const {
     isArray,
     isNumber,
     isObject,
+    offset,
     pick,
     pInt
 } = U;
@@ -450,7 +451,7 @@ if (!svg) {
 
         // Get mouse position
         if (!chartPosition) {
-            this.chartPosition = chartPosition = H.offset(this.chart.container);
+            this.chartPosition = chartPosition = offset(this.chart.container);
         }
 
         return extend(e, {

diff --git a/ts/parts/Pointer.ts b/ts/parts/Pointer.ts
@@ -231,6 +231,7 @@ const {
     isNumber,
     isObject,
     objectEach,
+    offset,
     pick,
     splat
 } = U;
@@ -245,7 +246,6 @@ var H = Highcharts,
     css = H.css,
     find = H.find,
     fireEvent = H.fireEvent,
-    offset = H.offset,
     Tooltip = H.Tooltip;
 
 /* eslint-disable no-invalid-this, valid-jsdoc */

diff --git a/ts/parts/Utilities.ts b/ts/parts/Utilities.ts
@@ -2684,7 +2684,7 @@ H.keys = Object.keys;
  *         An object containing `left` and `top` properties for the position in
  *         the page.
  */
-H.offset = function (el: Highcharts.HTMLDOMElement): Highcharts.OffsetObject {
+function offset(el: Highcharts.HTMLDOMElement): Highcharts.OffsetObject {
     var docElem = doc.documentElement,
         box = (el.parentElement || el.parentNode) ?
             el.getBoundingClientRect() :
@@ -2696,7 +2696,7 @@ H.offset = function (el: Highcharts.HTMLDOMElement): Highcharts.OffsetObject {
         left: box.left + (win.pageXOffset || docElem.scrollLeft) -
             (docElem.clientLeft || 0)
     };
-};
+}
 
 /**
  * Stop running animation.
@@ -3421,6 +3421,7 @@ const utils = {
     isString,
     numberFormat,
     objectEach,
+    offset,
     pad,
     pick,
     pInt,