apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Regression: Various search provider fixes (#10591)

Browse Source 
* should fix the issue that suggestions are still displayed even if search is already triggered

* add link to chatpal.io to the admin ui

* remove unsed icon and change icon size in order to fix firefox display issue

* should fix the issue with the event trigger for search providers

* Update deleteMessage.js

* Always call afterDeleteMessage calback
pull/10611/head^2
Thomas Kurz 7 years ago committed by Diego Sampaio
parent 72a855a78d
commit b5a8e2b040
9 changed files with 12 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      packages/chatpal-search/client/template/admin.html
  2. 1
      packages/chatpal-search/package.js
  3. 2
      packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg
  4. 15
      packages/chatpal-search/server/asset/chatpal-logo-icon-lightblue.svg
  5. 1
      packages/chatpal-search/server/asset/config.js
  6. 3
      packages/rocketchat-i18n/i18n/de.i18n.json
  7. 1
      packages/rocketchat-i18n/i18n/en.i18n.json
  8. 8
      packages/rocketchat-lib/server/functions/deleteMessage.js
  9. 4
      packages/rocketchat-search/client/search/search.js

1
packages/chatpal-search/client/template/admin.html
Unescape View File

@ -11,6 +11,7 @@
{{#unless isAdmin}}
<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
{{else}}
<p>{{{_ "Chatpal_Get_more_information_about_chatpal_on_our_website"}}}</p>
<form>
<div class="rocket-form">
<fieldset>

1
packages/chatpal-search/package.js
Unescape View File

@ -17,7 +17,6 @@ Package.onUse(function(api) {
]);
api.addFiles('server/asset/chatpal-enter.svg', 'server', {isAsset:true});
api.addFiles('server/asset/chatpal-logo-icon-lightblue.svg', 'server', {isAsset:true});
api.addFiles('server/asset/chatpal-logo-icon-darkblue.svg', 'server', {isAsset:true});
api.addFiles([

2
packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg
Unescape View File

@ -1,5 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none">
<symbol id="icon-chatpal-logo-icon-darkblue" width="48px" height="57px" viewBox="0 0 48 57">
<symbol id="icon-chatpal-logo-icon-darkblue" viewBox="0 0 48 57" width="27px" height="24px">
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Outline-black-Copy-7" transform="translate(0.000000, -28.000000)">
<g id="Group-8">

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

15
packages/chatpal-search/server/asset/chatpal-logo-icon-lightblue.svg
Unescape View File

@ -1,15 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none">
<symbol id="icon-chatpal-logo-icon-lightblue" width="48px" height="57px" viewBox="0 0 48 57">
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Outline-black-Copy-7" transform="translate(0.000000, -28.000000)">
<g id="Group-8">
<path d="M17.0782237,77.3942887 L3.08428051,84.8880697 L6.68509058,73.5334833 L0.0980054069,71.0865356 C2.25127483,42.8616902 3.32790954,28.7492676 3.32790954,28.7492676 C3.32790954,28.7492676 10.1654988,28.7492676 23.8406774,28.7492676 L44.7147288,28.7492676 L47.5833494,71.0865356 L23.4177323,79.7492676 L17.0782237,77.3942887 Z" id="Combined-Shape" fill="#62A1C6"></path>
<g id="Group-10" transform="translate(10.000000, 0.000000)" fill="#FFFFFF">
<path d="M17.368,42.128 C17.812,42.128 17.997,42.461 17.997,42.72 C17.997,43.09 17.146,44.126 17.146,49.935 C17.146,50.379 17.146,50.823 17.183,51.23 C17.849,49.343 18.589,47.641 19.403,46.346 C20.439,44.681 21.364,44.089 22.511,44.089 C25.323,44.089 27.432,47.234 27.432,53.117 C27.432,58.075 24.694,60.258 22.215,60.258 C20.365,60.258 19.292,59.148 18.848,58.63 C18.7,58.445 18.626,58.297 18.626,58.149 C18.626,57.927 18.848,57.594 19.144,57.594 C19.292,57.594 19.44,57.631 19.662,57.853 C20.143,58.334 20.883,58.741 21.697,58.741 C23.029,58.741 23.769,57.15 23.769,53.043 C23.769,48.714 23.214,46.494 22.03,46.494 C20.624,46.494 18.922,50.601 17.59,55.189 C18.145,58.741 18.996,61.997 18.996,65.327 C18.996,68.546 17.22,70.248 15.703,70.248 C14.26,70.248 13.557,68.842 13.557,67.362 C13.557,65.993 14.149,62.219 15.148,58.112 C14.889,55.707 14.63,53.228 14.63,50.268 C14.63,44.348 16.554,42.128 17.368,42.128 Z M15.962,67.621 C15.962,65.882 15.851,64.254 15.703,62.7 C15.259,64.846 15,66.548 15,67.288 C15,68.546 15.259,68.805 15.555,68.805 C15.851,68.805 15.962,68.509 15.962,67.621 Z" id="p"></path>
<path d="M7.748,61.196 C3.224,61.196 -0.78,57.868 -0.78,51.68 C-0.78,43.1 4.68,38.212 8.32,38.212 C10.764,38.212 12.636,40.188 12.636,42.84 C12.636,45.648 11.752,47.26 10.868,47.26 C9.88,47.26 8.476,46.272 8.476,45.596 C8.476,44.4 9.88,43.88 9.88,41.436 C9.88,41.176 9.568,40.344 8.684,40.344 C6.448,40.344 4.368,44.66 4.368,50.848 C4.368,56.1 6.396,58.388 8.996,58.388 C13.676,58.388 15.86,51.68 15.86,51.68 C15.86,51.68 16.068,51.108 16.536,51.108 C16.9,51.108 17.16,51.316 17.16,51.68 C17.16,51.94 17.004,52.408 17.004,52.408 C17.004,52.408 14.248,61.196 7.748,61.196 Z" id="c"></path>
</g>
</g>
</g>
</g>
</symbol>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

1
packages/chatpal-search/server/asset/config.js
Unescape View File

@ -1,5 +1,4 @@
/* globals Inject */
Inject.rawBody('chatpal-enter', Assets.getText('server/asset/chatpal-enter.svg'));
Inject.rawBody('chatpal-logo-icon-lightblue', Assets.getText('server/asset/chatpal-logo-icon-lightblue.svg'));
Inject.rawBody('chatpal-logo-icon-darkblue', Assets.getText('server/asset/chatpal-logo-icon-darkblue.svg'));

3
packages/rocketchat-i18n/i18n/de.i18n.json
Unescape View File

@ -429,6 +429,7 @@
"Chatpal_ERROR_username_already_exists": "Benutzername existiert bereits",
"Chatpal_created_key_successfully": "API-Key erfolgreich erstellt",
"Chatpal_run_search": "Suche",
"Chatpal_Get_more_information_about_chatpal_on_our_website": "Finden Sie mehr über Chatpal heraus, unter <a target=\"_blank\" href=\"http://chatpal.io\">http://chatpal.io</a>!",
"CDN_PREFIX": "CDN-Präfix",
"Certificates_and_Keys": "Zertifikate und Schlüssel",
"Change_Room_Type": "Ändere den Typ des Raums",
@ -2343,4 +2344,4 @@
"your_message_optional": "Ihre optionale Nachricht",
"Your_password_is_wrong": "Falsches Passwort",
"Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet."
}
}

1
packages/rocketchat-i18n/i18n/en.i18n.json
Unescape View File

@ -432,6 +432,7 @@
"Chatpal_ERROR_username_already_exists": "Username already exists",
"Chatpal_created_key_successfully": "API-Key created successfully",
"Chatpal_run_search": "Search",
"Chatpal_Get_more_information_about_chatpal_on_our_website": "Get more information about Chatpal on <a target=\"_blank\" href=\"http://chatpal.io\">http://chatpal.io</a>!",
"CDN_PREFIX": "CDN Prefix",
"Certificates_and_Keys": "Certificates and Keys",
"Change_Room_Type": "Changing the Room Type",

8
packages/rocketchat-lib/server/functions/deleteMessage.js
Unescape View File

@ -23,12 +23,12 @@ RocketChat.deleteMessage = function(message, user) {
if (message.file && message.file._id) {
FileUpload.getStore('Uploads').deleteById(message.file._id);
}
Meteor.defer(function() {
RocketChat.callbacks.run('afterDeleteMessage', deletedMsg);
});
}
Meteor.defer(function() {
RocketChat.callbacks.run('afterDeleteMessage', deletedMsg || { _id: message._id });
});
// update last message
if (RocketChat.settings.get('Store_Last_Message')) {
const room = RocketChat.models.Rooms.findOneById(message.rid, { fields: { lastMessage: 1 } });

4
packages/rocketchat-search/client/search/search.js
Unescape View File

@ -67,7 +67,9 @@ Template.RocketSearch.onCreated(function() {
//TODO what should happen
} else {
this.suggestionActive.set(undefined);
this.suggestions.set(result);
if (value !== this.scope.text.get()) {
this.suggestions.set(result);
}
}
});
};

Write Preview
Loading…
Cancel
Save