github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Import Ember.on from @ember/object/evented (#8268)

Browse Source 
* DEV: Import `Ember.on` from @ember/object/evented

* Dont import "on" outsie of the js or admin app

* Fixed error when resolving merge conflicts
This commit is contained in:
Mark VanLandingham
2019-10-30 17:05:27 -05:00
committed by GitHub
parent d8f7f363cd
commit 02a886ce13
11 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ var define, requirejs;
},
"@ember/object/mixin": { default: Ember.Mixin },
"@ember/object/proxy": { default: Ember.ObjectProxy },
"@ember/object/evented": { on: Ember.on },
"@ember/routing/route": { default: Ember.Route },
"@ember/runloop": {
bind: Ember.run.bind,