Skip to content

Commit 0b219ce

Browse files
zeripathzeripath
committed
Merge branch 'master' into issue-4173-alternative-fix
2 parents f3f23bf + 11e3166 commit 0b219ce

30 files changed

+52
-69
lines changed

‎models/webhook_dingtalk.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,13 @@ func getDingtalkPullRequestPayload(p *api.PullRequestPayload) (*DingtalkPayload,
230230
title = fmt.Sprintf("[%s] Pull request edited: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
231231
text = p.PullRequest.Body
232232
case api.HookIssueAssigned:
233-
list, err := MakeAssigneeList(&Issue{ID: p.PullRequest.ID})
234-
if err != nil {
235-
return &DingtalkPayload{}, err
233+
list := make([]string, len(p.PullRequest.Assignees))
234+
for i, user := range p.PullRequest.Assignees {
235+
list[i] = user.UserName
236236
}
237237
title = fmt.Sprintf("[%s] Pull request assigned to %s: #%d %s", p.Repository.FullName,
238-
list, p.Index, p.PullRequest.Title)
238+
strings.Join(list, ", "),
239+
p.Index, p.PullRequest.Title)
239240
text = p.PullRequest.Body
240241
case api.HookIssueUnassigned:
241242
title = fmt.Sprintf("[%s] Pull request unassigned: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)

‎models/webhook_discord.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,12 +347,13 @@ func getDiscordPullRequestPayload(p *api.PullRequestPayload, meta *DiscordMeta)
347347
text = p.PullRequest.Body
348348
color = warnColor
349349
case api.HookIssueAssigned:
350-
list, err := MakeAssigneeList(&Issue{ID: p.PullRequest.ID})
351-
if err != nil {
352-
return &DiscordPayload{}, err
350+
list := make([]string, len(p.PullRequest.Assignees))
351+
for i, user := range p.PullRequest.Assignees {
352+
list[i] = user.UserName
353353
}
354-
title = fmt.Sprintf("[%s] Pull request assigned to %s: #%d %s", p.Repository.FullName,
355-
list, p.Index, p.PullRequest.Title)
354+
title = fmt.Sprintf("[%s] Pull request assigned to %s: #%d by %s", p.Repository.FullName,
355+
strings.Join(list, ", "),
356+
p.Index, p.PullRequest.Title)
356357
text = p.PullRequest.Body
357358
color = successColor
358359
case api.HookIssueUnassigned:

‎models/webhook_slack.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,12 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S
301301
text = fmt.Sprintf("[%s] Pull request edited: %s by %s", p.Repository.FullName, titleLink, senderLink)
302302
attachmentText = SlackTextFormatter(p.PullRequest.Body)
303303
case api.HookIssueAssigned:
304-
list, err := MakeAssigneeList(&Issue{ID: p.PullRequest.ID})
305-
if err != nil {
306-
return &SlackPayload{}, err
304+
list := make([]string, len(p.PullRequest.Assignees))
305+
for i, user := range p.PullRequest.Assignees {
306+
list[i] = SlackLinkFormatter(setting.AppURL+user.UserName, user.UserName)
307307
}
308308
text = fmt.Sprintf("[%s] Pull request assigned to %s: %s by %s", p.Repository.FullName,
309-
SlackLinkFormatter(setting.AppURL+list, list),
309+
strings.Join(list, ", "),
310310
titleLink, senderLink)
311311
case api.HookIssueUnassigned:
312312
text = fmt.Sprintf("[%s] Pull request unassigned: %s by %s", p.Repository.FullName, titleLink, senderLink)

‎modules/context/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
4242
// prevent infinite redirection
4343
// also make sure that the form cannot be accessed by
4444
// users who don't need this
45-
if ctx.Req.URL.Path == setting.AppSubURL+"/user/settings/change_password" {
45+
if ctx.Req.URL.Path == "/user/settings/change_password" {
4646
if !ctx.User.MustChangePassword {
4747
ctx.Redirect(setting.AppSubURL + "/")
4848
}

‎options/locale/locale_cs-CZ.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,6 @@ issues.label_templates.info=Neexistují žádné štítky. Vytvořte štítek po
688688
issues.label_templates.helper=Vyberte sadu značek
689689
issues.label_templates.use=Použít sadu štítků
690690
issues.label_templates.fail_to_load_file=Nepodařilo se nahrát soubor šablony značek „%s“: %v
691-
issues.add_label_at=přidal(a) štítek <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
692-
issues.remove_label_at=odstranil(a) štítek <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
693691
issues.add_milestone_at=`přidal(a) toto do milníku <b>%s</b> %s`
694692
issues.change_milestone_at=`upravil(a) milník z <b>%s</b> na <b>%s</b> %s`
695693
issues.remove_milestone_at=`odstranil(a) toto z milníku <b>%s</b> %s`

‎options/locale/locale_de-DE.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,8 +689,6 @@ issues.label_templates.info=Es existieren noch keine Label. Erstelle ein neues L
689689
issues.label_templates.helper=Wähle ein Label-Set
690690
issues.label_templates.use=Label-Set verwenden
691691
issues.label_templates.fail_to_load_file=Fehler beim Laden der Label-Vorlagendatei „%s“: %v
692-
issues.add_label_at=hat das <div class="ui label"style="color: %s\; background-color: %s">%s</div>-Label %s hinzugefügt
693-
issues.remove_label_at=hat das <div class="ui label"style="color: %s\; background-color: %s">%s</div>-Label %s entfernt
694692
issues.add_milestone_at=`hat diesen Issue %[2]s zum <b>%[1]s</b> Meilenstein hinzugefügt`
695693
issues.change_milestone_at=`hat den Meilenstein %[3]s von <b>%[1]s</b> zu <b>%[2]s</b> geändert`
696694
issues.remove_milestone_at=`hat diesen Issue %[2]s vom <b>%[1]s</b> Meilenstein entfernt`

‎options/locale/locale_en-US.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,8 @@ issues.label_templates.info = No labels exist yet. Create a label with 'New Labe
690690
issues.label_templates.helper = Select a label set
691691
issues.label_templates.use = Use Label Set
692692
issues.label_templates.fail_to_load_file = Failed to load label template file '%s': %v
693-
issues.add_label_at = added the <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
694-
issues.remove_label_at = removed the <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
693+
issues.add_label_at = added the <div class="ui label has-emoji" style="color: %s\; background-color: %s">%s</div> label %s
694+
issues.remove_label_at = removed the <div class="ui label has-emoji" style="color: %s\; background-color: %s">%s</div> label %s
695695
issues.add_milestone_at = `added this to the <b>%s</b> milestone %s`
696696
issues.change_milestone_at = `modified the milestone from <b>%s</b> to <b>%s</b> %s`
697697
issues.remove_milestone_at = `removed this from the <b>%s</b> milestone %s`

‎options/locale/locale_es-ES.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,6 @@ issues.create_label=Crear etiqueta
416416
issues.label_templates.title=Carga un conjunto predefinido de etiquetas
417417
issues.label_templates.helper=Seleccionar un conjunto de etiquetas
418418
issues.label_templates.fail_to_load_file=Error al cargar el archivo de plantilla de etiqueta '%s': %v
419-
issues.add_label_at=añadida la etiqueta <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
420-
issues.remove_label_at=eliminada la etiqueta <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
421419
issues.add_milestone_at=`ha añadido esto al hito <b>%s</b> %s '
422420
issues.change_milestone_at=`modificó el hito de <b>%s</b> a <b>%s</b> %s`
423421
issues.remove_milestone_at=`eliminado esto del <b>%s</b> hito %s '

‎options/locale/locale_fr-FR.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,8 +689,6 @@ issues.label_templates.info=Il n'existe pas encore d'étiquettes. Créez une ét
689689
issues.label_templates.helper=Sélectionnez un ensemble d'étiquettes
690690
issues.label_templates.use=Utiliser le jeu de labels
691691
issues.label_templates.fail_to_load_file=Impossible de charger le fichier de modèle étiquette '%s' : %v
692-
issues.add_label_at=a ajouté l'étiquette <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
693-
issues.remove_label_at=a supprimé l'étiquette <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
694692
issues.add_milestone_at=`a ajouté cela au jalon <b>%s</b> %s`
695693
issues.change_milestone_at=`a modifié le jalon de <b>%s</b> à <b>%s</b> %s`
696694
issues.remove_milestone_at=`a supprimé cela du jalon <b>%s</b> %s`

‎options/locale/locale_hu-HU.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,6 @@ issues.create_label=Címke létrehozása
355355
issues.label_templates.title=Előre definiált címkék betöltése
356356
issues.label_templates.helper=Címkekészlet választása
357357
issues.label_templates.fail_to_load_file=Nem sikerült betölteni a cimkekészlet sablon fájlt "%s": %v
358-
issues.add_label_at=hozzáadta a(z) <div class="ui label" style="color: %s\; background-color: %s">%s</div> címkét %s
359-
issues.remove_label_at=eltávolította a(z) <div class="ui label" style="color: %s\; background-color: %s">%s</div> címkét %s
360358
issues.add_milestone_at=`A hibajegy hozzá lett adva a <b>%s</b> mérföldkőhöz %s`
361359
issues.change_milestone_at=`módosítva lett a mérföldkő <b>%s</b>-ról/ről <b>%s</b>-ra/re %s`
362360
issues.remove_milestone_at=`eltávolítva a <b>%s</b> mérföldkőből %s`

‎options/locale/locale_id-ID.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,6 @@ issues.create_label=Buat Label
424424
issues.label_templates.title=Muat sebuah label yang telah ditentukan
425425
issues.label_templates.helper=Pilih set label
426426
issues.label_templates.fail_to_load_file=Gagal untuk memuat berkas contoh label '%s': %v
427-
issues.add_label_at=menambahkan <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
428-
issues.remove_label_at=menghapus <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
429427
issues.add_milestone_at=`telah menambahkan ini ke <b>%s</b> milestone %s`
430428
issues.change_milestone_at=`telah mengubah milestone dari <b>%s</b> ke <b>%s</b> %s`
431429
issues.remove_milestone_at=`telah menghapus ini dari <b>%s</b> milestone %s`

‎options/locale/locale_it-IT.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,6 @@ issues.label_templates.info=Non esistono etichette. Crea una etichetta con 'Nuov
636636
issues.label_templates.helper=Scegli un set di etichette
637637
issues.label_templates.use=Usa Set Etichette
638638
issues.label_templates.fail_to_load_file=Impossibile caricare il file template di etichetta '%s': %v
639-
issues.add_label_at=aggiunta l'etichetta <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
640-
issues.remove_label_at=rimossa l'etichetta <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
641639
issues.add_milestone_at=`aggiunta alle pietre miliari <b>%s</b> %s`
642640
issues.change_milestone_at=`pietra miliare modificata da <b> %s</b> a <b>%s</b> %s`
643641
issues.remove_milestone_at=`rimossa dalle pietre miliari <b>%s</b> %s`

‎options/locale/locale_ja-JP.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,6 @@ issues.label_templates.info=ラベルがまだありません。"新しいラベ
690690
issues.label_templates.helper=ラベルセットを選択
691691
issues.label_templates.use=ラベルセットを使用
692692
issues.label_templates.fail_to_load_file=ラベルテンプレート '%s' を読み込めませんでした: %v
693-
issues.add_label_at=がラベル<div class="ui label" style="color: %[1]s\; background-color: %[2]s">%[3]s</div>を追加 %[4]s
694-
issues.remove_label_at=がラベル <div class="ui label" style="color: %[1]s\; background-color: %[2]s">%[3]s</div> を削除 %[4]s
695693
issues.add_milestone_at=`がマイルストーン <b>%[1]s</b> に追加 %[2]s`
696694
issues.change_milestone_at=`がマイルストーンを <b>%[1]s</b> から <b>%[2]s</b> へ変更 %[3]s`
697695
issues.remove_milestone_at=`がマイルストーン <b>%[1]s</b> から除外 %[2]s`

‎options/locale/locale_lv-LV.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,8 +689,6 @@ issues.label_templates.info=Nav izveidota neviena etiķete. Jūs varat noklikš
689689
issues.label_templates.helper=Izvēlieties etiķešu kopu
690690
issues.label_templates.use=Izmantot etiķešu kopu
691691
issues.label_templates.fail_to_load_file=Neizdevās ielādēt etiķetes sagataves failu '%s': %v
692-
issues.add_label_at=pievienoja etiķeti <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
693-
issues.remove_label_at=noņēma etiķeti <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
694692
issues.add_milestone_at=`pievienoja atskaites punktu <b>%s</b> %s`
695693
issues.change_milestone_at=`nomainīja atskaites punktu no <b>%s</b> uz <b>%s</b> %s`
696694
issues.remove_milestone_at=`noņēma atskaites punktu <b>%s</b> %s`

‎options/locale/locale_pl-PL.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,6 @@ issues.label_templates.title=Załaduj wstępnie przygotowany zestaw etykiet
640640
issues.label_templates.helper=Wybierz zestaw etykiet
641641
issues.label_templates.use=Użyj zbioru etykiet
642642
issues.label_templates.fail_to_load_file=Ładowanie pliku szablonu etykiety '%s' nie powiodło się: %v
643-
issues.add_label_at=dodano etykietę <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
644-
issues.remove_label_at=usunięto etykietę <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
645643
issues.add_milestone_at=`dodano do <b>%s</b> kamień milowy %s`
646644
issues.change_milestone_at=`zmodyfikował kamień milowy z <b>%s</b> na <b>%s</b> %s`
647645
issues.remove_milestone_at=`usunięto z <b>%s</b> kamień milowy %s`

‎options/locale/locale_pt-BR.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,6 @@ issues.label_templates.info=Ainda não existem etiquetas. Crie uma etiqueta em '
690690
issues.label_templates.helper=Selecione um conjunto de etiquetas
691691
issues.label_templates.use=Use o conjunto de etiquetas
692692
issues.label_templates.fail_to_load_file=Houve erro ao carregar arquivo de template '%s': %v
693-
issues.add_label_at=adicionou a etiqueta <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
694-
issues.remove_label_at=removeu a etiqueta <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
695693
issues.add_milestone_at=`adicionou esta issue para o marco <b>%s</b> %s`
696694
issues.change_milestone_at=`modificou o marco de <b>%s</b> para <b>%s</b> %s`
697695
issues.remove_milestone_at=`removeu esta issue do marco <b>%s</b> %s`

‎options/locale/locale_ru-RU.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,8 +666,6 @@ issues.label_templates.info=Меток пока не существует. Со
666666
issues.label_templates.helper=Выберите метку
667667
issues.label_templates.use=Использовать набор меток
668668
issues.label_templates.fail_to_load_file=Не удалось загрузить файл шаблона метки «%s»: %v
669-
issues.add_label_at=добавил(а) метку <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
670-
issues.remove_label_at=убрал(а) метку <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
671669
issues.add_milestone_at=`добавил к этапу <b>%s</b> %s`
672670
issues.change_milestone_at=`поменял целевой этап с <b>%s</b> на <b>%s</b> %s`
673671
issues.remove_milestone_at=`удалил из этапа <b>%s</b> %s`

‎options/locale/locale_sv-SE.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,8 +654,6 @@ issues.label_templates.info=Inga etiketter finns ännu. Skapa en etikett med 'Ny
654654
issues.label_templates.helper=Markera en uppsättning etiketter
655655
issues.label_templates.use=Använd etikettsamling
656656
issues.label_templates.fail_to_load_file=Laddning av etikettmallen '%s' misslyckades: %v
657-
issues.add_label_at=lade till etiketten <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
658-
issues.remove_label_at=tog bort etiketten <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
659657
issues.add_milestone_at=`lade till denna till milstolpe <b>%s</b> %s`
660658
issues.change_milestone_at='modifierade milstolpen från <b>%s</b> till <b>%s</b> %s'
661659
issues.remove_milestone_at='tog bort denna från milstolpen <b>%s</b> %s'

‎options/locale/locale_tr-TR.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,6 @@ issues.create_label=Etiket Oluştur
346346
issues.label_templates.title=Önceden tanımlanmış bir etiket seti yükle
347347
issues.label_templates.helper=Bir etiket seti seçin
348348
issues.label_templates.fail_to_load_file=Etiket şablon dosyası yüklemesi başarısız oldu '%s':%v
349-
issues.add_label_at=eklenen <div class="ui label" style="color: %s\; background-color: %s">%s</div> etiket %s
350-
issues.remove_label_at=kaldırılan <div class="ui label" style="color: %s\; background-color: %s">%s</div> etiket %s
351349
issues.add_milestone_at=`bu <b>%s</b> yol taşına eklendi %s`
352350
issues.change_milestone_at=` <b>%s</b>den<b>%s</b>ye yol taşı düzenlendi %s`
353351
issues.remove_milestone_at=`bu dosya <b>%s</b> yol taşından kaldırıldı %s`

‎options/locale/locale_uk-UA.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,8 +666,6 @@ issues.label_templates.info=Ще немає міток. Натисніть 'Но
666666
issues.label_templates.helper=Оберіть набір міток
667667
issues.label_templates.use=Використовувати набір міток
668668
issues.label_templates.fail_to_load_file=Не вдалося завантажити файл шаблона мітки '%s': %v
669-
issues.add_label_at=додав(ла) мітку <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
670-
issues.remove_label_at=видалив(ла) метку <div class="ui label" style="color: %s\; background-color: %s">%s</div> %s
671669
issues.add_milestone_at=`додав(ла) до <b>%s</b> етапу %s`
672670
issues.change_milestone_at=`змінено цільової етап з <b>%s</b> на <b>%s</b> %s`
673671
issues.remove_milestone_at=`видалено з етапу<b>%s</b> %s`

‎options/locale/locale_zh-CN.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,6 @@ issues.label_templates.info=还没有任何标签。您可以使用'创建标签
682682
issues.label_templates.helper=选择标签模板
683683
issues.label_templates.use=使用标签集
684684
issues.label_templates.fail_to_load_file=加载标签模板文件 '%s' 时发生错误：%v
685-
issues.add_label_at=添加了标签 <div class="ui label" style="color: %s\; background-color: %s"> %s </div> %s
686-
issues.remove_label_at=删除了标签 <div class="ui label" style="color: %s\; background-color: %s"> %s </div> %s
687685
issues.add_milestone_at=` %[2]s 添加了里程碑 <b>%[1]s</b>`
688686
issues.change_milestone_at=`%[3]s 修改了里程碑从 <b>%[1]s</b> 到 <b>%[2]s</b>`
689687
issues.remove_milestone_at=`%[2]s 删除了里程碑 <b>%[1]s</b>`

‎options/locale/locale_zh-TW.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,8 +587,6 @@ issues.label_templates.title=載入一組預定義的標籤
587587
issues.label_templates.helper=選擇一個標籤集
588588
issues.label_templates.use=使用標籤集
589589
issues.label_templates.fail_to_load_file=載入標籤範本檔案 '%s' 失敗: %v
590-
issues.add_label_at=加上了 <div class="ui label" style="color: %s\; background-color: %s">%s</div> 標籤 %s
591-
issues.remove_label_at=刪除了 <div class="ui label" style="color: %s\; background-color: %s">%s</div> 標籤 %s
592590
issues.add_milestone_at=`新增至<b>%s</b> 里程碑 %s`
593591
issues.change_milestone_at=`%[3]s 修改了里程碑 <b>%[1]s</b> 到 <b>%[2]s</b>`
594592
issues.remove_milestone_at=`從里程碑 %[2]s 刪除 <b>%[1]s</b>`

‎public/css/index.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/less/_emojify.less

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
.emoji {
2-
width: 1.5em;
3-
height: 1.5em;
4-
display: inline-block;
5-
background-size: contain;
6-
}
1+
.emoji {
2+
width: 1.5em;
3+
height: 1.5em;
4+
display: inline-block;
5+
background-size: contain;
6+
}
7+
8+
.ui.label .emoji {
9+
height: 1.2em !important;
10+
}

‎routers/repo/issue_label.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ func Labels(ctx *context.Context) {
2222
ctx.Data["PageIsIssueList"] = true
2323
ctx.Data["PageIsLabels"] = true
2424
ctx.Data["RequireMinicolors"] = true
25+
ctx.Data["RequireTribute"] = true
2526
ctx.Data["LabelTemplates"] = models.LabelTemplates
2627
ctx.HTML(200, tplLabels)
2728
}

‎templates/base/footer.tmpl

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,11 @@
6868
}
6969
return itemStr;
7070
}
71-
})
72-
issuesTribute.attach(document.getElementById('content'))
71+
});
72+
var content = document.getElementById('content');
73+
if (content != null) {
74+
issuesTribute.attach(content);
75+
}
7376
</script>
7477
<script>
7578
var emojiTribute = new Tribute({
@@ -93,15 +96,22 @@
9396
return item;
9497
},
9598
selectTemplate: function (item) {
96-
if (typeof item === 'undefinied') return null;
99+
if (typeof item === 'undefined') return null;
97100
return ':' + item.original + ':';
98101
},
99102
menuItemTemplate: function (item) {
100103
return '<img class="emoji" src="{{AppSubUrl}}/vendor/plugins/emojify/images/' + item.original + '.png"/>' + item.original;
101104
}
102105
}]
103106
});
104-
emojiTribute.attach(document.getElementById('content'))
107+
var emojiInputs = document.querySelectorAll('.emoji-input');
108+
if (emojiInputs.length > 0) {
109+
emojiTribute.attach(emojiInputs);
110+
}
111+
var content = document.getElementById('content');
112+
if (content != null) {
113+
emojiTribute.attach(document.getElementById('content'));
114+
}
105115
</script>
106116
{{end}}
107117
<script src="{{AppSubUrl}}/vendor/plugins/emojify/emojify.min.js"></script>

0 commit comments

Comments
 (0)