Replace extension.getURL with runtime.getURL (#354)

Author: fraz3alpha

browser-extensions/common/js/content-scripts/content-script-athleteeventhistory.js

@@ -24,7 +24,7 @@ if (athlete_id !== undefined) {
         var challenge_link = $("<a/>").attr("href", url)
 
         var icon =  $('<img/>')
-        icon.attr('src', browser.extension.getURL("/images/logo/logo-128x128.png"))
+        icon.attr('src', browser.runtime.getURL("/images/logo/logo-128x128.png"))
         icon.attr('alt', get_localised_value("text_running_challenges"))
         icon.attr('title', get_localised_value("text_running_challenges"))
         icon.attr('height', 24)

browser-extensions/common/js/content-scripts/content-script-athleteresultshistory.js

@@ -26,7 +26,7 @@ if (athlete_id !== undefined) {
         var challenge_link = $("<a/>").attr("href", url)
 
         var icon =  $('<img/>')
-        icon.attr('src', browser.extension.getURL("/images/logo/logo-128x128.png"))
+        icon.attr('src', browser.runtime.getURL("/images/logo/logo-128x128.png"))
         icon.attr('alt', get_localised_value("text_running_challenges"))
         icon.attr('title', get_localised_value("text_running_challenges"))
         icon.attr('height', 24)

browser-extensions/common/js/content-scripts/content-script-parkrunner-summary.js

@@ -26,7 +26,7 @@ if (athlete_id !== undefined) {
         var challenge_link = $("<a/>").attr("href", url)
 
         var icon =  $('<img/>')
-        icon.attr('src', browser.extension.getURL("/images/logo/logo-128x128.png"))
+        icon.attr('src', browser.runtime.getURL("/images/logo/logo-128x128.png"))
         icon.attr('alt', get_localised_value("text_running_challenges"))
         icon.attr('title', get_localised_value("text_running_challenges"))
         icon.attr('height', 24)

browser-extensions/common/js/content-scripts/content-script-parkrunner.js

@@ -343,7 +343,7 @@ function get_running_badge(result) {
       $.each(result.badgesAwarded, function(index, badge) {
         badge_info.push({
           "name": badge.name,
-          "icon": browser.extension.getURL("/images/badges/"+badge.badge_icon+".png"),
+          "icon": browser.runtime.getURL("/images/badges/"+badge.badge_icon+".png"),
           // The link just goes to the top of the main table for the challenge, not the specific row.
           "link": "#"+result.shortname
         })
@@ -353,13 +353,13 @@ function get_running_badge(result) {
     if (result.complete == true) {
       badge_info = {
           "name": result.name,
-          "icon": browser.extension.getURL("/images/badges/"+result.badge_icon+".png"),
+          "icon": browser.runtime.getURL("/images/badges/"+result.badge_icon+".png"),
           "link": "#"+result.shortname
       }
     } else if (result.partial_completion == true) {
         badge_info = {
           "name": result.partial_completion_name,
-          "icon": browser.extension.getURL("/images/badges/"+result.partial_completion_badge_icon+".png"),
+          "icon": browser.runtime.getURL("/images/badges/"+result.partial_completion_badge_icon+".png"),
           "link": "#"+result.shortname
         }
     }
@@ -375,17 +375,17 @@ function get_volunteer_badge(result) {
   if (result.complete == true) {
       badge_info = {
           "name": result.name,
-          "icon": browser.extension.getURL("/images/badges/"+result.badge_icon+".png"),
+          "icon": browser.runtime.getURL("/images/badges/"+result.badge_icon+".png"),
           "link": "#"+result.shortname
       }
       if (result.subparts_completed_count >= 25){
-          badge_info.icon = browser.extension.getURL("/images/badges/"+result.badge_icon+"-3-stars.png")
+          badge_info.icon = browser.runtime.getURL("/images/badges/"+result.badge_icon+"-3-stars.png")
           badge_info.name += " (25+ times)"
       } else if (result.subparts_completed_count >= 10){
-          badge_info.icon = browser.extension.getURL("/images/badges/"+result.badge_icon+"-2-stars.png")
+          badge_info.icon = browser.runtime.getURL("/images/badges/"+result.badge_icon+"-2-stars.png")
           badge_info.name += " (10+ times)"
       } else if (result.subparts_completed_count >= 5){
-          badge_info.icon = browser.extension.getURL("/images/badges/"+result.badge_icon+"-1-star.png")
+          badge_info.icon = browser.runtime.getURL("/images/badges/"+result.badge_icon+"-1-star.png")
           badge_info.name += " (5+ times)"
       }
   }

browser-extensions/common/js/lib/challenges.js

@@ -1331,10 +1331,10 @@ function get_flag_image_src(country) {
       "World": "world"
   }
 
-  var flag_src = browser.extension.getURL("/images/flags/flag-unknown.png")
+  var flag_src = browser.runtime.getURL("/images/flags/flag-unknown.png")
 
   if (country in flag_map) {
-    flag_src = browser.extension.getURL("/images/flags/"+flag_map[country]+".png")
+    flag_src = browser.runtime.getURL("/images/flags/"+flag_map[country]+".png")
   }
 
   return flag_src

browser-extensions/common/js/lib/challenges_ui.js

@@ -37,8 +37,8 @@ function generate_challenge_table() {
     table.append($('<caption></caption>').text('Challenges'))
 
     // Add a set of links on the top row
-    help_link = $('<a></a>').attr("href", browser.extension.getURL("/html/help.html")).attr("target", '_blank').text('help')
-    options_link = $('<a></a>').attr("href", browser.extension.getURL("/html/options.html")).attr("target", '_blank').text('options')
+    help_link = $('<a></a>').attr("href", browser.runtime.getURL("/html/help.html")).attr("target", '_blank').text('help')
+    options_link = $('<a></a>').attr("href", browser.runtime.getURL("/html/options.html")).attr("target", '_blank').text('options')
     website_link = $('<a></a>').attr("href", "https://running-challenges.co.uk").attr("target", '_blank').text('website')
     help_td = $('<td></td>').attr('colspan', 6).attr('align', 'right')
     help_td.append(website_link)
@@ -111,7 +111,7 @@ function get_tbody_content_id(challenge) {
 
 function get_flag_icon(country, height, width) {
     var flag_img = $('<img>'); //Equivalent: $(document.createElement('img'))
-    flag_img.attr('src', browser.extension.getURL("/images/flags/png/"+country.flag_icon+".png"));
+    flag_img.attr('src', browser.runtime.getURL("/images/flags/png/"+country.flag_icon+".png"));
     // badge_img.attr('alt', challenge.name)
     // badge_img.attr('title', challenge.name)
     flag_img.attr('height', height)
@@ -125,7 +125,7 @@ function get_challenge_icon(challenge, height, width) {
     var badge_img = undefined
     if (challenge.badge_icon !== undefined) {
       badge_img = $('<img>'); //Equivalent: $(document.createElement('img'))
-      badge_img.attr('src', browser.extension.getURL("/images/badges/"+challenge.badge_icon+".png"));
+      badge_img.attr('src', browser.runtime.getURL("/images/badges/"+challenge.badge_icon+".png"));
       badge_img.attr('alt', challenge.name)
       badge_img.attr('title', challenge.name)
       badge_img.attr('height', height)
@@ -185,7 +185,7 @@ function get_challenge_header_row(challenge, data) {
       }
     }
     if (challenge.complete) {
-        main_row.append($('<img/>').attr('src', browser.extension.getURL("/images/badges/tick.png")).attr('width',24).attr('height',24))
+        main_row.append($('<img/>').attr('src', browser.runtime.getURL("/images/badges/tick.png")).attr('width',24).attr('height',24))
     }
 
     return main_row
@@ -1015,7 +1015,7 @@ function create_challenge_map_standard(map_id, challenge_data, data) {
   // Create empty vector for each layer
   // var home_parkrun = new L.featureGroup()
   var events_complete = new L.featureGroup();
-  // var events_complete_icon = new EventsIcon({iconUrl: browser.extension.getURL("/images/maps/markers/leaf-green.png")})
+  // var events_complete_icon = new EventsIcon({iconUrl: browser.runtime.getURL("/images/maps/markers/leaf-green.png")})
   var events_complete_icon = L.ExtraMarkers.icon({
     markerColor: 'green-light',
     shape: 'circle'
@@ -1025,7 +1025,7 @@ function create_challenge_map_standard(map_id, challenge_data, data) {
     shape: 'circle'
   });
   var events_nearest_incomplete = new L.featureGroup();
-  // var events_nearest_incomplete_icon = new EventsIcon({iconUrl: browser.extension.getURL("/images/maps/markers/leaf-orange.png")})
+  // var events_nearest_incomplete_icon = new EventsIcon({iconUrl: browser.runtime.getURL("/images/maps/markers/leaf-orange.png")})
   var events_nearest_incomplete_icon = L.ExtraMarkers.icon({
     markerColor: 'yellow',
     shape: 'penta'
@@ -1035,7 +1035,7 @@ function create_challenge_map_standard(map_id, challenge_data, data) {
     shape: 'penta'
   });
   var events_incomplete = new L.featureGroup();
-  // var events_incomplete_icon = new EventsIcon({iconUrl: browser.extension.getURL("/images/maps/markers/leaf-red.png")})
+  // var events_incomplete_icon = new EventsIcon({iconUrl: browser.runtime.getURL("/images/maps/markers/leaf-red.png")})
   var events_incomplete_icon = L.ExtraMarkers.icon({
     markerColor: 'cyan',
     shape: 'square'
@@ -1432,7 +1432,7 @@ function add_stats_table(div, data) {
   // if there is no athlete_id or home parkrun set
   if (data.info.has_athlete_id == false || data.info.has_home_parkrun == false) {
     var options_message_container = $('<div/>')
-    options_link = $('<a/>').attr("href", browser.extension.getURL("/html/options.html")).attr("target", '_blank').attr("rel", "noopener noreferrer").text('options.')
+    options_link = $('<a/>').attr("href", browser.runtime.getURL("/html/options.html")).attr("target", '_blank').attr("rel", "noopener noreferrer").text('options.')
     options_message_container.append('N.B. More stats and map features are available if you set your home parkrun and athlete id in the ')
     options_message_container.append(options_link)
     div.append($('<br/>'))