[BUGFIX jQuery] avoid jQuery deprecation notice for intentional use

emberjs · Apr 20, 2019 · 7e3ca65 · 7e3ca65
1 parent 744d41a
commit 7e3ca65
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/addon/adapters/rest.js b/addon/adapters/rest.js
@@ -1,10 +1,9 @@
 /* global heimdall */
-/* globals najax */
+/* globals najax jQuery */
 /**
   @module ember-data
 */
 
-import Ember from 'ember';
 import fetch from 'fetch';
 import serializeQueryParams from 'ember-fetch/utils/serialize-query-params';
 import determineBodyPromise from 'ember-fetch/utils/determine-body-promise';
@@ -32,6 +31,7 @@ import { warn } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
 const Promise = EmberPromise;
+const jQ = typeof jQuery !== 'undefined' ? jQuery : undefined;
 
 /**
   The REST adapter allows your store to communicate with an HTTP server by
@@ -303,7 +303,7 @@ const RESTAdapter = Adapter.extend(BuildURLMixin, {
 
   useFetch: computed(function() {
     let ENV = getOwner(this).resolveRegistration('config:environment');
-    return (ENV && ENV._JQUERY_INTEGRATION) === false || Ember.$ === undefined;
+    return (ENV && ENV._JQUERY_INTEGRATION) === false || jQ === undefined;
   }),
 
   /**
@@ -1039,7 +1039,7 @@ const RESTAdapter = Adapter.extend(BuildURLMixin, {
     @param {Object} options jQuery ajax options to be used for the ajax request
   */
   _ajaxRequest(options) {
-    Ember.$.ajax(options);
+    jQ.ajax(options);
   },
 
   /**