From 444af0935efd18a9a5869090168de0ada12aef6e Mon Sep 17 00:00:00 2001
From: nazoking <nazoking@gmail.com>
Date: Wed, 25 Mar 2015 09:20:20 +0900
Subject: [PATCH 1/3] fix regression: blank diff output #672

---
 src/main/webapp/assets/common/js/gitbucket.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/assets/common/js/gitbucket.js b/src/main/webapp/assets/common/js/gitbucket.js
index 87ea23b07..e10b2fbf1 100644
--- a/src/main/webapp/assets/common/js/gitbucket.js
+++ b/src/main/webapp/assets/common/js/gitbucket.js
@@ -118,12 +118,17 @@ function JsDiffRender(params){
     var dom = null;
     return function(ln){
       if(dom===null){
-        dom = prettyPrintOne(
+        var html = prettyPrintOne(
           text.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/"/g,'&quot;').replace(/>/g,'&gt;'),
           (/\.([^.]*)$/.exec(fileName)||[])[1],
           true);
+        var re = /<li[^>]*id="?L([0-9]+)"?[^>]*>(.*?)<\/li>/gi, h;
+        dom=[];
+        while(h=re.exec(html)){
+          dom[h[1]]=h[2];
+        }
       }
-      return (new RegExp('<li id="L'+ln+'"[^>]*>(.*?)</li>').exec(dom) || [])[1];
+      return dom[ln];
     };
   }
   return this.renders(oplines, prettyDom(params.oldText, params.oldTextName), prettyDom(params.newText, params.newTextName));

From 40f376dbd9a43e2277a005f84a6235297676aeae Mon Sep 17 00:00:00 2001
From: nazoking <nazoking@gmail.com>
Date: Wed, 25 Mar 2015 10:20:59 +0900
Subject: [PATCH 2/3] fix for ie 7

---
 .../gitbucket/core/helper/diff.scala.html     | 26 +++++++++----------
 .../webapp/assets/common/css/gitbucket.css    |  3 +++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html
index 01725be23..ca7b95862 100644
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -47,9 +47,6 @@
     <tr>
       <th style="font-weight: normal; line-height: 27px;" class="box-header">
         @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
-          <span class="diffstat">
-            <img src="@assets/common/images/diff_move.png"/>
-          </span> @diff.oldPath -> @diff.newPath
           @if(newCommitId.isDefined){
             <div class="pull-right align-right">
               <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
@@ -57,8 +54,18 @@
               <a href="@url(repository)/blob/@newCommitId.get/@diff.newPath" class="btn btn-small" title="View the whole file at version @newCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
             </div>
           }
+          <span class="diffstat">
+            <img src="@assets/common/images/diff_move.png"/>
+          </span> @diff.oldPath -> @diff.newPath
         }
         @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
+          @if(newCommitId.isDefined){
+            <div class="pull-right align-right">
+              <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
+              <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
+              <a href="@url(repository)/blob/@newCommitId.get/@diff.newPath" class="btn btn-small" title="View the whole file at version @newCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
+            </div>
+          }
           <span class="diffstat">
           @if(diff.changeType == ChangeType.ADD){
             <img src="@assets/common/images/diff_add.png"/>
@@ -67,24 +74,17 @@
           }
           </span>
           @diff.newPath
-          @if(newCommitId.isDefined){
-            <div class="pull-right align-right">
-              <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
-              <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
-              <a href="@url(repository)/blob/@newCommitId.get/@diff.newPath" class="btn btn-small" title="View the whole file at version @newCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
-            </div>
-          }
         }
         @if(diff.changeType == ChangeType.DELETE){
-          <span class="diffstat">
-            <img src="@assets/common/images/diff_delete.png"/>
-          </span> @diff.oldPath
           @if(oldCommitId.isDefined){
             <div class="pull-right align-right">
               <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
               <a href="@url(repository)/blob/@oldCommitId.get/@diff.oldPath" class="btn btn-small" title="View the whole file at version @oldCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
             </div>
           }
+          <span class="diffstat">
+            <img src="@assets/common/images/diff_delete.png"/>
+          </span> @diff.oldPath
         }
       </th>
     </tr>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 4d51e9129..f36597727 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -1121,6 +1121,9 @@ table.diff tbody tr.not-diff:hover td{
 
 .diffstat-bar {
     display: inline-block;
+    /* For IE 6/7 */
+    *display: inline;
+    *zoom: 1;
     margin-left: 3px;
     font-size: 16px;
     color: #ddd;

From 277ace3c8ebbad0ec11ddaddae5e76596b5d0ec6 Mon Sep 17 00:00:00 2001
From: nazoking <nazoking@gmail.com>
Date: Wed, 25 Mar 2015 10:21:40 +0900
Subject: [PATCH 3/3] fix for ie 5

---
 src/main/twirl/gitbucket/core/menu.scala.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index 2c5f00868..7da239aff 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -182,7 +182,7 @@ $(function(){
 
   $('a[rel*=facebox]').facebox({
     'loadingImage': '@assets/vendors/facebox/loading.gif',
-    'closeImage': '@assets/vendors/facebox/closelabel.png',
+    'closeImage': '@assets/vendors/facebox/closelabel.png'
   });
 
   $(document).on("click", ".js-fork-owner-select-target", function() {