(refs #47) Add remove file button

Author: takezoe

src/main/scala/gitbucket/gist/controller/GistController.scala

@@ -100,7 +100,7 @@ trait GistControllerBase extends ControllerBase {
   post("/gist/_new")(usersOnly {
     if(context.loginAccount.isDefined){
       val loginAccount = context.loginAccount.get
-      val files = getFileParameters(true)
+      val files = getFileParameters()
 
       if(files.isEmpty){
         redirect(s"/gist")
@@ -139,7 +139,7 @@ trait GistControllerBase extends ControllerBase {
     val repoName = params("repoName")
 
     val loginAccount = context.loginAccount.get
-    val files        = getFileParameters(true)
+    val files        = getFileParameters()
     val description  = params("description")
     val mode         = Mode.from(params("mode"))
 
@@ -501,20 +501,12 @@ trait GistControllerBase extends ControllerBase {
     }
   }
 
-  private def getFileParameters(flatten: Boolean): Seq[(String, String)] = {
+  private def getFileParameters(): Seq[(String, String)] = {
     val count = params("count").toInt
-    if(flatten){
-      (0 to count - 1).flatMap { i =>
-        (params.get(s"fileName-${i}"), params.get(s"content-${i}")) match {
-          case (Some(fileName), Some(content)) if(content.nonEmpty) => Some((if(fileName.isEmpty) s"gistfile${i + 1}.txt" else fileName, content))
-          case _ => None
-        }
-      }
-    } else {
-      (0 to count - 1).map { i =>
-        val fileName = request.getParameter(s"fileName-${i}")
-        val content  = request.getParameter(s"content-${i}")
-        (if(fileName.isEmpty) s"gistfile${i + 1}.txt" else fileName, content)
+    (0 to count - 1).flatMap { i =>
+      (params.get(s"fileName-${i}"), params.get(s"content-${i}")) match {
+        case (Some(fileName), Some(content)) if(content.nonEmpty) => Some((if(fileName.isEmpty) s"gistfile${i + 1}.txt" else fileName, content))
+        case _ => None
       }
     }
   }

src/main/twirl/gitbucket/gist/edit.scala.html

@@ -105,12 +105,14 @@ <h1 style="margin: 0px;">New snippet</h1>
       }
       var value = null;
       for(var i = 0; i < count; i++){
-        value = ace.edit('editor-' + i).getValue();
-        if(value == ''){
-          displayError('Files can\'t be empty.');
-          return false;
-        } else {
-          $('#content-' + i).val(ace.edit('editor-' + i).getValue());
+        if($('#editor-area-' + i).length == 1){
+          value = ace.edit('editor-' + i).getValue();
+          if(value == ''){
+            displayError('Files can\'t be empty.');
+            return false;
+          } else {
+            $('#content-' + i).val(ace.edit('editor-' + i).getValue());
+          }
         }
       }
       return true;

src/main/twirl/gitbucket/gist/editor.scala.html

@@ -2,7 +2,7 @@
   fileName: String,
   content: gitbucket.core.util.JGitUtil.ContentInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-<div class="panel panel-default">
+<div class="panel panel-default" id="editor-area-@i">
   <div class="panel-heading" style="padding: 6px;">
     <div class="pull-right">
       <select id="wrap-@i" class="form-control" style="margin-bottom: 0px; padding: 0px;">
@@ -12,7 +12,8 @@
         </optgroup>
       </select>
     </div>
-    <input type="text" id="fileName-@i" name="fileName-@i" class="form-control" value="@fileName" placeholder="Name this file..." style="width: 300px; margin-bottom: 0px;">
+    <a href="javascript:void(0);" style="padding-left: 8px; padding-right: 6px;" id="remove-@i" data-index="@i"><span class="octicon octicon-x"></span></a>
+    <input type="text" id="fileName-@i" name="fileName-@i" class="form-control" value="@fileName" placeholder="Name this file..." style="width: 300px; margin-bottom: 0px; display: inline;">
   </div>
   <div class="panel-body">
     <div id="editor-@i" class="editor" data-index="@i" style="width: 100%; height: 400px;"></div>
@@ -40,5 +41,11 @@
       editor.getSession().setUseWrapMode(false);
     }
   });
+
+  $('#remove-@i').click(function(){
+    if(confirm('Remove this file. Are you sure?')){
+      $('#editor-area-@i').remove();
+    }
+  });
 });
 </script>