diff --git a/app/assets/javascripts/admin/spree/spree.js.coffee b/app/assets/javascripts/admin/spree/spree.js.coffee index c905ff48e7..b1d155127e 100644 --- a/app/assets/javascripts/admin/spree/spree.js.coffee +++ b/app/assets/javascripts/admin/spree/spree.js.coffee @@ -1,13 +1,10 @@ -#= require jsuri - class window.Spree # Helper function to take a URL and add query parameters to it - @url: (uri, query) -> - if uri.path == undefined - uri = new Uri(uri) - if query - $.each query, (key, value) -> - uri.addQueryParam(key, value) + @url: (uri) -> + if uri.pathname == undefined + uri = new URL(uri.toString()) if Spree.api_key - uri.addQueryParam('token', Spree.api_key) + params = new URLSearchParams(uri.search) + params.append('token', Spree.api_key) + return uri diff --git a/vendor/assets/javascripts/jsuri.js b/vendor/assets/javascripts/jsuri.js deleted file mode 100644 index dcf60f9796..0000000000 --- a/vendor/assets/javascripts/jsuri.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jsUri v1.1.1 | https://github.com/derek-watson/jsUri */ -var Query=function(a){"use strict";var b=function(a){var b=[],c,d,e,f;if(typeof a=="undefined"||a===null||a==="")return b;a.indexOf("?")===0&&(a=a.substring(1)),d=a.toString().split(/[&;]/);for(c=0;c0&&(a+="&"),a+=d.join("=");return a.length>0?"?"+a:a},e=function(a){a=decodeURIComponent(a),a=a.replace("+"," ");return a},f=function(a){var b,d;for(d=0;d0&&c.push([a,b]);return this},j=function(a,b,d){var f=-1,g,j;if(arguments.length===3){for(g=0;g