Abstract closeTooltip

src/components/Float/ExportContainer.jsx

@@ -21,9 +21,7 @@ export default class ExportContainer extends Component {
     }
 
     _show() {
-        if (appStore.currentTooltip !== null){
+        closeTooltip();
-            appStore.currentTooltip.close();
-        }
         $(this.refs.outer).fadeToggle(true);
     }
 

src/components/Float/NodeEditor.jsx

@@ -26,7 +26,7 @@ export default class NodeEditor extends Component {
     }
 
     getNodeData(name, type) {
-        appStore.currentTooltip.close();
+        closeTooltip()
         $(this.refs.outer).fadeIn();
         $(this.refs.newAttrName).val("");
         let q = driver.session();

src/components/Graph.jsx

@@ -163,9 +163,7 @@ export default class GraphContainer extends Component {
     }
 
     getHelpEdge(id){
-        if (appStore.currentTooltip !== null){
+        closeTooltip();
-            appStore.currentTooltip.close();
-        }
         let instance = this.state.sigmaInstance.graph;
         let edge = instance.edges(id);
         let source = instance.nodes(edge.source);
@@ -174,9 +172,7 @@ export default class GraphContainer extends Component {
     }
 
     setOwned(id, status){
-        if (appStore.currentTooltip !== null){
+        closeTooltip();
-            appStore.currentTooltip.close();
-        }
         let instance = this.state.sigmaInstance;
         let node = instance.graph.nodes(id);
         if (status){
@@ -212,9 +208,7 @@ export default class GraphContainer extends Component {
     }
 
     setHighVal(id, status){
-        if (appStore.currentTooltip !== null){
+        closeTooltip();
-            appStore.currentTooltip.close();
-        }
         let instance = this.state.sigmaInstance;
         let node = instance.graph.nodes(id);
         node.highvalue = status;
@@ -282,9 +276,7 @@ export default class GraphContainer extends Component {
     }
 
     relayout() {
-        if (appStore.currentTooltip !== null){
+        closeTooltip();
-            appStore.currentTooltip.close();
-        }
         sigma.layouts.stopForceLink();
         if (appStore.dagre) {
             sigma.layouts.dagre.start(this.state.sigmaInstance);
@@ -337,9 +329,7 @@ export default class GraphContainer extends Component {
     }
 
     reload(){
-        if (appStore.currentTooltip !== null){
+        closeTooltip();
-            appStore.currentTooltip.close();
-        }
         this.doQueryNative(this.state.currentQuery);
     }
 
@@ -616,9 +606,7 @@ export default class GraphContainer extends Component {
     goBack() {
         if (appStore.queryStack.length > 0) {
             this.clearScale();
-            if (appStore.currentTooltip !== null) {
+            closeTooltip();
-                appStore.currentTooltip.close();
-            }
             sigma.layouts.stopForceLink();
 
             let query = appStore.queryStack.pop();
@@ -1005,9 +993,7 @@ export default class GraphContainer extends Component {
     }
 
     doGenericQuery(statement, props, start, end, allowCollapse = true) {
-        if (appStore.currentTooltip !== null) {
+        closeTooltip()
-            appStore.currentTooltip.close();
-        }
 
         if (typeof props === "undefined") {
             props = {};
@@ -1367,9 +1353,7 @@ export default class GraphContainer extends Component {
         })
 
         sigmaInstance.bind("clickStage", event => {
-            if (appStore.currentTooltip !== null){
+            closeTooltip()
-                appStore.currentTooltip.close()
-            }
         })
 
         //Some key binds

src/components/Menu/MenuContainer.jsx

@@ -105,9 +105,7 @@ export default class MenuContainer extends Component {
     }
 
     _importClick() {
-        if (appStore.currentTooltip !== null){
+        closeTooltip()
-            appStore.currentTooltip.close();
-        }
         var fname = dialog.showOpenDialog({
             properties: ["openFile"]
         });

src/components/Modals/AddEdgeModal.jsx

@@ -21,9 +21,7 @@ export default class AddEdgeModal extends Component {
     }
 
     openModal() {
-        if (appStore.currentTooltip !== null){
+        closeTooltip()
-            appStore.currentTooltip.close();
-        }
         this.setState( {open: true });
         jQuery(this.refs.errora).hide();
         jQuery(this.refs.errorb).hide();

src/components/Modals/AddNodeModal.jsx

@@ -83,9 +83,7 @@ export default class AddNodeModal extends Component {
     }
 
     openModal() {
-        if (appStore.currentTooltip !== null){
+        closeTooltip()
-            appStore.currentTooltip.close();
-        }
         this.setState( {open: true });
         jQuery(this.refs.name).focus()
         jQuery(this.refs.error).hide()

src/components/Modals/DeleteEdgeModal.jsx

@@ -19,7 +19,7 @@ export default class DeleteEdgeModal extends Component {
     }
 
     openModal(id) {
-        appStore.currentTooltip.close();
+        closeTooltip()
         this.setState({ open: true,  id: id });
     }
 

src/components/Modals/DeleteNodeModal.jsx

@@ -19,9 +19,7 @@ export default class DeleteNodeModal extends Component {
     }
 
     openModal(id) {
-        if (appStore.currentTooltip !== null){
+        closeTooltip()
-            appStore.currentTooltip.close();
-        }
         
         this.setState({ open: true,  id: id });
     }

src/components/SearchContainer/SearchContainer.jsx

@@ -41,7 +41,7 @@ export default class SearchContainer extends Component {
         emitter.on(
             "setStart",
             function (payload) {
-                appStore.currentTooltip.close()
+                closeTooltip()
                 jQuery(this.refs.searchbar).val(payload);
             }.bind(this)
         );
@@ -49,7 +49,7 @@ export default class SearchContainer extends Component {
         emitter.on(
             "setEnd",
             function (payload) {
-                appStore.currentTooltip.close()
+                closeTooltip()
                 jQuery(this.refs.pathbar).val(payload);
                 var e = jQuery(this.refs.pathfinding);
                 if (!e.is(":visible")) {

src/index.js

@@ -309,6 +309,12 @@ if (!existsSync(imagepath)){
     mkdirSync(imagepath)
 }
 
+global.closeTooltip = function(){
+    if (appStore.currentTooltip !== null){
+        appStore.currentTooltip.close();
+    }
+}
+
 renderEmit.on("login", function() {
     emitter.removeAllListeners();
     ReactDOM.unmountComponentAtNode(document.getElementById("root"));