add zoom event for biojs

calipho-sib · May 24, 2016 · b85a7ac · b85a7ac
1 parent b05c277
commit b85a7ac
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 8 deletions.
diff --git a/build/viewer.js b/build/viewer.js
@@ -20994,7 +20994,8 @@ var FeatureViewer = (function () {
         var self = this;
         // if (!div) var div = window;
         this.events = {
-            FEATURE_SELECTED_EVENT: "feature-viewer-position-selected"
+          FEATURE_SELECTED_EVENT: "feature-viewer-position-selected",
+          ZOOM_EVENT: "feature-viewer-zoom-altered"
         };
 
         // if (!div) var div = window;
@@ -21011,7 +21012,13 @@ var FeatureViewer = (function () {
             verticalLine: false
         };
         var offset = {start:1,end:fvLength};
-        if (options && options.offset) offset = options.offset;
+        if (options && options.offset) {
+            offset = options.offset;
+            if (offset.start < 1) {
+                offset.start = 1;
+                console.warn("WARNING ! offset.start should be > 0. Thus, it has been reset to 1.");
+            }
+        }
         var pathLevel = 0;
         var svg;
         var svgContainer;
@@ -21325,6 +21332,10 @@ var FeatureViewer = (function () {
             //$(document).on(self.events.FEATURE_SELECTED_EVENT, listener);
         };
 
+      this.onZoom = function (listener) {
+            svgElement.addEventListener(self.events.ZOOM_EVENT, listener);
+        };
+
         function addLevel(array) {
             var leveling = [];
             array.forEach(function (d) {
@@ -22204,6 +22215,18 @@ var FeatureViewer = (function () {
                 transition_data(features, currentShift);
                 reset_axis();
 
+                if (CustomEvent) {
+                  svgElement.dispatchEvent(new CustomEvent(
+                    self.events.ZOOM_EVENT,
+                    {detail: { start: start, end: end, zoom: zoomScale }}
+                    ));
+                }
+                if (self.trigger) self.trigger(self.events.ZOOM_EVENT, {
+                            start: start,
+                            end: end,
+                            zoom: zoomScale
+                        });
+
                 //rectsPep2.classed("selected", false);
                 d3.select(div).selectAll(".brush").call(brush.clear());
             } else {
@@ -22268,6 +22291,18 @@ var FeatureViewer = (function () {
 
             transition_data(features, offset.start);
             reset_axis();
+
+            // Fire Event
+            if (CustomEvent) {
+              svgElement.dispatchEvent(new CustomEvent(self.events.ZOOM_EVENT,
+                { detail: { start: 1, end: sequence.length, zoom: 1 }}));
+            };
+            if (self.trigger) self.trigger(self.events.ZOOM_EVENT, {
+                            start: 1,
+                            end: sequence.length,
+                            zoom: 1
+                        });
+
             d3.select(div).selectAll(".brush").call(brush.clear());
         }
 
@@ -22386,7 +22421,7 @@ var FeatureViewer = (function () {
 
             if (!$.fn.popover) {
                 options.bubbleHelp = false;
-                console.warn("The bubble help requires tooltip and popover bootrstrap js libraries. The feature viewer will continue to work, but without the info bubble");
+                console.warn("The bubble help requires tooltip and popover bootstrap js libraries. The feature viewer will continue to work, but without the info bubble");
             }
 
             // Create SVG
@@ -22543,8 +22578,10 @@ var FeatureViewer = (function () {
                 .attr("in", "SourceGraphic");
 
             svgContainer.on('mousemove', function () {
-                var absoluteMousePos = SVGOptions.brushActive ? d3.mouse(d3.select(".background").node()) : d3.mouse(svgContainer.node());; 
-                $(div + " #zoomPosition").text(Math.round(scalingPosition(absoluteMousePos[0])));
+                var absoluteMousePos = SVGOptions.brushActive ? d3.mouse(d3.select(".background").node()) : d3.mouse(svgContainer.node());;          
+                var pos = Math.round(scalingPosition(absoluteMousePos[0]));
+                pos += sequence[pos-1] || "";
+                $(div + " #zoomPosition").text(pos);
             });
 
             if (options.showSequence && !(intLength)) {

diff --git a/dist/feature-viewer.bundle.js b/dist/feature-viewer.bundle.js
diff --git a/dist/feature-viewer.min.js b/dist/feature-viewer.min.js
diff --git a/dist/feature-viewer.nextprot.js b/dist/feature-viewer.nextprot.js
diff --git a/src/feature-viewer.js b/src/feature-viewer.js
@@ -1232,6 +1232,11 @@ var FeatureViewer = (function () {
                     {detail: { start: start, end: end, zoom: zoomScale }}
                     ));
                 }
+                if (self.trigger) self.trigger(self.events.ZOOM_EVENT, {
+                            start: start,
+                            end: end,
+                            zoom: zoomScale
+                        });
 
                 //rectsPep2.classed("selected", false);
                 d3.select(div).selectAll(".brush").call(brush.clear());
@@ -1303,6 +1308,11 @@ var FeatureViewer = (function () {
               svgElement.dispatchEvent(new CustomEvent(self.events.ZOOM_EVENT,
                 { detail: { start: 1, end: sequence.length, zoom: 1 }}));
             };
+            if (self.trigger) self.trigger(self.events.ZOOM_EVENT, {
+                            start: 1,
+                            end: sequence.length,
+                            zoom: 1
+                        });
 
             d3.select(div).selectAll(".brush").call(brush.clear());
         }