From a77f1754a77eeed079a552cb9afecaf6d5a8075a Mon Sep 17 00:00:00 2001 From: Max Fierke Date: Wed, 19 Aug 2020 20:16:53 -0500 Subject: [PATCH] Remove ember-maybe-in-element dependency --- addon/templates/components/ember-tooltip-base.hbs | 14 ++++++++++++-- package.json | 1 - yarn.lock | 8 -------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/addon/templates/components/ember-tooltip-base.hbs b/addon/templates/components/ember-tooltip-base.hbs index 38f5b830..1c2520d1 100644 --- a/addon/templates/components/ember-tooltip-base.hbs +++ b/addon/templates/components/ember-tooltip-base.hbs @@ -1,4 +1,4 @@ -{{#maybe-in-element this._renderElement this._awaitingTooltipElementRendered}} +{{#if this._awaitingTooltipElementRendered}}
{{#if this._shouldRenderContent}} {{#if (hasBlock)}} @@ -8,4 +8,14 @@ {{/if}} {{/if}}
-{{/maybe-in-element}} +{{else}} + {{#in-element this._renderElement}} +
+ {{#if (hasBlock)}} + {{yield this}} + {{else}} + {{this.text}} + {{/if}} +
+ {{/in-element}} +{{/if}} diff --git a/package.json b/package.json index 2ceda657..f3baef34 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "ember-cli-babel": "^7.13.0", "ember-cli-htmlbars": "^4.2.0", "ember-in-element-polyfill": "^1.0.0", - "ember-maybe-in-element": "^1.0.0", "popper.js": "^1.12.5", "resolve": "^1.10.1", "tooltip.js": "^1.1.5" diff --git a/yarn.lock b/yarn.lock index e52f16c3..3c577094 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4660,14 +4660,6 @@ ember-maybe-import-regenerator@^0.1.6: ember-cli-babel "^6.0.0-beta.4" regenerator-runtime "^0.9.5" -ember-maybe-in-element@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-maybe-in-element/-/ember-maybe-in-element-1.0.0.tgz#55fdbe3784a9807c69bf681c53926426a4a16498" - integrity sha512-aXYAb+u/kkZmPqjRhBNoaGAr3vZndf9Lrqy6xdPfpQ5ekM/a0oE9fAAZNg4Cq09bPecEnty4LJqAYZqS/oWvjg== - dependencies: - ember-cli-babel "^7.7.3" - ember-in-element-polyfill "^1.0.0" - ember-named-arguments-polyfill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-named-arguments-polyfill/-/ember-named-arguments-polyfill-1.0.0.tgz#0b81fb81a7cef2c89e9e1d0278b579e708bf4ded"