Skip to content

[FIX] "Highlight Words" wasn't working with more than one word #10083

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
rodrigok merged 3 commits into from
Apr 17, 2018
Merged

[FIX] "Highlight Words" wasn't working with more than one word #10083

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
70d5320
Rocketchat-Highlight-Words: Fix Typo in comment
nemani Mar 9, 2018
acb5952
Rocketchat-UI-Account: Fix split by comma.
nemani Mar 9, 2018
5ad64a4
Merge branch 'develop' into fix-highlight-multi-words
gdelavald Apr 12, 2018
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/rocketchat-highlight-words/client/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Hilights is a named function that will process Highlights
* Highlights is a named function that will process Highlights
* @param {Object} message - The message object
*/
import _ from 'underscore';
Expand Down
4 changes: 2 additions & 2 deletions packages/rocketchat-ui-account/client/accountPreferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Template.accountPreferences.helpers({
},
highlights() {
const userHighlights = RocketChat.getUserPreference(Meteor.user(), 'highlights');
return userHighlights ? userHighlights.join('\n') : undefined;
return userHighlights ? userHighlights.join(',\n') : undefined;
},
desktopNotificationEnabled() {
return KonchatNotification.notificationStatus.get() === 'granted' || (window.Notification && Notification.permission === 'granted');
Expand Down Expand Up @@ -145,7 +145,7 @@ Template.accountPreferences.onCreated(function() {
data.unreadAlert = JSON.parse($('#unreadAlert').find('input:checked').val());
data.notificationsSoundVolume = parseInt($('#notificationsSoundVolume').val());
data.roomCounterSidebar = JSON.parse($('#roomCounterSidebar').find('input:checked').val());
data.highlights = _.compact(_.map($('[name=highlights]').val().split('\n'), function(e) {
data.highlights = _.compact(_.map($('[name=highlights]').val().split(/,|\n/), function(e) {
return s.trim(e);
}));

Expand Down