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

FIX: `guidFor` is not part of `Ember.Object`

This commit is contained in:
Robin Ward 2020-05-20 11:31:11 -04:00
parent bd57ae83f1
commit 6c9c8dfefd
3 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

@ -36,7 +36,6 @@ var define, requirejs;
default: Ember.Object, default: Ember.Object,
get: Ember.get, get: Ember.get,
getProperties: Ember.getProperties, getProperties: Ember.getProperties,
guidFor: Ember.guidFor,
set: Ember.set, set: Ember.set,
setProperties: Ember.setProperties, setProperties: Ember.setProperties,
computed: Ember.computed, computed: Ember.computed,

3
app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
View File

@ -3,6 +3,7 @@ import { cancel, later } from "@ember/runloop";
import { Promise } from "rsvp"; import { Promise } from "rsvp";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
import I18n from "I18n"; import I18n from "I18n";
import { guidFor } from "@ember/object/internals";
// http://github.com/feross/clipboard-copy // http://github.com/feross/clipboard-copy
function clipboardCopy(text) { function clipboardCopy(text) {
@ -90,7 +91,7 @@ export default {
const state = button.innerHTML; const state = button.innerHTML;
button.innerHTML = I18n.t("copy_codeblock.copied"); button.innerHTML = I18n.t("copy_codeblock.copied");
const commandId = Ember.guidFor(button); const commandId = guidFor(button);
if (_fadeCopyCodeblocksRunners[commandId]) { if (_fadeCopyCodeblocksRunners[commandId]) {
cancel(_fadeCopyCodeblocksRunners[commandId]); cancel(_fadeCopyCodeblocksRunners[commandId]);

3
app/assets/javascripts/select-kit/app/components/select-kit.js
View File

@ -1,5 +1,6 @@
import I18n from "I18n"; import I18n from "I18n";
import EmberObject, { computed, get, guidFor } from "@ember/object"; import EmberObject, { computed, get } from "@ember/object";
import { guidFor } from "@ember/object/internals";
import Component from "@ember/component"; import Component from "@ember/component";
import deprecated from "discourse-common/lib/deprecated"; import deprecated from "discourse-common/lib/deprecated";
import { makeArray } from "discourse-common/lib/helpers"; import { makeArray } from "discourse-common/lib/helpers";