From 6c9c8dfefdc2682b848c4a34ce1a8b7e386c3756 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 20 May 2020 11:31:11 -0400
Subject: [PATCH] FIX: `guidFor` is not part of `Ember.Object`

---
 app/assets/javascripts/discourse-loader.js                     | 1 -
 .../javascripts/discourse/app/initializers/copy-codeblocks.js  | 3 ++-
 app/assets/javascripts/select-kit/app/components/select-kit.js | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index d11217a985a..fc829ae12f0 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -36,7 +36,6 @@ var define, requirejs;
         default: Ember.Object,
         get: Ember.get,
         getProperties: Ember.getProperties,
-        guidFor: Ember.guidFor,
         set: Ember.set,
         setProperties: Ember.setProperties,
         computed: Ember.computed,
diff --git a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
index a0b0d509621..f6fcef5e17e 100644
--- a/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
+++ b/app/assets/javascripts/discourse/app/initializers/copy-codeblocks.js
@@ -3,6 +3,7 @@ import { cancel, later } from "@ember/runloop";
 import { Promise } from "rsvp";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import I18n from "I18n";
+import { guidFor } from "@ember/object/internals";
 
 // http://github.com/feross/clipboard-copy
 function clipboardCopy(text) {
@@ -90,7 +91,7 @@ export default {
             const state = button.innerHTML;
             button.innerHTML = I18n.t("copy_codeblock.copied");
 
-            const commandId = Ember.guidFor(button);
+            const commandId = guidFor(button);
 
             if (_fadeCopyCodeblocksRunners[commandId]) {
               cancel(_fadeCopyCodeblocksRunners[commandId]);
diff --git a/app/assets/javascripts/select-kit/app/components/select-kit.js b/app/assets/javascripts/select-kit/app/components/select-kit.js
index 140e96782d6..02acfb5a2e1 100644
--- a/app/assets/javascripts/select-kit/app/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/app/components/select-kit.js
@@ -1,5 +1,6 @@
 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 deprecated from "discourse-common/lib/deprecated";
 import { makeArray } from "discourse-common/lib/helpers";