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

DEV: Fix a deprecated `ember` import (#9903) 

See the following for `Ember.testing` and `@ember/debug isTesting`:

* 8cf29959f7/packages/ember/index.js (L372-L376)
* 8cf29959f7/packages/%40ember/debug/lib/testing.ts
This commit is contained in:
Jarek Radosz 2020-05-27 22:47:46 +02:00 committed by GitHub
parent 9dddbcc00d
commit 75f46ca632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 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

@ -29,6 +29,7 @@ var define, requirejs;
inject: Ember.inject.controller inject: Ember.inject.controller
}, },
"@ember/debug": { "@ember/debug": {
isTesting: () => Ember.testing,
warn: Ember.warn warn: Ember.warn
}, },
"@ember/object": { "@ember/object": {

6
app/assets/javascripts/discourse/app/helpers/page-reloader.js
View File

@ -1,9 +1,9 @@
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import Ember from "ember"; import { isTesting } from "@ember/debug";
export default EmberObject.create({ export default EmberObject.create({
reload: function() { reload() {
if (!Ember.testing) { if (!isTesting()) {
location.reload(); location.reload();
} }
} }