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

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

This reverts commit 75f46ca632.

This unfortunately breaks

`RAILS_ENV=production bin/rake assets:precompile`

I don't think discourse-loader.js is transpiled
This commit is contained in:
Sam Saffron 2020-05-28 10:04:08 +10:00
parent ee60488e6a
commit 9841569bba
No known key found for this signature in database
GPG Key ID: B9606168D2FFD9F5
2 changed files with 3 additions and 4 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,7 +29,6 @@ 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 { isTesting } from "@ember/debug"; import Ember from "ember";
export default EmberObject.create({ export default EmberObject.create({
reload() { reload: function() {
if (!isTesting()) { if (!Ember.testing) {
location.reload(); location.reload();
} }
} }