Skip to content

Use the rich message when available and instead of trim overlay with a shadow #190

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

Merged
nickvergessen merged 1 commit into from
Oct 24, 2018
Merged

Use the rich message when available and instead of trim overlay with a shadow #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions css/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,16 @@
.notification-full-message {
line-height: 20px;
opacity: .57;

& > .collapsed {
overflow: hidden;
max-height: 70px
}

& > .notification-overflow {
box-shadow: 0 0 20px 20px var(--color-main-background);
position: relative;
}
}

img.notification-icon {
Expand Down
6 changes: 3 additions & 3 deletions js/notifications.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/notifications.js.map
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 24 additions & 16 deletions src/components/notification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
<span v-if="icon" class="image"><img :src="icon" class="notification-icon"></span>
<span class="text" v-html="renderedSubject"></span>
</div>
<div class="notification-message" v-if="message" v-html="renderedMessage" @click="onClickFullMessage"></div>
<div class="notification-full-message hidden" v-html="message"></div>
<div class="notification-message" v-if="message" @click="onClickMessage">
<div class="message-container" :class="{ collapsed: isCollapsedMessage }" v-html="renderedMessage"></div>
<div v-if="isCollapsedMessage" class="notification-overflow"></div>
</div>
<div class="notification-actions" v-if="actions.length">
<action v-for="(a, index) in actions" v-bind="a" :key="index"></action>
</div>
Expand Down Expand Up @@ -45,9 +47,15 @@
'subjectRichParameters',
'object_type',
'object_id',
'actions'
'actions',
],

data: function() {
return {
showFullMessage: false,
}
},

_$el: null,

computed: {
Expand All @@ -73,26 +81,26 @@

return this.subject;
},
isCollapsedMessage: function() {
return this.message.length > 200 && !this.showFullMessage;
},
renderedMessage: function() {
var message = this.message;
if (message.length > 200) {
var spacePosition = message.indexOf(' ', 180);
if (spacePosition !== -1 && spacePosition <= 200) {
message = message.substring(0, spacePosition);
} else {
message = message.substring(0, 200);
}
message += '…';
if (this.messageRich.length !== 0) {
return parser.parseMessage(
this.messageRich,
this.messageRichParameters
);
}

return message.replace(new RegExp("\n", 'g'), ' ');
return this.message.replace(new RegExp("\n", 'g'), ' ');
}
},

methods: {
onClickFullMessage: function() {
this._$el.find('.notification-message').addClass('hidden');
this._$el.find('.notification-full-message').removeClass('hidden');
onClickMessage: function(e) {
if (e.target.classList.contains('message-container')) {
this.showFullMessage = !this.showFullMessage;
}
},

onDismissNotification: function() {
Expand Down
2 changes: 1 addition & 1 deletion src/richObjectStringParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ define(function () {
*/
parseMessage: function(subject, parameters) {
var self = this,
regex = /\{([a-z0-9]+)\}/gi,
regex = /\{([a-z\-_0-9]+)\}/gi,
matches = subject.match(regex);

_.each(matches, function(parameter) {
Expand Down