chore: cleaning up

Author: themustafaomar

src/js/core/createRegions.js

@@ -1,4 +1,4 @@
-import { merge } from '../util/index'
+import { merge } from '../util'
 import Region from '../elements/region'
 
 export default function createRegions() {

src/js/core/handleContainerEvents.js

@@ -1,5 +1,4 @@
 import EventHandler from '../eventHandler'
-import { getElement } from '../util/index'
 
 export default function handleContainerEvents() {
   let mouseDown = false, oldPageX, oldPageY, map = this
@@ -25,7 +24,7 @@ export default function handleContainerEvents() {
       return false
     })
 
-    EventHandler.on(getElement('body'), 'mouseup', () => {
+    EventHandler.on(document.body, 'mouseup', () => {
       mouseDown = false
     })
   }
@@ -50,4 +49,4 @@ export default function handleContainerEvents() {
       event.preventDefault()
     })
   }
-}
+}

src/js/core/handleElementEvents.js

@@ -25,6 +25,7 @@ function parseEvent(map, selector, isTooltip) {
 export default function handleElementEvents() {
   const map = this, container = this.container
 
+  // When the mouse is pressed
   EventHandler.delegate(container, 'mousedown', '.jvm-element', () => {
     this.isBeingDragged = false
   })

src/js/core/setScale.js

@@ -1,3 +1,5 @@
+import Events from '../defaults/events'
+
 export default function setScale(scale, anchorX, anchorY, isCentered, animate) {
   let zoomStep,
     interval,
@@ -45,7 +47,7 @@ export default function setScale(scale, anchorX, anchorY, isCentered, animate) {
       if (i == count) {
         clearInterval(interval)
 
-        this.emit('viewport:changed', [
+        this.emit(Events.onViewportChange, [
           this.scale, this.transX, this.transY
         ])
       }
@@ -56,8 +58,8 @@ export default function setScale(scale, anchorX, anchorY, isCentered, animate) {
     this.scale = scale
 
     this.applyTransform()
-    this.emit('viewport:changed', [
+    this.emit(Events.onViewportChange, [
       this.scale, this.transX, this.transY
     ])
   }
-}
+}

src/js/defaults/events.js

@@ -6,4 +6,4 @@ export default {
   onMarkerTooltipShow: 'marker.tooltip:show',
   onLoaded: 'map:loaded',
   onDestroyed: 'map:destroyed'
-}
+}

src/js/defaults/options.js

@@ -12,27 +12,17 @@ export default {
   zoomStep: 1.5,
   bindTouchEvents: true,
 
-
-
-
-  /**
-   * Lines options
-   */
+  // Line options
   lineStyle: {
     stroke: '#808080',
     strokeWidth: 1,
     strokeLinecap: 'round',
   },
 
-
-
-
-  /**
-   * Markers options
-   */
+  // Marker options
   markersSelectable: false,
   markersSelectableOne: false,
-  markerStyle: {  // Marker style
+  markerStyle: {
     initial: {
       r: 7,
       fill: '#374151',
@@ -50,8 +40,6 @@ export default {
     },
     selectedHover: {}
   },
-
-  // Marker Label style
   markerLabelStyle: {
     initial: {
       fontFamily: 'Verdana',
@@ -67,12 +55,7 @@ export default {
     selectedHover: {}
   },
 
-
-
-
-  /**
-   * Region style
-   */
+  // Region options
   regionsSelectable: false,
   regionsSelectableOne: false,
   regionStyle: {
@@ -91,8 +74,6 @@ export default {
     },
     selectedHover: {}
   },
-
-  // Region label style
   regionLabelStyle: {
     initial: {
       fontFamily: 'Verdana',
@@ -105,4 +86,4 @@ export default {
       cursor: 'pointer'
     }
   },
-}
+}

src/js/elements/baseElement.js

@@ -14,7 +14,7 @@ class baseElement {
       let params = []
 
       // Pass additional paramater (Marker config object) in case it's a Marker.
-      if (this.config.marker) {
+      if (this.constructor.name === 'Marker') {
         params.push(this.config.marker)
       }
 

src/js/elements/line.js

@@ -1,14 +1,10 @@
-import baseElement from './baseElement'
-
 /**
  * ------------------------------------------------------------------------
  * Class Definition
  * ------------------------------------------------------------------------
  */
-class Line extends baseElement {
+class Line {
   constructor({ index, map, style, x1, y1, x2, y2, group }) {
-    super()
-
     this.shape = map.canvas.createLine({ x1, y1, x2, y2, dataIndex: index }, style, group)
 
     this.shape.addClass('jvm-line')

src/js/elements/region.js

@@ -9,7 +9,6 @@ class Region extends baseElement {
   constructor({ map, code, path, style, label, labelStyle, labelsGroup }) {
     super()
 
-    this.config = arguments[0]
     this.canvas = map.canvas
     this.map = map
 

src/js/eventHandler.js

@@ -25,7 +25,7 @@ const EventHandler = {
     event.forEach(eventName => {
       EventHandler.on(element, eventName, (e) => {
         const target = e.target
-  
+
         if (target.matches(selector)) {
           handler.call(target, e)
         }