Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(ui5-messagestrip): rename hideIcon property to noIcon #507

Merged
merged 5 commits into from
Jun 18, 2019
+18 −18
Merged

refactor(ui5-messagestrip): rename hideIcon property to noIcon #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
813c781
refactor(ui5-messagestrip): rename hideIcon property to iconHidden
fifoosid Jun 4, 2019
888547f
fix sample page
fifoosid Jun 4, 2019
3c79e23
property renamed to no-icon
fifoosid Jun 17, 2019
d728596
Merge master branch
fifoosid Jun 18, 2019
f49b82e
Merge master branch
fifoosid Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/main/src/MessageStrip.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
aria-live="assertive"
aria-labelledby="{{_id}}">

{{#unless hideIcon}}
{{#unless noIcon}}
<ui5-icon class="ui5-messagestrip-icon" src="{{messageStripIcon}}"></ui5-icon>
{{/unless}}

Expand Down
6 changes: 3 additions & 3 deletions packages/main/src/MessageStrip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const metadata = {
* @defaultvalue false
* @public
*/
hideIcon: {
noIcon: {
type: Boolean,
},

Expand Down Expand Up @@ -197,7 +197,7 @@ class MessageStrip extends UI5Element {
}

get hiddenText() {
return `Message Strip ${this.type} ${this.hideCloseButton ? "" : "closable"}.`;
return `Message Strip ${this.type} ${this.noCloseButton ? "" : "closable"}.`;
}

get _closeButtonText() {
Expand All @@ -215,7 +215,7 @@ class MessageStrip extends UI5Element {
},
main: {
"ui5-messagestrip-root": true,
"ui5-messagestrip-icon--hidden": this.hideIcon,
"ui5-messagestrip-icon--hidden": this.noIcon,
"ui5-messagestrip-close-icon--hidden": this.noCloseButton,
[this.typeClasses]: true,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/main/test/sap/ui/webcomponents/main/pages/MessageStrip.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<ui5-messagestrip class="top" type="Information">Information with default icon.</ui5-messagestrip>
<ui5-messagestrip class="top" type="Information">Ea mollit nulla laborum et fugiat nulla excepteur ea. Duis et dolor enim Lorem laboris adipisicing cillum quis proident dolor veniam voluptate. Nostrud dolore ipsum anim voluptate enim dolore eiusmod aliqua et. Est eu ex dolor ea ipsum. Adipisicing duis aliquip ullamco culpa dolore exercitation ullamco cillum irure.</ui5-messagestrip>

<ui5-messagestrip hide-icon class="top" type="Information">Ea mollit nulla laborum et fugiat nulla excepteur ea. Duis et dolor enim Lorem laboris adipisicing cillum quis proident dolor veniam voluptate. Nostrud dolore ipsum anim voluptate enim dolore eiusmod aliqua et. Est eu ex dolor ea ipsum. Adipisicing duis aliquip ullamco culpa dolore exercitation ullamco cillum irure.</ui5-messagestrip>
<ui5-messagestrip hide-icon no-close-button class="top" type="Information">Ea mollit nulla laborum et fugiat nulla excepteur ea. Duis et dolor enim Lorem laboris adipisicing cillum quis proident dolor veniam voluptate. Nostrud dolore ipsum anim voluptate enim dolore eiusmod aliqua et. Est eu ex dolor ea ipsum. Adipisicing duis aliquip ullamco culpa dolore exercitation ullamco cillum irure.</ui5-messagestrip>
<ui5-messagestrip no-icon class="top" type="Information">Ea mollit nulla laborum et fugiat nulla excepteur ea. Duis et dolor enim Lorem laboris adipisicing cillum quis proident dolor veniam voluptate. Nostrud dolore ipsum anim voluptate enim dolore eiusmod aliqua et. Est eu ex dolor ea ipsum. Adipisicing duis aliquip ullamco culpa dolore exercitation ullamco cillum irure.</ui5-messagestrip>
<ui5-messagestrip no-icon no-close-button class="top" type="Information">Ea mollit nulla laborum et fugiat nulla excepteur ea. Duis et dolor enim Lorem laboris adipisicing cillum quis proident dolor veniam voluptate. Nostrud dolore ipsum anim voluptate enim dolore eiusmod aliqua et. Est eu ex dolor ea ipsum. Adipisicing duis aliquip ullamco culpa dolore exercitation ullamco cillum irure.</ui5-messagestrip>
<ui5-messagestrip no-close-button class="top" type="Information">Ea mollit nulla laborum et fugiat nulla excepteur ea. Duis et dolor enim Lorem laboris adipisicing cillum quis proident dolor veniam voluptate. Nostrud dolore ipsum anim voluptate enim dolore eiusmod aliqua et. Est eu ex dolor ea ipsum. Adipisicing duis aliquip ullamco culpa dolore exercitation ullamco cillum irure.</ui5-messagestrip>


Expand Down
24 changes: 12 additions & 12 deletions packages/main/test/sap/ui/webcomponents/main/samples/MessageStrip.sample.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ <h3>MessageStrip With No Close Button</h3>
<section>
<h3>MessageStrip With No Icon</h3>
<div class="snippet">
<ui5-messagestrip class="samples-margin-bottom" type="Information" hide-icon>Information MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom" type="Positive" hide-icon>Positive MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom" type="Negative" hide-icon>Negative MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom" type="Warning" hide-icon>Warning MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom" type="Information" no-icon>Information MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom" type="Positive" no-icon>Positive MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom" type="Negative" no-icon>Negative MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom" type="Warning" no-icon>Warning MessageStrip With No Icon</ui5-messagestrip>
</div>
<pre class="prettyprint lang-html"><xmp>
<ui5-messagestrip type="Information" hide-icon>Information MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip type="Positive" hide-icon>Positive MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip type="Negative" hide-icon>Negative MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip type="Warning" hide-icon>Warning MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip type="Information" no-icon>Information MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip type="Positive" no-icon>Positive MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip type="Negative" no-icon>Negative MessageStrip With No Icon</ui5-messagestrip>
<ui5-messagestrip type="Warning" no-icon>Warning MessageStrip With No Icon</ui5-messagestrip>
<script>
document.querySelectorAll("ui5-messagestrip").forEach(function(messageStrip) {
messageStrip.addEventListener("close", function() {
Expand All @@ -107,15 +107,15 @@ <h3>MessageStrip With No Icon</h3>
<section>
<h3>Custom MessageStrip</h3>
<div class="snippet">
<ui5-messagestrip class="samples-margin-bottom samples-vertical-align" style="width: 200px;" type="Information" hide-icon no-close-button>You have new message.</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom samples-vertical-align" style="width: 200px;" type="Information" no-icon no-close-button>You have new message.</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom samples-vertical-align" style="width: 200px;" type="Positive" no-close-button>Successfull login!</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom samples-vertical-align" style="width: 200px;" type="Negative" hide-icon>Access denied!</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom samples-vertical-align" style="width: 200px;" type="Negative" no-icon>Access denied!</ui5-messagestrip>
<ui5-messagestrip class="samples-margin-bottom samples-vertical-align" style="width: 200px;" type="Warning">Update is required.</ui5-messagestrip>
</div>
<pre class="prettyprint lang-html"><xmp>
<ui5-messagestrip type="Information" style="width: 200px;" hide-icon no-close-button>You have new message.</ui5-messagestrip>
<ui5-messagestrip type="Information" style="width: 200px;" no-icon no-close-button>You have new message.</ui5-messagestrip>
<ui5-messagestrip type="Positive" style="width: 200px;" no-close-button>Successfull login!</ui5-messagestrip>
<ui5-messagestrip type="Negative" style="width: 200px;" hide-icon>Access denied!</ui5-messagestrip>
<ui5-messagestrip type="Negative" style="width: 200px;" no-icon>Access denied!</ui5-messagestrip>
<ui5-messagestrip type="Warning" style="width: 200px;">Update is required.</ui5-messagestrip>
<script>
document.querySelectorAll("ui5-messagestrip").forEach(function(messageStrip) {
Expand Down