Skip to content
This repository has been archived by the owner on May 4, 2022. It is now read-only.

fix: id static content div with fname rather than nodeId #876

Merged
merged 3 commits into from
Mar 7, 2019
Merged

fix: id static content div with fname rather than nodeId #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c3134e
fix: id static content div with fname rather than nodeId
apetro Mar 5, 2019
dc103e7
docs(changelog): note #876 use fname not nodeId
apetro Mar 7, 2019
8c50746
Merge branch 'master' into id-static-div-fname-not-nodeid
apetro Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ and this project adheres to

## [Unreleased][]

No changes so far
* Generate static content div identifier by fname rather than by
not-reliably-unique nodeId #876

## [9.0.0][] - 2019-02-26

Expand Down
2 changes: 1 addition & 1 deletion web/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</div>
<frame-page ng-if="loaded" app-title="{{ portlet.title }}" app-icon="{{ portlet.faIcon }}" page-title="{{ portlet.title }}" app-fname="portlet.fname" app-show-add-to-home="true">
<md-card>
<div ng-bind-html="::portlet.exclusiveContent" class="up-portlet-content-wrapper" id="content-{{ ::portlet.nodeId }}"></div>
<div ng-bind-html="::portlet.exclusiveContent" class="up-portlet-content-wrapper" id="content-{{ ::portlet.fname }}"></div>
</md-card>
</frame-page>
</div>
2 changes: 1 addition & 1 deletion web/src/main/webapp/my-app/layout/static/partials/static-content-max.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</div>
<frame-page ng-if="loaded" app-title="{{ portlet.title }}" app-icon="{{ portlet.faIcon }}" page-title="{{ portlet.title }}" app-fname="portlet.fname" app-show-add-to-home="true">
<md-card>
<div ng-bind-html="::portlet.staticContent" class="up-portlet-content-wrapper" id="content-{{ ::portlet.nodeId }}"></div>
<div ng-bind-html="::portlet.staticContent" class="up-portlet-content-wrapper" id="content-{{ ::portlet.fname}}"></div>
</md-card>
</frame-page>
</div>