Merge pull request emberjs#17510 from rwjblue/fix-ember-$

Ensure Ember.$.ajax works properly.
jasonmit · Jan 24, 2019 · ec85163 · ec85163
2 parents 0d7aa52 + 3c00987
commit ec85163
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/packages/ember/index.js b/packages/ember/index.js
@@ -561,19 +561,26 @@ Ember.VERSION = VERSION;
 
 // ****@ember/-internals/views****
 if (!views.jQueryDisabled) {
-  Ember.$ = function() {
-    deprecate(
-      "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead",
-      false,
-      {
-        id: 'ember-views.curly-components.jquery-element',
-        until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_jquery-apis',
-      }
-    );
-    return views.jQuery.apply(this, arguments);
-  };
+  Object.defineProperty(Ember, '$', {
+    get() {
+      deprecate(
+        "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead",
+        false,
+        {
+          id: 'ember-views.curly-components.jquery-element',
+          until: '4.0.0',
+          url: 'https://emberjs.com/deprecations/v3.x#toc_jquery-apis',
+        }
+      );
+
+      return views.jQuery;
+    },
+
+    configurable: true,
+    enumerable: true,
+  });
 }
+
 Ember.ViewUtils = {
   isSimpleClick: views.isSimpleClick,
   getViewElement: views.getViewElement,

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -2,7 +2,7 @@ import Ember from '../index';
 import { FEATURES } from '@ember/canary-features';
 import { confirmExport } from 'internal-test-helpers';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-import { jQueryDisabled } from '@ember/-internals/views';
+import { jQueryDisabled, jQuery } from '@ember/-internals/views';
 
 moduleFor(
   'ember reexports',
@@ -57,12 +57,17 @@ if (!jQueryDisabled) {
     'ember reexports: jQuery enabled',
     class extends AbstractTestCase {
       [`@test Ember.$ is exported`](assert) {
-        assert.ok(Ember.$, 'Ember.$ export exists');
         expectDeprecation(() => {
           let body = Ember.$('body').get(0);
           assert.equal(body, document.body, 'Ember.$ exports working jQuery instance');
         }, "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead");
       }
+
+      '@test Ember.$ _**is**_ window.jQuery'(assert) {
+        expectDeprecation(() => {
+          assert.strictEqual(Ember.$, jQuery);
+        }, "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead");
+      }
     }
   );
 }