From a66fcb3a77fa21930eaa2fa1af98f02d18c85a08 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Fri, 5 May 2017 23:46:07 +0900
Subject: [PATCH] Remove uniqId from template arguments

---
 .../gitbucket/core/helper/dropdown.scala.html | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
index 01df48450..d31832de6 100644
--- a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html
@@ -2,45 +2,45 @@
   prefix: String  = "",
   style : String  = "",
   right : Boolean = false,
-  filter: String = "",
-  uniqId: String = scala.util.Random.alphanumeric.take(4).mkString)(body: Html)
-@filterId = @{filter.toString.replaceAll("[^a-zA-Z0-9_]","_") + uniqId }
-<div class="btn-group" @if(style.nonEmpty){style="@style"}>
-  <button
-      class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">
-    @if(value.isEmpty){
-      <i class="octicon octicon-gear"></i>
-    } else {
-      @if(prefix.nonEmpty){
-        <span class="muted">@prefix:</span>
-      }
-      <span class="strong">@value</span>
-    }
-    <span class="caret"></span>
-  </button>
-  <ul class="dropdown-menu@if(right){ pull-right}">
-    @if(filter.nonEmpty) {
-      <li><input id="@filterId-input" type="text" class="form-control input-sm dropdown-filter-input" placeholder="@filter"/></li>
-    }
-    @body
-  </ul>
-</div>
-@if(filter.nonEmpty) {
-<script>
-$(window).load(function(){
-  $('#@{filterId}-input').parent().click(function(e) {
-    e.stopPropagation();
-  });
-  $('#@{filterId}-input').keyup(function() {
-    var inputVal = $('#@{filterId}-input').val();
-    $.each($('#@{filterId}-input').parent().parent().find('a'), function(index, elem) {
-      if ( !inputVal || !elem.text.trim() || elem.text.trim().toLowerCase().indexOf(inputVal.toLowerCase()) >=0 ) {
-        $(elem).parent().show();
+  filter: String = "")(body: Html)
+@defining(if(filter.isEmpty) "" else filter + "-" + scala.util.Random.alphanumeric.take(4).mkString){ filterId =>
+  <div class="btn-group" @if(style.nonEmpty){style="@style"}>
+    <button
+        class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">
+      @if(value.isEmpty){
+        <i class="octicon octicon-gear"></i>
       } else {
-        $(elem).parent().hide();
+        @if(prefix.nonEmpty){
+          <span class="muted">@prefix:</span>
+        }
+        <span class="strong">@value</span>
       }
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu@if(right){ pull-right}">
+      @if(filterId.nonEmpty) {
+        <li><input id="@filterId-input" type="text" class="form-control input-sm dropdown-filter-input" placeholder="@filter"/></li>
+      }
+      @body
+    </ul>
+  </div>
+  @if(filterId.nonEmpty) {
+    <script>
+    $(window).load(function(){
+      $('#@{filterId}-input').parent().click(function(e) {
+        e.stopPropagation();
+      });
+      $('#@{filterId}-input').keyup(function() {
+        var inputVal = $('#@{filterId}-input').val();
+        $.each($('#@{filterId}-input').parent().parent().find('a'), function(index, elem) {
+          if ( !inputVal || !elem.text.trim() || elem.text.trim().toLowerCase().indexOf(inputVal.toLowerCase()) >=0 ) {
+            $(elem).parent().show();
+          } else {
+            $(elem).parent().hide();
+          }
+        });
+      });
     });
-  });
-});
-</script>
-}
\ No newline at end of file
+    </script>
+  }
+}