RocketChat#734 Изменения ответов | Переработано меню popover в сообще…

…ниях
sibdigital · Oct 8, 2020 · 5f24259 · 5f24259
1 parent 0454a58
commit 5f24259
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 18 deletions.
diff --git a/app/errand/client/createErrandMessageAction.js b/app/errand/client/createErrandMessageAction.js
@@ -45,7 +45,7 @@ Meteor.startup(function() {
 
 				return uid !== u._id ? hasPermission('start-errand-other-user') : hasPermission('start-errand');
 			},
-			order: 1,
+			order: 2,
 			group: 'menu',
 		});
 	});

diff --git a/app/reactions/client/init.js b/app/reactions/client/init.js
@@ -82,7 +82,7 @@ Meteor.startup(function() {
 
 			return true;
 		},
-		order: -2,
+		order: 3,
 		group: ['message', 'menu'],
 	});
 });
diff --git a/app/tags/client/init.js b/app/tags/client/init.js
@@ -82,7 +82,7 @@ Meteor.startup(function() {
 
 				return true;
 			},
-			order: -3,
+			order: 2,
 			group: ['message', 'menu'],
 		});
 	});

diff --git a/app/ui-utils/client/lib/MessageAction.js b/app/ui-utils/client/lib/MessageAction.js
@@ -212,7 +212,7 @@ Meteor.startup(async function() {
 
 			return true;
 		},
-		order: 3,
+		order: 1,
 		group: 'menu',
 	});
 

diff --git a/app/ui-utils/client/lib/popover.html b/app/ui-utils/client/lib/popover.html
@@ -13,21 +13,23 @@ <h3 class="rc-popover__title">{{group.title}}</h3>
 							<ul class="rc-popover__list">
 								{{#each item in group.items}}
 									{{# with item}}
-									<li class="rc-popover__item {{#if item.modifier}}rc-popover__item--{{item.modifier}}{{/if}}{{#if hasAction}} js-action{{/if}}" data-type={{item.type}} data-id={{item.id.toLowerCase}} data-href={{item.href}} data-sidenav={{item.sideNav}}>
-										{{#if item.icon}}
-											<span class="rc-popover__icon">
-												{{> icon block="rc-popover__icon-element" icon=item.icon }}
-											</span>
+										{{#if check_item_name item}}
+											<li class="rc-popover__item {{#if item.modifier}}rc-popover__item--{{item.modifier}}{{/if}}{{#if hasAction}} js-action{{/if}}" data-type={{item.type}} data-id={{item.id.toLowerCase}} data-href={{item.href}} data-sidenav={{item.sideNav}}>
+												{{#if item.icon}}
+													<span class="rc-popover__icon">
+														{{> icon block="rc-popover__icon-element" icon=item.icon }}
+													</span>
+												{{/if}}
+												{{#if item.name}}
+													<span class="rc-popover__item-text">{{item.name}}</span>
+												{{/if}}
+												{{#if item.select}}
+													<span class="rc-popover__input">
+														{{> selectDropdown title=item.selectTitle name=item.selectName options=item.selectOptions}}
+													</span>
+												{{/if}}
+											</li>
 										{{/if}}
-										{{#if item.name}}
-											<span class="rc-popover__item-text">{{item.name}}</span>
-										{{/if}}
-										{{#if item.select}}
-											<span class="rc-popover__input">
-												{{> selectDropdown title=item.selectTitle name=item.selectName options=item.selectOptions}}
-											</span>
-										{{/if}}
-									</li>
 									{{/with}}
 								{{/each}}
 							</ul>

diff --git a/app/ui-utils/client/lib/popover.js b/app/ui-utils/client/lib/popover.js
@@ -228,4 +228,23 @@ Template.popover.events({
 
 Template.popover.helpers({
 	isSafariIos: /iP(ad|hone|od).+Version\/[\d\.]+.*Safari/i.test(navigator.userAgent),
+	check_item_name(item) {
+		if (!item.id) {
+			return false;
+		}
+
+		if (item.id === 'reply-in-thread') {
+			return false;
+		}
+		if (item.id === 'start-discussion') {
+			return false;
+		}
+		if (item.id === 'follow-message') {
+			return false;
+		}
+		if (item.id === 'jump-to-pin-message') {
+			return false;
+		}
+		return true;
+	},
 });