RMB Button Menu

Author: brettforbes

src/js/contextMenu.js

@@ -10,7 +10,7 @@ window.Widgets.ContextMenu = {};
     svgId,) {
 
       ns.menuFactory(d.x, d.y, menuItems, d, svgId);
-      d3.event.preventDefault();
+      //d3.event.preventDefault();
 
   }
 

src/js/graph.js

@@ -77,19 +77,19 @@ window.Widgets.Graph = {};
 
     options.steps = ["initSVG"];
 
-    options.$object_form = $component.find('#promo_panel');
-    options.$working_svg = $component.find('#scratch_panel');
+    options.$promo_panel = $component.find('#promo_panel');
+    options.$scratch_panel = $component.find('#scratch_panel');
     //
     // Step 1: Setup the 3 svg's and the tooltip
     options.promotable_svg = d3.select('#promo_panel')
       .append('svg')
-      .attr('width', browserNs.ow(options.$object_form) )
-      .attr('height', browserNs.oh(options.$object_form))
+      .attr('width', browserNs.ow(options.$promo_panel) )
+      .attr('height', browserNs.oh(options.$promo_panel))
       .attr('class', 'promotable_svg');
     options.scratch_svg = d3.select('#scratch_panel')
       .append('svg')
-      .attr('width', browserNs.ow(options.$working_svg) )
-      .attr('height', browserNs.oh(options.$working_svg))
+      .attr('width', browserNs.ow(options.$scratch_panel) )
+      .attr('height', browserNs.oh(options.$scratch_panel))
       .attr('class', 'scratch_svg');
     options.tooltip = d3
       .select('body')
@@ -585,7 +585,7 @@ window.Widgets.Graph = {};
     options.pforceLink = d3
       .forceLink(options.split.promo.edges)
       .id(function (d) {
-        console.log('pforceLink->', d);
+        // console.log('pforceLink->', d);
         return d.id
       }) // (d) => d.data.id
       .distance(4 * options.icon_size);

src/js/indentTree.js

@@ -4,7 +4,7 @@ window.Widgets.IndentTree = {};
 
 (function ($, ns, d3, document, window) {
 
-  ns.indentTree = function(data, tree_svg, options = {}) {
+  ns.indentTree = function(data, contextMenuNs, tree_svg, options = {}) {
 
     // WARNING: x and y are switched because the d3.tree is vertical rather than the default horizontal
     var theme = {};
@@ -50,7 +50,7 @@ window.Widgets.IndentTree = {};
 
     // Function that assembles the HTML tooltip string
     let htmltooltip = function (d) {
-      console.log('d->',d);
+      // console.log('d->',d);
       // setup tooltip paragraph style
       let pgraph_style = '<p style="font-size:' + toString(theme.tooltip.tsize) + '">';
         pgraph_style += '<font color="' + theme.tooltip.tcolour +'">';
@@ -322,7 +322,7 @@ window.Widgets.IndentTree = {};
         .on("mousemove", mousemove)
         .on("mouseout.tooltip", mouseleave)
         .on('contextmenu', (d) => {
-          window.Widgets.contextMenuNs.createContextMenu(d, treeMenuItems, '.index_svg');
+          contextMenuNs.createContextMenu(d, treeMenuItems, '.index_svg');
         });
 
       // label text

src/js/widget.js

@@ -142,7 +142,7 @@ window.Widgets.Widget = {};
         d3.json('data/sightingIndex.json').then(function (data) {
             console.log(data);
             console.log('I am rendering first time');
-            indentTreeNs.indentTree(data, index_svg, options);
+            indentTreeNs.indentTree(data, contextMenuNs, index_svg, options);
         });
 
         d3.json(ns.scratch).then(function (data) {
@@ -204,7 +204,7 @@ window.Widgets.Widget = {};
                 console.group("d3.json.then");
                 console.log(data);
                 console.log('I am ready to re-render the tree');
-                indentTreeNs.indentTree(data, index_svg, ns.options);
+                indentTreeNs.indentTree(data, contextMenuNs, index_svg, ns.options);
                 console.groupEnd();
             });
             console.groupEnd();