Remove use of deprecated Spree.url in admin js

This was deprecated, but errors were only shown in development. This removes all uses of Spree.url and now will display the warning in the test environment.
solidusio · Feb 18, 2016 · e5f7f24 · e5f7f24
1 parent b714dea
commit e5f7f24
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 22 deletions.
diff --git a/backend/app/assets/javascripts/spree/backend/adjustments.js.coffee b/backend/app/assets/javascripts/spree/backend/adjustments.js.coffee
@@ -3,7 +3,7 @@ $(@).ready( ->
  return if $("#coupon_code").val().length == 0
  Spree.ajax
  type: 'PUT'
- url: Spree.url(Spree.routes.apply_coupon_code(order_number))
+ url: Spree.routes.apply_coupon_code(order_number)
  data:
  coupon_code: $("#coupon_code").val()
  token: Spree.api_key

diff --git a/backend/app/assets/javascripts/spree/backend/admin.js b/backend/app/assets/javascripts/spree/backend/admin.js
@@ -223,15 +223,15 @@ $(document).ready(function(){
  });
 
  window.Spree.advanceOrder = function() {
-  Spree.ajax({
-  type: "PUT",
-  async: false,
-  data: {
-  token: Spree.api_key
-  },
-  url: Spree.url(Spree.routes.checkouts_api + "/" + order_number + "/advance")
-  }).done(function() {
-  window.location.reload();
-  });
+ Spree.ajax({
+ type: "PUT",
+ async: false,
+ data: {
+ token: Spree.api_key
+ },
+ url: Spree.routes.checkouts_api + "/" + order_number + "/advance"
+ }).done(function() {
+ window.location.reload();
+ });
  }
 });
diff --git a/backend/app/assets/javascripts/spree/backend/line_items_on_order_edit.js b/backend/app/assets/javascripts/spree/backend/line_items_on_order_edit.js
@@ -53,7 +53,7 @@ adjustLineItems = function(order_number, variant_id, quantity, stock_location_qu
 
  Spree.ajax({
  type: "POST",
- url: Spree.url(url),
+ url: url,
  data: {
  line_item: {
  variant_id: variant_id,

diff --git a/backend/app/assets/javascripts/spree/backend/shipments.js b/backend/app/assets/javascripts/spree/backend/shipments.js
@@ -155,7 +155,7 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
  if(new_quantity!=0){
  Spree.ajax({
  type: "PUT",
- url: Spree.url(url),
+ url: url,
  data: {
  variant_id: variant_id,
  quantity: new_quantity,
@@ -175,7 +175,7 @@ deleteLineItem = function(line_item_id){
 
  Spree.ajax({
  type: "DELETE",
- url: Spree.url(url),
+ url: url,
  success: function(response) {
  window.location.reload();
  },

diff --git a/backend/app/assets/javascripts/spree/backend/stock_movement.js.coffee b/backend/app/assets/javascripts/spree/backend/stock_movement.js.coffee
@@ -4,7 +4,7 @@ jQuery ->
  el.select2
  placeholder: "Find a stock item" # translate
  ajax:
- url: Spree.url(Spree.routes.stock_items_api(el.data('stock-location-id')))
+ url: Spree.routes.stock_items_api(el.data('stock-location-id'))
  params: { "headers": { "X-Spree-Token": Spree.api_key } }
  data: (term, page) ->
  q:

diff --git a/backend/app/assets/javascripts/spree/backend/taxon_autocomplete.js b/backend/app/assets/javascripts/spree/backend/taxon_autocomplete.js
@@ -6,12 +6,16 @@ var set_taxon_select = function(){
  placeholder: Spree.translations.taxon_placeholder,
  multiple: true,
  initSelection: function (element, callback) {
- var url = Spree.url(Spree.routes.taxons_search, {
- ids: element.val(),
- without_children: true
- });
- return Spree.getJSON(url, null, function (data) {
- return callback(data['taxons']);
+ Spree.ajax({
+ type: "GET",
+ url: Spree.routes.taxons_search,
+ data: {
+ ids: element.val(),
+ without_children: true
+ },
+ success: function (data) {
+ callback(data['taxons']);
+ }
  });
  },
  ajax: {

diff --git a/core/app/assets/javascripts/spree.js.coffee.erb b/core/app/assets/javascripts/spree.js.coffee.erb
@@ -14,7 +14,7 @@ class window.Spree
  # Uses the JSUri library from here: https://github.com/derek-watson/jsUri
  # Thanks to Jake Moffat for the suggestion: https://twitter.com/jakeonrails/statuses/321776992221544449
  @url: (uri, query) ->
- if Spree.env == 'development'
+ if Spree.env == 'development' || Spree.env == 'test'
  console.warn 'Spree.url is deprecated, please use Spree.ajax for your request instead.'
  if uri.path == undefined
  uri = new Uri(uri)