mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 12:53:43 +01:00 
			
		
		
		
	Rewrite and restyle reaction selector and enable no-sizzle eslint rule (#30453)
Enable `no-sizzle` lint rule, there was only one use in `initCompReactionSelector` and: - Remove all jQuery except the necessary fomantic dropdown init - Remove the recursion, instead bind event listeners to common parent container nodes --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
		
							parent
							
								
									6999a88fd9
								
							
						
					
					
						commit
						4b1063f3db
					
				@ -318,7 +318,7 @@ rules:
 | 
			
		||||
  jquery/no-serialize: [2]
 | 
			
		||||
  jquery/no-show: [2]
 | 
			
		||||
  jquery/no-size: [2]
 | 
			
		||||
  jquery/no-sizzle: [0]
 | 
			
		||||
  jquery/no-sizzle: [2]
 | 
			
		||||
  jquery/no-slide: [0]
 | 
			
		||||
  jquery/no-submit: [0]
 | 
			
		||||
  jquery/no-text: [0]
 | 
			
		||||
@ -470,7 +470,7 @@ rules:
 | 
			
		||||
  no-jquery/no-selector-prop: [2]
 | 
			
		||||
  no-jquery/no-serialize: [2]
 | 
			
		||||
  no-jquery/no-size: [2]
 | 
			
		||||
  no-jquery/no-sizzle: [0]
 | 
			
		||||
  no-jquery/no-sizzle: [2]
 | 
			
		||||
  no-jquery/no-slide: [2]
 | 
			
		||||
  no-jquery/no-sub: [2]
 | 
			
		||||
  no-jquery/no-support: [2]
 | 
			
		||||
 | 
			
		||||
@ -3318,7 +3318,6 @@ func ChangeIssueReaction(ctx *context.Context) {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	html, err := ctx.RenderToHTML(tplReactions, map[string]any{
 | 
			
		||||
		"ctxData":   ctx.Data,
 | 
			
		||||
		"ActionURL": fmt.Sprintf("%s/issues/%d/reactions", ctx.Repo.RepoLink, issue.Index),
 | 
			
		||||
		"Reactions": issue.Reactions.GroupByType(),
 | 
			
		||||
	})
 | 
			
		||||
@ -3425,7 +3424,6 @@ func ChangeCommentReaction(ctx *context.Context) {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	html, err := ctx.RenderToHTML(tplReactions, map[string]any{
 | 
			
		||||
		"ctxData":   ctx.Data,
 | 
			
		||||
		"ActionURL": fmt.Sprintf("%s/comments/%d/reactions", ctx.Repo.RepoLink, comment.ID),
 | 
			
		||||
		"Reactions": comment.Reactions.GroupByType(),
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
@ -101,6 +101,7 @@ func NewTemplateContextForWeb(ctx *Context) TemplateContext {
 | 
			
		||||
	tmplCtx := NewTemplateContext(ctx)
 | 
			
		||||
	tmplCtx["Locale"] = ctx.Base.Locale
 | 
			
		||||
	tmplCtx["AvatarUtils"] = templates.NewAvatarUtils(ctx)
 | 
			
		||||
	tmplCtx["RootData"] = ctx.Data
 | 
			
		||||
	return tmplCtx
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -48,7 +48,7 @@
 | 
			
		||||
						</div>
 | 
			
		||||
					{{end}}
 | 
			
		||||
				{{end}}
 | 
			
		||||
				{{template "repo/issue/view_content/add_reaction" dict "ctxData" $.root "ActionURL" (printf "%s/comments/%d/reactions" $.root.RepoLink .ID)}}
 | 
			
		||||
				{{template "repo/issue/view_content/add_reaction" dict "ActionURL" (printf "%s/comments/%d/reactions" $.root.RepoLink .ID)}}
 | 
			
		||||
				{{template "repo/issue/view_content/context_menu" dict "ctxData" $.root "item" . "delete" true "issue" false "diff" true "IsCommentPoster" (and $.root.IsSigned (eq $.root.SignedUserID .PosterID))}}
 | 
			
		||||
			</div>
 | 
			
		||||
		</div>
 | 
			
		||||
@ -68,7 +68,7 @@
 | 
			
		||||
		</div>
 | 
			
		||||
		{{$reactions := .Reactions.GroupByType}}
 | 
			
		||||
		{{if $reactions}}
 | 
			
		||||
			{{template "repo/issue/view_content/reactions" dict "ctxData" $.root "ActionURL" (printf "%s/comments/%d/reactions" $.root.RepoLink .ID) "Reactions" $reactions}}
 | 
			
		||||
			{{template "repo/issue/view_content/reactions" dict "ActionURL" (printf "%s/comments/%d/reactions" $.root.RepoLink .ID) "Reactions" $reactions}}
 | 
			
		||||
		{{end}}
 | 
			
		||||
	</div>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
@ -46,7 +46,7 @@
 | 
			
		||||
						<div class="comment-header-right actions tw-flex tw-items-center">
 | 
			
		||||
							{{template "repo/issue/view_content/show_role" dict "ShowRole" .Issue.ShowRole "IgnorePoster" true}}
 | 
			
		||||
							{{if not $.Repository.IsArchived}}
 | 
			
		||||
								{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}}
 | 
			
		||||
								{{template "repo/issue/view_content/add_reaction" dict "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}}
 | 
			
		||||
							{{end}}
 | 
			
		||||
							{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" .Issue "delete" false "issue" true "diff" false "IsCommentPoster" $.IsIssuePoster}}
 | 
			
		||||
						</div>
 | 
			
		||||
@ -67,7 +67,7 @@
 | 
			
		||||
					</div>
 | 
			
		||||
					{{$reactions := .Issue.Reactions.GroupByType}}
 | 
			
		||||
					{{if $reactions}}
 | 
			
		||||
						{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index) "Reactions" $reactions}}
 | 
			
		||||
						{{template "repo/issue/view_content/reactions" dict "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index) "Reactions" $reactions}}
 | 
			
		||||
					{{end}}
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
 | 
			
		||||
@ -1,11 +1,9 @@
 | 
			
		||||
{{if .ctxData.IsSigned}}
 | 
			
		||||
{{if ctx.RootData.IsSigned}}
 | 
			
		||||
<div class="item action ui dropdown jump pointing top right select-reaction" data-action-url="{{.ActionURL}}">
 | 
			
		||||
	<a class="add-reaction muted">
 | 
			
		||||
		{{svg "octicon-smiley"}}
 | 
			
		||||
	</a>
 | 
			
		||||
	<div class="menu reactions-menu">
 | 
			
		||||
	<a class="muted">{{svg "octicon-smiley"}}</a>
 | 
			
		||||
	<div class="menu">
 | 
			
		||||
		{{range $value := AllowedReactions}}
 | 
			
		||||
			<a class="item reaction" data-tooltip-content="{{$value}}" aria-label="{{$value}}" data-reaction-content="{{$value}}">{{ReactionToEmoji $value}}</a>
 | 
			
		||||
		<a class="item emoji comment-reaction-button" data-tooltip-content="{{$value}}" aria-label="{{$value}}" data-reaction-content="{{$value}}">{{ReactionToEmoji $value}}</a>
 | 
			
		||||
		{{end}}
 | 
			
		||||
	</div>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
@ -53,7 +53,7 @@
 | 
			
		||||
						<div class="comment-header-right actions tw-flex tw-items-center">
 | 
			
		||||
							{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}}
 | 
			
		||||
							{{if not $.Repository.IsArchived}}
 | 
			
		||||
								{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
 | 
			
		||||
								{{template "repo/issue/view_content/add_reaction" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
 | 
			
		||||
							{{end}}
 | 
			
		||||
							{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
 | 
			
		||||
						</div>
 | 
			
		||||
@ -74,7 +74,7 @@
 | 
			
		||||
					</div>
 | 
			
		||||
					{{$reactions := .Reactions.GroupByType}}
 | 
			
		||||
					{{if $reactions}}
 | 
			
		||||
						{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
 | 
			
		||||
						{{template "repo/issue/view_content/reactions" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
 | 
			
		||||
					{{end}}
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
@ -427,7 +427,7 @@
 | 
			
		||||
							<div class="comment-header-right actions tw-flex tw-items-center">
 | 
			
		||||
								{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}}
 | 
			
		||||
								{{if not $.Repository.IsArchived}}
 | 
			
		||||
									{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
 | 
			
		||||
									{{template "repo/issue/view_content/add_reaction" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
 | 
			
		||||
									{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" false "issue" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
 | 
			
		||||
								{{end}}
 | 
			
		||||
							</div>
 | 
			
		||||
@ -448,7 +448,7 @@
 | 
			
		||||
						</div>
 | 
			
		||||
						{{$reactions := .Reactions.GroupByType}}
 | 
			
		||||
						{{if $reactions}}
 | 
			
		||||
							{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
 | 
			
		||||
							{{template "repo/issue/view_content/reactions" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
 | 
			
		||||
						{{end}}
 | 
			
		||||
					</div>
 | 
			
		||||
				</div>
 | 
			
		||||
 | 
			
		||||
@ -55,8 +55,8 @@
 | 
			
		||||
			<div class="ui comments tw-mb-0">
 | 
			
		||||
				{{range .comments}}
 | 
			
		||||
					{{$createdSubStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
 | 
			
		||||
					<div class="comment code-comment tw-pb-4" id="{{.HashTag}}">
 | 
			
		||||
						<div class="content">
 | 
			
		||||
					<div class="comment code-comment" id="{{.HashTag}}">
 | 
			
		||||
						<div class="content comment-container">
 | 
			
		||||
							<div class="header comment-header">
 | 
			
		||||
								<div class="comment-header-left tw-flex tw-items-center">
 | 
			
		||||
									{{if not .OriginalAuthor}}
 | 
			
		||||
@ -82,7 +82,7 @@
 | 
			
		||||
								<div class="comment-header-right actions tw-flex tw-items-center">
 | 
			
		||||
									{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}}
 | 
			
		||||
									{{if not $.Repository.IsArchived}}
 | 
			
		||||
										{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
 | 
			
		||||
										{{template "repo/issue/view_content/add_reaction" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
 | 
			
		||||
										{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
 | 
			
		||||
									{{end}}
 | 
			
		||||
								</div>
 | 
			
		||||
@ -103,7 +103,7 @@
 | 
			
		||||
							</div>
 | 
			
		||||
							{{$reactions := .Reactions.GroupByType}}
 | 
			
		||||
							{{if $reactions}}
 | 
			
		||||
								{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
 | 
			
		||||
								{{template "repo/issue/view_content/reactions" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
 | 
			
		||||
							{{end}}
 | 
			
		||||
						</div>
 | 
			
		||||
					</div>
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
<div class="ui attached segment reactions" data-action-url="{{$.ActionURL}}">
 | 
			
		||||
<div class="bottom-reactions" data-action-url="{{$.ActionURL}}">
 | 
			
		||||
{{range $key, $value := .Reactions}}
 | 
			
		||||
	{{$hasReacted := $value.HasUser $.ctxData.SignedUserID}}
 | 
			
		||||
	<a role="button" class="ui label basic{{if $hasReacted}} primary{{end}}{{if not $.ctxData.IsSigned}} disabled{{end}} comment-reaction-button"
 | 
			
		||||
	{{$hasReacted := $value.HasUser ctx.RootData.SignedUserID}}
 | 
			
		||||
	<a role="button" class="ui label basic{{if $hasReacted}} primary{{end}}{{if not ctx.RootData.IsSigned}} disabled{{end}} comment-reaction-button"
 | 
			
		||||
		data-tooltip-content
 | 
			
		||||
		title="{{$value.GetFirstUsers}}{{if gt ($value.GetMoreUserCount) 0}} {{ctx.Locale.Tr "repo.reactions_more" $value.GetMoreUserCount}}{{end}}"
 | 
			
		||||
		aria-label="{{$value.GetFirstUsers}}{{if gt ($value.GetMoreUserCount) 0}} {{ctx.Locale.Tr "repo.reactions_more" $value.GetMoreUserCount}}{{end}}"
 | 
			
		||||
@ -12,6 +12,6 @@
 | 
			
		||||
	</a>
 | 
			
		||||
{{end}}
 | 
			
		||||
{{if AllowedReactions}}
 | 
			
		||||
	{{template "repo/issue/view_content/add_reaction" dict "ctxData" $.ctxData "ActionURL" .ActionURL}}
 | 
			
		||||
	{{template "repo/issue/view_content/add_reaction" dict "ActionURL" .ActionURL}}
 | 
			
		||||
{{end}}
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
@ -1366,8 +1366,7 @@ table th[data-sortt-desc] .svg {
 | 
			
		||||
  box-shadow: 0 0 0 1px var(--color-secondary) inset;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.emoji,
 | 
			
		||||
.reaction {
 | 
			
		||||
.emoji {
 | 
			
		||||
  font-size: 1.25em;
 | 
			
		||||
  line-height: var(--line-height-default);
 | 
			
		||||
  font-style: normal !important;
 | 
			
		||||
@ -1375,8 +1374,7 @@ table th[data-sortt-desc] .svg {
 | 
			
		||||
  vertical-align: -0.075em;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.emoji img,
 | 
			
		||||
.reaction img {
 | 
			
		||||
.emoji img {
 | 
			
		||||
  border-width: 0 !important;
 | 
			
		||||
  margin: 0 !important;
 | 
			
		||||
  width: 1em !important;
 | 
			
		||||
 | 
			
		||||
@ -62,6 +62,7 @@
 | 
			
		||||
@import "./repo/linebutton.css";
 | 
			
		||||
@import "./repo/wiki.css";
 | 
			
		||||
@import "./repo/header.css";
 | 
			
		||||
@import "./repo/reactions.css";
 | 
			
		||||
 | 
			
		||||
@import "./editor/fileeditor.css";
 | 
			
		||||
@import "./editor/combomarkdowneditor.css";
 | 
			
		||||
 | 
			
		||||
@ -16,7 +16,7 @@
 | 
			
		||||
.ui.comments .comment {
 | 
			
		||||
  position: relative;
 | 
			
		||||
  background: none;
 | 
			
		||||
  margin: 0.5em 0 0;
 | 
			
		||||
  margin: 3px 0 0;
 | 
			
		||||
  padding: 0.5em 0 0;
 | 
			
		||||
  border: none;
 | 
			
		||||
  border-top: none;
 | 
			
		||||
 | 
			
		||||
@ -913,6 +913,9 @@ td .commit-summary {
 | 
			
		||||
 | 
			
		||||
.repository.view.issue .comment-list .ui.comments {
 | 
			
		||||
  max-width: 100%;
 | 
			
		||||
  display: flex;
 | 
			
		||||
  flex-direction: column;
 | 
			
		||||
  gap: 3px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository.view.issue .comment-list .comment > .content > div:first-child {
 | 
			
		||||
@ -928,6 +931,11 @@ td .commit-summary {
 | 
			
		||||
.repository.view.issue .comment-list .comment .comment-container {
 | 
			
		||||
  border: 1px solid var(--color-secondary);
 | 
			
		||||
  border-radius: var(--border-radius);
 | 
			
		||||
  background: var(--color-box-body);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository.view.issue .comment-list .conversation-holder .comment .comment-container {
 | 
			
		||||
  border: none;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (max-width: 767.98px) {
 | 
			
		||||
@ -1042,30 +1050,6 @@ td .commit-summary {
 | 
			
		||||
  margin-left: 42px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository.view.issue .comment-list .comment-code-cloud .segment.reactions {
 | 
			
		||||
  margin-top: 16px !important;
 | 
			
		||||
  margin-bottom: -8px !important;
 | 
			
		||||
  border-top: none !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository.view.issue .comment-list .comment-code-cloud .segment.reactions .ui.label {
 | 
			
		||||
  border: 1px solid;
 | 
			
		||||
  padding: 5px 8px !important;
 | 
			
		||||
  margin: 0 2px;
 | 
			
		||||
  border-radius: var(--border-radius);
 | 
			
		||||
  border-color: var(--color-secondary-dark-1) !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository.view.issue .comment-list .comment-code-cloud .segment.reactions .ui.label.basic.primary {
 | 
			
		||||
  background-color: var(--color-reaction-active-bg) !important;
 | 
			
		||||
  border-color: var(--color-primary-alpha-80) !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository.view.issue .comment-list .comment-code-cloud .segment.reactions .ui.label.basic.primary:hover {
 | 
			
		||||
  background-color: var(--color-reaction-hover-bg) !important;
 | 
			
		||||
  border-color: var(--color-primary-alpha-80) !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository.view.issue .comment-list .comment-code-cloud button.comment-form-reply {
 | 
			
		||||
  margin: 0;
 | 
			
		||||
}
 | 
			
		||||
@ -1902,98 +1886,6 @@ td .commit-summary {
 | 
			
		||||
  border-bottom: 1px solid var(--color-warning-border);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions.dropdown .menu,
 | 
			
		||||
.repository .select-reaction.dropdown .menu {
 | 
			
		||||
  right: 0 !important;
 | 
			
		||||
  left: auto !important;
 | 
			
		||||
  min-width: 170px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions.dropdown .menu > .header,
 | 
			
		||||
.repository .select-reaction.dropdown .menu > .header {
 | 
			
		||||
  margin: 0.75rem 0 0.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions.dropdown .menu > .item,
 | 
			
		||||
.repository .select-reaction.dropdown .menu > .item {
 | 
			
		||||
  float: left;
 | 
			
		||||
  margin: 4px;
 | 
			
		||||
  font-size: 20px;
 | 
			
		||||
  width: 34px;
 | 
			
		||||
  height: 34px;
 | 
			
		||||
  min-height: 0 !important;
 | 
			
		||||
  border-radius: var(--border-radius);
 | 
			
		||||
  display: flex !important;
 | 
			
		||||
  align-items: center;
 | 
			
		||||
  justify-content: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions {
 | 
			
		||||
  padding: 0;
 | 
			
		||||
  display: flex;
 | 
			
		||||
  border: none !important;
 | 
			
		||||
  border-top: 1px solid var(--color-secondary) !important;
 | 
			
		||||
  width: 100% !important;
 | 
			
		||||
  max-width: 100% !important;
 | 
			
		||||
  margin: 0 !important;
 | 
			
		||||
  border-radius: 0 0 var(--border-radius) var(--border-radius);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions .ui.label {
 | 
			
		||||
  max-height: 40px;
 | 
			
		||||
  padding: 8px 16px !important;
 | 
			
		||||
  display: flex !important;
 | 
			
		||||
  align-items: center;
 | 
			
		||||
  border: 0;
 | 
			
		||||
  border-right: 1px solid;
 | 
			
		||||
  border-radius: 0;
 | 
			
		||||
  margin: 0;
 | 
			
		||||
  font-size: 12px;
 | 
			
		||||
  font-weight: var(--font-weight-normal);
 | 
			
		||||
  border-color: var(--color-secondary) !important;
 | 
			
		||||
  background: var(--color-reaction-bg);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions .ui.label:first-of-type {
 | 
			
		||||
  border-bottom-left-radius: 3px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions .ui.label.disabled {
 | 
			
		||||
  cursor: default;
 | 
			
		||||
  opacity: 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions .ui.label.basic.primary {
 | 
			
		||||
  color: var(--color-primary) !important;
 | 
			
		||||
  background-color: var(--color-reaction-active-bg) !important;
 | 
			
		||||
  border-color: var(--color-secondary-dark-1) !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions .ui.label.basic:hover {
 | 
			
		||||
  background-color: var(--color-reaction-hover-bg) !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions .reaction-count {
 | 
			
		||||
  margin-left: 0.5rem;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions .select-reaction {
 | 
			
		||||
  display: flex;
 | 
			
		||||
  align-items: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions .select-reaction a {
 | 
			
		||||
  padding: 0 14px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions .select-reaction:not(.active) a {
 | 
			
		||||
  display: none;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .segment.reactions:hover .select-reaction a {
 | 
			
		||||
  display: block;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.repository .ui.fluid.action.input .ui.search.action.input {
 | 
			
		||||
  flex: auto;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										70
									
								
								web_src/css/repo/reactions.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										70
									
								
								web_src/css/repo/reactions.css
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,70 @@
 | 
			
		||||
.bottom-reactions {
 | 
			
		||||
  display: flex;
 | 
			
		||||
  gap: 6px;
 | 
			
		||||
  margin: 0 1em 1em;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.timeline-item .conversation-holder .bottom-reactions {
 | 
			
		||||
  margin: 1em 0 0 36px;
 | 
			
		||||
  padding-bottom: 8px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions .ui.label {
 | 
			
		||||
  padding: 5px 8px;
 | 
			
		||||
  font-weight: var(--font-weight-normal);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions .ui.label.primary {
 | 
			
		||||
  background-color: var(--color-reaction-active-bg) !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions .ui.label:hover {
 | 
			
		||||
  background-color: var(--color-reaction-hover-bg) !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions .ui.label.disabled {
 | 
			
		||||
  cursor: default;
 | 
			
		||||
  opacity: 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions .ui.label .reaction {
 | 
			
		||||
  font-size: 16px;
 | 
			
		||||
  display: flex;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions .ui.label .reaction img {
 | 
			
		||||
  height: 16px;
 | 
			
		||||
  aspect-ratio: 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions .reaction-count {
 | 
			
		||||
  margin-left: 4px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.ui.dropdown.select-reaction .menu {
 | 
			
		||||
  min-width: 170px; /* item-outer-width * 4 */
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.ui.dropdown.select-reaction .menu > .item {
 | 
			
		||||
  float: left;
 | 
			
		||||
  margin: 4px;
 | 
			
		||||
  font-size: 20px;
 | 
			
		||||
  width: 34px;
 | 
			
		||||
  height: 34px;
 | 
			
		||||
  border-radius: var(--border-radius);
 | 
			
		||||
  display: flex;
 | 
			
		||||
  align-items: center;
 | 
			
		||||
  justify-content: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions .select-reaction {
 | 
			
		||||
  padding: 0 10px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions .select-reaction:not(.active) {
 | 
			
		||||
  visibility: hidden;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.bottom-reactions:hover .select-reaction {
 | 
			
		||||
  visibility: visible;
 | 
			
		||||
}
 | 
			
		||||
@ -1,38 +1,36 @@
 | 
			
		||||
import $ from 'jquery';
 | 
			
		||||
import {POST} from '../../modules/fetch.js';
 | 
			
		||||
 | 
			
		||||
export function initCompReactionSelector($parent) {
 | 
			
		||||
  $parent.find(`.select-reaction .item.reaction, .comment-reaction-button`).on('click', async function (e) {
 | 
			
		||||
    e.preventDefault();
 | 
			
		||||
export function initCompReactionSelector() {
 | 
			
		||||
  for (const container of document.querySelectorAll('.issue-content, .diff-file-body')) {
 | 
			
		||||
    container.addEventListener('click', async (e) => {
 | 
			
		||||
      // there are 2 places for the "reaction" buttons, one is the top-right reaction menu, one is the bottom of the comment
 | 
			
		||||
      const target = e.target.closest('.comment-reaction-button');
 | 
			
		||||
      if (!target) return;
 | 
			
		||||
      e.preventDefault();
 | 
			
		||||
 | 
			
		||||
    if (this.classList.contains('disabled')) return;
 | 
			
		||||
      if (target.classList.contains('disabled')) return;
 | 
			
		||||
 | 
			
		||||
    const actionUrl = this.closest('[data-action-url]')?.getAttribute('data-action-url');
 | 
			
		||||
    const reactionContent = this.getAttribute('data-reaction-content');
 | 
			
		||||
    const hasReacted = this.closest('.ui.segment.reactions')?.querySelector(`a[data-reaction-content="${reactionContent}"]`)?.getAttribute('data-has-reacted') === 'true';
 | 
			
		||||
      const actionUrl = target.closest('[data-action-url]').getAttribute('data-action-url');
 | 
			
		||||
      const reactionContent = target.getAttribute('data-reaction-content');
 | 
			
		||||
 | 
			
		||||
    const res = await POST(`${actionUrl}/${hasReacted ? 'unreact' : 'react'}`, {
 | 
			
		||||
      data: new URLSearchParams({content: reactionContent}),
 | 
			
		||||
      const commentContainer = target.closest('.comment-container');
 | 
			
		||||
 | 
			
		||||
      const bottomReactions = commentContainer.querySelector('.bottom-reactions'); // may not exist if there is no reaction
 | 
			
		||||
      const bottomReactionBtn = bottomReactions?.querySelector(`a[data-reaction-content="${CSS.escape(reactionContent)}"]`);
 | 
			
		||||
      const hasReacted = bottomReactionBtn?.getAttribute('data-has-reacted') === 'true';
 | 
			
		||||
 | 
			
		||||
      const res = await POST(`${actionUrl}/${hasReacted ? 'unreact' : 'react'}`, {
 | 
			
		||||
        data: new URLSearchParams({content: reactionContent}),
 | 
			
		||||
      });
 | 
			
		||||
 | 
			
		||||
      const data = await res.json();
 | 
			
		||||
      bottomReactions?.remove();
 | 
			
		||||
      if (data.html) {
 | 
			
		||||
        commentContainer.insertAdjacentHTML('beforeend', data.html);
 | 
			
		||||
        const bottomReactionsDropdowns = commentContainer.querySelectorAll('.bottom-reactions .dropdown.select-reaction');
 | 
			
		||||
        $(bottomReactionsDropdowns).dropdown(); // re-init the dropdown
 | 
			
		||||
      }
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    const data = await res.json();
 | 
			
		||||
    if (data && (data.html || data.empty)) {
 | 
			
		||||
      const $content = $(this).closest('.content');
 | 
			
		||||
      let $react = $content.find('.segment.reactions');
 | 
			
		||||
      if ((!data.empty || data.html === '') && $react.length > 0) {
 | 
			
		||||
        $react.remove();
 | 
			
		||||
      }
 | 
			
		||||
      if (!data.empty) {
 | 
			
		||||
        const $attachments = $content.find('.segment.bottom:first');
 | 
			
		||||
        $react = $(data.html);
 | 
			
		||||
        if ($attachments.length > 0) {
 | 
			
		||||
          $react.insertBefore($attachments);
 | 
			
		||||
        } else {
 | 
			
		||||
          $react.appendTo($content);
 | 
			
		||||
        }
 | 
			
		||||
        $react.find('.dropdown').dropdown();
 | 
			
		||||
        initCompReactionSelector($react);
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  });
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -87,7 +87,6 @@ function initRepoDiffConversationForm() {
 | 
			
		||||
        el.classList.add('tw-invisible');
 | 
			
		||||
      }
 | 
			
		||||
      $newConversationHolder.find('.dropdown').dropdown();
 | 
			
		||||
      initCompReactionSelector($newConversationHolder);
 | 
			
		||||
    } catch (error) {
 | 
			
		||||
      console.error('Error:', error);
 | 
			
		||||
      showErrorToast(i18n.network_error);
 | 
			
		||||
 | 
			
		||||
@ -393,7 +393,7 @@ export function initRepository() {
 | 
			
		||||
    initRepoIssueDependencyDelete();
 | 
			
		||||
    initRepoIssueCodeCommentCancel();
 | 
			
		||||
    initRepoPullRequestUpdate();
 | 
			
		||||
    initCompReactionSelector($(document));
 | 
			
		||||
    initCompReactionSelector();
 | 
			
		||||
 | 
			
		||||
    initRepoPullRequestMergeForm();
 | 
			
		||||
    initRepoPullRequestCommitStatus();
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user