fix(jira): refactor get baseUrl method

qoomon · Oct 15, 2017 · 434f4c5 · 434f4c5
1 parent fe03dba
commit 434f4c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jira-issue-card-printer",
-  "version": "5.2.10",
+  "version": "5.2.11",
   "description": "Beautiful Issue Card Printer",
   "author": "Bengt Brodersen",
   "license": "Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)",

diff --git a/source-files/lib/jira-issue-tracker.js b/source-files/lib/jira-issue-tracker.js
@@ -3,11 +3,13 @@ var $ = require('jquery');
 var name = "JIRA";
 
 var baseUrl = function () {
-    try {
-        return $("input[title='baseURL']").attr('value');
-    } catch (ex) {
-        return window.location.origin;
-    }
+  var result = window.location.origin;
+  if (AJS && AJS.params && AJS.params.baseURL){
+    result = AJS.params.baseURL;
+  } else if ($("input[title='baseURL']") && $("input[title='baseURL']").val()){
+    result = $("input[title='baseURL']").val();
+  }
+  return result;
 };
 
 var isEligible = function () {

diff --git a/source-files/main.js b/source-files/main.js
@@ -698,7 +698,7 @@ var main = function(issueTrackers) {
     // render cards
     promises.push(renderCards(issueKeyList));
 
-    $("#card-print-dialog-title", global.appFrame.document).text("Card Printer " + global.version + " - Loading issues...");
+    $("#card-print-dialog-title", global.appFrame.document).html("Card Printer " + global.version + " - <b>Loading...</b>");
     return Promise.all(promises).then(function () {
         $("#card-print-dialog-title", global.appFrame.document).text("Card Printer " + global.version);
     });