Serious SPARQLgraph bug fix

ge-semtk · Apr 15, 2021 · 709016e · 709016e
1 parent 4dadfea
commit 709016e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/sparqlGraphWeb/sparqlGraph/js/modaliidx.js b/sparqlGraphWeb/sparqlGraph/js/modaliidx.js
@@ -51,7 +51,7 @@ define([	// properly require.config'ed   bootstrap-modal
 			// simple alert dialog
 		    kdlLogEvent("Alert", "title", titleTxt, "message", msgHtml);
 
-			var m = new ModalIidx("ModalIidxAlert" + Math.random());
+			var m = new ModalIidx("ModalIidxAlert");
 			var div = document.createElement("div");
 			div.innerHTML = msgHtml2;
             m.onHide(optHideCallback);
@@ -67,7 +67,7 @@ define([	// properly require.config'ed   bootstrap-modal
 
             var dom;
 
-			var m = new ModalIidx("ModalIidxOkCancel" + Math.random());
+			var m = new ModalIidx("ModalIidxOkCancel");
             if (typeof msgHtmlOrDom == "string") {
     			dom = document.createElement("div");
     			dom.innerHTML = msgHtmlOrDom;
@@ -92,7 +92,7 @@ define([	// properly require.config'ed   bootstrap-modal
 			var div = document.createElement("div");
 			div.appendChild(dom);
 
-			var m = new ModalIidx("clearCancelSubmit" + Math.random());
+			var m = new ModalIidx("clearCancelSubmit");
 			m.showClearCancelSubmit(titleTxt,
 									div,
 									function() {return null;},     // validation is not implemented for this one
@@ -116,7 +116,7 @@ define([	// properly require.config'ed   bootstrap-modal
 			select.style.width = "95%";
 			div.appendChild(select);
 
-			var m = new ModalIidx("selectOption" + Math.random());
+			var m = new ModalIidx("selectOption");
 			m.showClearCancelSubmit(titleTxt,
 									div,
 									function() {return null;},

diff --git a/sparqlGraphWeb/sparqlGraph/js/modalplotsdialog.js b/sparqlGraphWeb/sparqlGraph/js/modalplotsdialog.js
@@ -135,7 +135,9 @@ define([	// properly require.config'ed
                 fieldset.appendChild(IIDXHelper.buildControlGroup("Name: ", this.addModalElemName));
                 fieldset.appendChild(IIDXHelper.buildControlGroup("Type: ", this.addModalElemType));
                 fieldset.appendChild(IIDXHelper.buildControlGroup("Columns: ", this.addModalElemCols));
-                ModalIidx.okCancel("Add Plot", div, this.addCallbackCallNgs.bind(this), undefined, this.unstack.bind(this), this.addCallbackValidate.bind(this));
+
+                var m = new ModalIidx("ModalIidxOkCancel-AddPlot");
+                m.showOKCancel("Add Plot", div,  this.addCallbackValidate.bind(this), this.addCallbackCallNgs.bind(this), this.unstack.bind(this));
                 this.stack();
             },