Merge branch 'master' into unstable

iVis-at-Bilkent · Sep 3, 2024 · 4217eef · 4217eef
2 parents 45ae747 + cda9e94
commit 4217eef
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -17,4 +17,4 @@ module.exports = function(config) {
     autoWatch: false,
     concurrency: Infinity
   })
-}
+}
diff --git a/sbgnviz.js b/sbgnviz.js
diff --git a/src/utilities/sbgnml-to-gpml-converter-factory.js b/src/utilities/sbgnml-to-gpml-converter-factory.js
@@ -10,7 +10,7 @@ module.exports = function () {
 
 
     sbgnmlToGpml.convert = function (xml, callback) {
-        var conversionApiUrl = "https://minerva-dev.lcsb.uni.lu/minerva/api/convert/SBGN-ML:GPML";
+        var conversionApiUrl = "https://minerva-service.lcsb.uni.lu/minerva/api/convert/SBGN-ML:GPML";
 
         return $.ajax({
             type: 'post',

diff --git a/src/utilities/sbgnml-to-sbml-converter-factory.js b/src/utilities/sbgnml-to-sbml-converter-factory.js
@@ -10,7 +10,7 @@ module.exports = function () {
 
 
     sbgnmlToSbml.convert = function (xml, callback) {
-        var conversionApiUrl = "https://minerva-dev.lcsb.uni.lu/minerva/api/convert/SBGN-ML:SBML";
+        var conversionApiUrl = "https://minerva-service.lcsb.uni.lu/minerva/api/convert/SBGN-ML:SBML";
 
         return $.ajax({
             type: 'post',
@@ -37,4 +37,4 @@ module.exports = function () {
     return sbgnmlToSbml;
 
 }
-
+
diff --git a/src/utilities/sbml-to-sbgnml-converter-factory.js b/src/utilities/sbml-to-sbgnml-converter-factory.js
@@ -10,7 +10,7 @@ module.exports = function() {
 
 
   sbmlToSbgnml.convert = function (xml, callback) {
-    var conversionApiUrl = "https://minerva-dev.lcsb.uni.lu/minerva/api/convert/SBML:SBGN-ML";
+    var conversionApiUrl = "https://minerva-service.lcsb.uni.lu/minerva/api/convert/SBML:SBGN-ML";
 
     return $.ajax({
         type: 'post',

diff --git a/src/utilities/ui-utilities-factory.js b/src/utilities/ui-utilities-factory.js
@@ -17,7 +17,7 @@ module.exports = function () {
  }
 
  uiUtilities.startSpinner = function (className) {
-   if (!className) {
+    if (!className) {
      className = 'default-class';
    }
 
@@ -36,12 +36,17 @@ module.exports = function () {
    $("."+className+'-text').fadeIn(0)
  }
 
+ uiUtilities.showSpinnerText = function(className)
+ {
+   $("."+className+'-text').fadeIn(0)
+ }
+
  uiUtilities.endSpinner = function (className) {
-   if (!className) {
-     className = 'default-class';
-   }
+  if (!className) {
+    className = 'default-class';
+  }
 
-   if ($('.' + className + '-wrapper').length > 0) {
+  if ($('.' + className + '-wrapper').length > 0) {
     $('.' + className + '-wrapper').remove();
   }
  };

diff --git a/test/utilities/sbgnml-to-sbml-converter-factory-test.js b/test/utilities/sbgnml-to-sbml-converter-factory-test.js
@@ -39,4 +39,4 @@ describe('sbgnmlToSbml', function () {
             assert.isOk(result.result);
         });
     });
-});
+});
diff --git a/test/utilities/sbml-to-sbgnml-converter-factory-test.js b/test/utilities/sbml-to-sbgnml-converter-factory-test.js
@@ -44,4 +44,4 @@ describe('sbmlToSbgnml', function () {
             assert.isOk(result.result);
         });
     });
-});
+});