Merge pull request emberjs#3567 from faizaanshamsi/patch-1

Use Ember.$ instead of jQuery for AJAX requests
bmac · Jul 21, 2015 · b176443 · b176443
2 parents 90a0011 + d7222ad
commit b176443
Showing 1 changed file with 7 additions and 7 deletions.
diff --git 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',