diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-05 08:33:14 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-05 08:33:14 +0000 |
| commit | 4dc45702a49423b34dc5c65c8e24152b675eeab0 (patch) | |
| tree | 351370bf38a013857b6572c04bd40296cc3e42bf | |
| parent | bb0e50d63417234e048fa9c4aa34e02953c54f15 (diff) | |
| parent | 8377bf7b0a9c9968318de4ed501526f6fb23f9d2 (diff) | |
| download | gitlab-ce-4dc45702a49423b34dc5c65c8e24152b675eeab0.tar.gz | |
Merge branch 'tz-update-register-element-for-emojis' into 'master'
Updated document-register-element and registering emojis in the new way
See merge request gitlab-org/gitlab-ce!24899
| -rw-r--r-- | app/assets/javascripts/behaviors/gl_emoji.js | 19 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 10 |
3 files changed, 17 insertions, 14 deletions
diff --git a/app/assets/javascripts/behaviors/gl_emoji.js b/app/assets/javascripts/behaviors/gl_emoji.js index 56293d5f96f..d1d75658181 100644 --- a/app/assets/javascripts/behaviors/gl_emoji.js +++ b/app/assets/javascripts/behaviors/gl_emoji.js @@ -1,11 +1,10 @@ -import installCustomElements from 'document-register-element'; +import 'document-register-element'; import isEmojiUnicodeSupported from '../emoji/support'; -installCustomElements(window); +class GlEmoji extends HTMLElement { + constructor() { + super(); -export default function installGlEmojiElement() { - const GlEmojiElementProto = Object.create(HTMLElement.prototype); - GlEmojiElementProto.createdCallback = function createdCallback() { const emojiUnicode = this.textContent.trim(); const { name, unicodeVersion, fallbackSrc, fallbackSpriteClass } = this.dataset; @@ -43,9 +42,11 @@ export default function installGlEmojiElement() { }); } } - }; + } +} - document.registerElement('gl-emoji', { - prototype: GlEmojiElementProto, - }); +export default function installGlEmojiElement() { + if (!customElements.get('gl-emoji')) { + customElements.define('gl-emoji', GlEmoji); + } } diff --git a/package.json b/package.json index cebd4726274..97d8fd3b17f 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "dateformat": "^3.0.3", "deckar01-task_list": "^2.2.0", "diff": "^3.4.0", - "document-register-element": "1.3.0", + "document-register-element": "1.13.1", "dropzone": "^4.2.0", "echarts": "^4.2.0-rc.2", "emoji-regex": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index 1bcdd046cb9..423c7f75d47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3264,10 +3264,12 @@ doctrine@^2.1.0: dependencies: esutils "^2.0.2" -document-register-element@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.3.0.tgz#fb3babb523c74662be47be19c6bc33e71990d940" - integrity sha1-+zurtSPHRmK+R74Zxrwz5xmQ2UA= +document-register-element@1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.13.1.tgz#dad8cb7be38e04ee3f56842e6cf81af46c1249ba" + integrity sha512-92ZyLDKg9j4rOll//NNXj25f+8rAzOkYsGJonhugKwXfeqH7bzs8Ucpvey0WzZ2ZzKdrvW9RnUw3UyOZ/uhBFw== + dependencies: + lightercollective "^0.1.0" dom-serialize@^2.2.0: version "2.2.1" |