Merge pull request #64 from boldtrn/rename_focus_focusbox

Rename focus to focusbox
GIScience · Aug 23, 2019 · 7e90a0f · 7e90a0f
2 parents e0546f8 + 37b5211
commit 7e90a0f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.2.0 (2019-08-23)
+
+**API Changes**
+
+* The class name `focus` was renamed to `focusbox`. `focus` might be used in many other frameworks and could lead to css conflicts. Please make sure you update the .css when updating the .js! ([#43](https://github.com/GIScience/Leaflet.Heightgraph/pull/64) by [boldtrn](https://github.com/boldtrn)).
+
 0.1.3 (2019-07-17)
 
 **Improvements**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leaflet.heightgraph",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Leaflet plugin to visualize height information and road attributes",
   "main": "src/L.Control.Heightgraph.js",
   "scripts": {

diff --git a/src/L.Control.Heightgraph.css b/src/L.Control.Heightgraph.css
@@ -67,21 +67,21 @@
     pointer-events: none;
 }
 
-.focus {
+.focusbox {
     display: none;
     font-size: 10px;
     fill: #000;
     pointer-events: none;
 }
 
-.focus rect {
+.focusbox rect {
     fill: rgba(255, 255, 255, 0.8);
     stroke-width: 1px;
     stroke: #888;
     pointer-events: none;
 }
 
-.focus text {
+.focusbox text {
     font-size: 12px;
 }
 

diff --git a/src/L.Control.Heightgraph.js b/src/L.Control.Heightgraph.js
@@ -444,7 +444,7 @@ L.Control.Heightgraph = L.Control.extend({
             this._focusLineGroup.remove();
         }
         this._focus = this._svg.append("g")
-            .attr("class", "focus");
+            .attr("class", "focusbox");
         // background box
         this._focusRect = this._focus.append("rect")
             .attr("x", 3)
@@ -478,8 +478,8 @@ L.Control.Heightgraph = L.Control.extend({
             .attr("class", "tspan");
         this._typeTspan = this._focusType.append('tspan')
             .attr("class", "tspan");
-        var height = this._dynamicBoxSize('.focus text')[0];
-        d3.selectAll('.focus rect')
+        var height = this._dynamicBoxSize('.focusbox text')[0];
+        d3.selectAll('.focusbox rect')
             .attr("height", height * textDistance + (textDistance / 2))
             .attr("display", "block");
         this._focusLineGroup = this._svg.append("g")
@@ -657,16 +657,16 @@ L.Control.Heightgraph = L.Control.extend({
             .style("fill", "none")
             .style("stroke", "none")
             .style("pointer-events", "all")
-            .on("mousemove.focus", this._mousemoveHandler.bind(this))
-            .on("mouseout.focus", this._mouseoutHandler.bind(this));
+            .on("mousemove.focusbox", this._mousemoveHandler.bind(this))
+            .on("mouseout.focusbox", this._mouseoutHandler.bind(this));
         if (L.Browser.android) {
             background.on("touchstart.drag", this._dragHandler.bind(this))
                 .on("touchstart.drag", this._dragStartHandler.bind(this))
-                .on("touchstart.focus", this._mousemoveHandler.bind(this));
+                .on("touchstart.focusbox", this._mousemoveHandler.bind(this));
             L.DomEvent.on(this._container, 'touchend', this._dragEndHandler, this);
         } else {
-            background.on("mousemove.focus", this._mousemoveHandler.bind(this))
-                .on("mouseout.focus", this._mouseoutHandler.bind(this))
+            background.on("mousemove.focusbox", this._mousemoveHandler.bind(this))
+                .on("mouseout.focusbox", this._mouseoutHandler.bind(this))
                 .on("mousedown.drag", this._dragStartHandler.bind(this))
                 .on("mousemove.drag", this._dragHandler.bind(this));
             L.DomEvent.on(this._container, 'mouseup', this._dragEndHandler, this);
@@ -962,7 +962,7 @@ L.Control.Heightgraph = L.Control.extend({
             ll = item.latlng,
             areaIdx = item.areaIdx,
             type = item.type;
-        var boxWidth = this._dynamicBoxSize('.focus text')[1] + 10;
+        var boxWidth = this._dynamicBoxSize('.focusbox text')[1] + 10;
         if (areaIdx === 0) {
             areaLength = this._profile.blocks[this._selectedOption].distances[areaIdx];
         } else {