github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 10:43:40 +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

5
app/assets/javascripts/admin/mixins/setting-component.js.es6
View File

@ -1,6 +1,7 @@
import { alias, oneWay } from "@ember/object/computed";
import computed from "ember-addons/ember-computed-decorators";
import { categoryLinkHTML } from "discourse/helpers/category-link";
import { on } from "@ember/object/evented";
import Mixin from "@ember/object/mixin";
const CUSTOM_TYPES = [
@ -91,7 +92,7 @@ export default Mixin.create({
return settingDefault !== bufferedValue;
},
_watchEnterKey: Ember.on("didInsertElement", function() {
_watchEnterKey: on("didInsertElement", function() {
$(this.element).on("keydown.setting-enter", ".input-setting-string", e => {
if (e.keyCode === 13) {
// enter key
@ -100,7 +101,7 @@ export default Mixin.create({
});
}),
_removeBindings: Ember.on("willDestroyElement", function() {
_removeBindings: on("willDestroyElement", function() {
$(this.element).off("keydown.setting-enter");
}),