Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support for importing jQuery 

Also remove Ember.Qunit error about Ember.$ for now
This commit is contained in:
Robin Ward 2019-10-23 13:25:25 -04:00
parent 39159ad5e4
commit 9347108f02
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse-loader.js
View File

@ -5,6 +5,7 @@ var define, requirejs;
var EMBER_MODULES = {}; var EMBER_MODULES = {};
if (typeof Ember !== "undefined") { if (typeof Ember !== "undefined") {
EMBER_MODULES = { EMBER_MODULES = {
jquery: { default: $ },
"@ember/component": { default: Ember.Component }, "@ember/component": { default: Ember.Component },
"@ember/controller": { default: Ember.Controller }, "@ember/controller": { default: Ember.Controller },
"@ember/object": { default: Ember.Object }, "@ember/object": { default: Ember.Object },

3
app/assets/javascripts/wizard/lib/ajax.js.es6
View File

@ -1,4 +1,5 @@
import getUrl from "discourse-common/lib/get-url"; import getUrl from "discourse-common/lib/get-url";
import jQuery from "jquery";
let token; let token;
@ -16,6 +17,6 @@ export function ajax(args) {
args.success = data => Ember.run(null, resolve, data); args.success = data => Ember.run(null, resolve, data);
args.error = xhr => Ember.run(null, reject, xhr); args.error = xhr => Ember.run(null, reject, xhr);
args.url = getUrl(args.url); args.url = getUrl(args.url);
Ember.$.ajax(args); jQuery.ajax(args);
}); });
} }

4
vendor/assets/javascripts/ember-qunit.js vendored
View File

@ -1874,7 +1874,7 @@ define('ember-test-helpers/wait', ['exports', 'ember'], function (exports, _embe
exports._setupAJAXHooks = _setupAJAXHooks; exports._setupAJAXHooks = _setupAJAXHooks;
exports['default'] = wait; exports['default'] = wait;
var jQuery = _ember['default'].$; var jQuery = $;
var requests; var requests;
function incrementAjaxPendingRequests(_, xhr) { function incrementAjaxPendingRequests(_, xhr) {
@ -1988,4 +1988,4 @@ for (var exportName in emberQUnit) {
} }
})(); })();
//# sourceMappingURL=ember-qunit.map //# sourceMappingURL=ember-qunit.map