Allow for relative paths when loading RTL plugin

mapbox · Jun 1, 2018 · 7c95198 · 7c95198
1 parent 25b294c
commit 7c95198
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/source/geojson_source.js b/src/source/geojson_source.js
@@ -3,7 +3,6 @@
 import { Event, ErrorEvent, Evented } from '../util/evented';
 
 import { extend } from '../util/util';
-import window from '../util/window';
 import EXTENT from '../data/extent';
 import { ResourceType } from '../util/ajax';
 import browser from '../util/browser';
@@ -197,7 +196,7 @@ class GeoJSONSource extends Evented implements Source {
         const options = extend({}, this.workerOptions);
         const data = this._data;
         if (typeof data === 'string') {
-            options.request = this.map._transformRequest(resolveURL(data), ResourceType.Source);
+            options.request = this.map._transformRequest(browser.resolveURL(data), ResourceType.Source);
             options.request.collectResourceTiming = this._collectResourceTiming;
         } else {
             options.data = JSON.stringify(data);
@@ -285,10 +284,4 @@ class GeoJSONSource extends Evented implements Source {
     }
 }
 
-function resolveURL(url) {
-    const a = window.document.createElement('a');
-    a.href = url;
-    return a.href;
-}
-
 export default GeoJSONSource;
diff --git a/src/source/rtl_text_plugin.js b/src/source/rtl_text_plugin.js
@@ -1,6 +1,7 @@
 // @flow
 
 import { Event, Evented } from '../util/evented';
+import browser from '../util/browser';
 
 let pluginRequested = false;
 let pluginURL = null;
@@ -34,7 +35,7 @@ export const setRTLTextPlugin = function(url: string, callback: ErrorCallback) {
         throw new Error('setRTLTextPlugin cannot be called multiple times.');
     }
     pluginRequested = true;
-    pluginURL = url;
+    pluginURL = browser.resolveURL(url);
     _completionCallback = (error?: Error) => {
         if (error) {
             // Clear loaded state to allow retries

diff --git a/src/util/browser.js b/src/util/browser.js
@@ -46,6 +46,12 @@ const exported = {
         return context.getImageData(0, 0, img.width, img.height);
     },
 
+    resolveURL(path: string) {
+        const a = window.document.createElement('a');
+        a.href = path;
+        return a.href;
+    },
+
     hardwareConcurrency: window.navigator.hardwareConcurrency || 4,
     get devicePixelRatio() { return window.devicePixelRatio; },
     supportsWebp: false