Skip to content

Commit

Permalink
Merge pull request #407 from sir-dunxalot/mf-remove_maybe_in_element
Browse files Browse the repository at this point in the history
Remove ember-maybe-in-element dependency
  • Loading branch information
maxfierke authored Aug 20, 2020
2 parents a217f83 + a77f175 commit 854b01c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
14 changes: 12 additions & 2 deletions addon/templates/components/ember-tooltip-base.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{#maybe-in-element this._renderElement this._awaitingTooltipElementRendered}}
{{#if this._awaitingTooltipElementRendered}}
<div>
{{#if this._shouldRenderContent}}
{{#if (hasBlock)}}
Expand All @@ -8,4 +8,14 @@
{{/if}}
{{/if}}
</div>
{{/maybe-in-element}}
{{else}}
{{#in-element this._renderElement}}
<div>
{{#if (hasBlock)}}
{{yield this}}
{{else}}
{{this.text}}
{{/if}}
</div>
{{/in-element}}
{{/if}}
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 854b01c

Please sign in to comment.