From 3694321f66545703f71b2a4cf7722b6616a3e645 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 11 Jan 2013 10:54:53 +1100 Subject: [PATCH] Use angular's extend instead of jquery's --- app/assets/javascripts/admin/order_cycle.js.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/order_cycle.js.erb b/app/assets/javascripts/admin/order_cycle.js.erb index 29aa07918a..4997fc9d77 100644 --- a/app/assets/javascripts/admin/order_cycle.js.erb +++ b/app/assets/javascripts/admin/order_cycle.js.erb @@ -96,18 +96,18 @@ angular.module('order_cycle', ['ngResource']). var service = this; OrderCycle.get({order_cycle_id: order_cycle_id}, function(oc) { - $.extend(service.order_cycle, oc); + angular.extend(service.order_cycle, oc); service.order_cycle.incoming_exchanges = []; service.order_cycle.outgoing_exchanges = []; for(i in service.order_cycle.exchanges) { var exchange = service.order_cycle.exchanges[i]; if(exchange.sender_id == service.order_cycle.coordinator_id) { - $.extend(exchange, {enterprise_id: exchange.receiver_id, active: true}); + angular.extend(exchange, {enterprise_id: exchange.receiver_id, active: true}); delete(exchange.sender_id); service.order_cycle.outgoing_exchanges.push(exchange); } else if(exchange.receiver_id == service.order_cycle.coordinator_id) { - $.extend(exchange, {enterprise_id: exchange.sender_id, active: true}); + angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true}); delete(exchange.receiver_id); service.order_cycle.incoming_exchanges.push(exchange)