From c46b7f6181cac5f6fe551cbcb07b060309068faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 5 Jun 2014 18:51:39 +0200 Subject: [PATCH] TRIVIAL: ES6ify AppEvents --- .../discourse/initializers/inject-app-events.js.es6 | 4 +++- app/assets/javascripts/discourse/lib/app-events.js.es6 | 1 + app/assets/javascripts/discourse/lib/app_events.js | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/discourse/lib/app-events.js.es6 delete mode 100644 app/assets/javascripts/discourse/lib/app_events.js diff --git a/app/assets/javascripts/discourse/initializers/inject-app-events.js.es6 b/app/assets/javascripts/discourse/initializers/inject-app-events.js.es6 index 33e1b9eff..c67746d4e 100644 --- a/app/assets/javascripts/discourse/initializers/inject-app-events.js.es6 +++ b/app/assets/javascripts/discourse/initializers/inject-app-events.js.es6 @@ -1,7 +1,9 @@ +import AppEvents from 'discourse/lib/app-events'; + export default { name: "inject-app-events", initialize: function(container, application) { - application.register('app-events:main', Discourse.AppEvents, { singleton: true }); + application.register('app-events:main', AppEvents, { singleton: true }); application.inject('controller', 'appEvents', 'app-events:main'); application.inject('route', 'appEvents', 'app-events:main'); diff --git a/app/assets/javascripts/discourse/lib/app-events.js.es6 b/app/assets/javascripts/discourse/lib/app-events.js.es6 new file mode 100644 index 000000000..59257700f --- /dev/null +++ b/app/assets/javascripts/discourse/lib/app-events.js.es6 @@ -0,0 +1 @@ +export default Ember.Object.extend(Ember.Evented); diff --git a/app/assets/javascripts/discourse/lib/app_events.js b/app/assets/javascripts/discourse/lib/app_events.js deleted file mode 100644 index 1c6a69f97..000000000 --- a/app/assets/javascripts/discourse/lib/app_events.js +++ /dev/null @@ -1 +0,0 @@ -Discourse.AppEvents = Ember.Object.extend(Ember.Evented);