From d7222ad3064f3f290da821a08f98ecd0ad58c4ec Mon Sep 17 00:00:00 2001
From: Faizaan Shamsi <faizaanshamsi@gmail.com>
Date: Tue, 21 Jul 2015 11:07:35 -0400
Subject: [PATCH] Use Ember.$ instead of jQuery for AJAX requests

---
 packages/ember-data/lib/system/adapter.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/ember-data/lib/system/adapter.js b/packages/ember-data/lib/system/adapter.js
index ee66cdd9806..98c5f7bbd91 100644
--- a/packages/ember-data/lib/system/adapter.js
+++ b/packages/ember-data/lib/system/adapter.js
@@ -101,7 +101,7 @@ var Adapter = Ember.Object.extend({
         var url = [type.modelName, id].join('/');
 
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          jQuery.getJSON(url).then(function(data) {
+          Ember.$.getJSON(url).then(function(data) {
             Ember.run(null, resolve, data);
           }, function(jqXHR) {
             jqXHR.then = null; // tame jQuery's ill mannered promises
@@ -134,7 +134,7 @@ var Adapter = Ember.Object.extend({
         var url = type;
         var query = { since: sinceToken };
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          jQuery.getJSON(url, query).then(function(data) {
+          Ember.$.getJSON(url, query).then(function(data) {
             Ember.run(null, resolve, data);
           }, function(jqXHR) {
             jqXHR.then = null; // tame jQuery's ill mannered promises
@@ -166,7 +166,7 @@ var Adapter = Ember.Object.extend({
       query: function(store, type, query) {
         var url = type;
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          jQuery.getJSON(url, query).then(function(data) {
+          Ember.$.getJSON(url, query).then(function(data) {
             Ember.run(null, resolve, data);
           }, function(jqXHR) {
             jqXHR.then = null; // tame jQuery's ill mannered promises
@@ -205,7 +205,7 @@ var Adapter = Ember.Object.extend({
         var url = [type.typeKey, id].join('/');
 
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          jQuery.getJSON(url, query).then(function(data) {
+          Ember.$.getJSON(url, query).then(function(data) {
             Ember.run(null, resolve, data);
           }, function(jqXHR) {
             jqXHR.then = null; // tame jQuery's ill mannered promises
@@ -299,7 +299,7 @@ var Adapter = Ember.Object.extend({
         var url = type;
 
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          jQuery.ajax({
+          Ember.$.ajax({
             type: 'POST',
             url: url,
             dataType: 'json',
@@ -341,7 +341,7 @@ var Adapter = Ember.Object.extend({
         var url = [type, id].join('/');
 
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          jQuery.ajax({
+          Ember.$.ajax({
             type: 'PUT',
             url: url,
             dataType: 'json',
@@ -383,7 +383,7 @@ var Adapter = Ember.Object.extend({
         var url = [type, id].join('/');
 
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          jQuery.ajax({
+          Ember.$.ajax({
             type: 'DELETE',
             url: url,
             dataType: 'json',