resolves #3660 use the asset directory attribute on the node to resolve the asset path #3661
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ggrossetie
force-pushed
the
issue-3660-assetdir-attr-node
branch
from
8c4a89f
to
40a9b62
Compare
ggrossetie
changed the title
ggrossetie
commented
May 17, 2020
| @@ -309,16 +309,17 @@ def icon_uri name | |||
| # | |||
| # Returns A String reference or data URI for the target image | |||
| def image_uri(target_image, asset_dir_key = 'imagesdir') | |||
| images_base = asset_dir_key ? (attr asset_dir_key, nil, true) : nil | |||
There was a problem hiding this comment.
this variable is used in both branches so I've decided to declare it above
ggrossetie
force-pushed
the
issue-3660-assetdir-attr-node
branch
2 times, most recently
from
50f0016
to
bdad32c
Compare
…de to resolve the asset path If the asset directory attribute (by default, `imagesdir` or `iconsdir`) is defined on the node, we should use it. If not, then we should use the value defined on the `Document`.
ggrossetie
force-pushed
the
issue-3660-assetdir-attr-node
branch
from
bdad32c
to
d1086a9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By default, the asset directory is
imagesdiroriconsdirdepending on the type of asset.If the asset directory attribute is defined on the node then we use it.
Otherwise, we use the value defined on the
Document.I've decided to apply the same rule on all type of assets (video, audio, icon and image). I think it would be inconsistent and confusing to implement this behavior only on images.
resolves #3660