fix changes summary on files headers

* since the alignment of the changes the file headers lost the style due to css changes * update diff dependency and add dev dependencies
rtfpessoa · Oct 31, 2015 · 54b3915 · 54b3915
1 parent 45e84c5
commit 54b3915
Show file tree

Hide file tree

Showing 8 changed files with 1,157 additions and 524 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "diff2html",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "homepage": "http://rtfpessoa.github.io/diff2html/",
   "description": "Fast Diff to colorized HTML",
   "keywords": [

diff --git a/dist/diff2html.js b/dist/diff2html.js
diff --git a/dist/diff2html.min.js b/dist/diff2html.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "diff2html",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "homepage": "http://rtfpessoa.github.io/diff2html/",
   "description": "Fast Diff to colorized HTML",
   "keywords": [
@@ -36,13 +36,17 @@
   },
   "preferGlobal": "true",
   "scripts": {
-    "test": ""
+    "release": "bash release.sh"
   },
   "main": "./src/diff2html.js",
   "dependencies": {
-    "diff": "1.4.0"
+    "diff": "2.2.*"
+  },
+  "devDependencies": {
+    "webpack": "1.12.*",
+    "uglifyjs": "2.4.*",
+    "less": "2.5.*"
   },
-  "devDependencies": {},
   "license": "MIT",
   "files": [
     "src"

diff --git a/release.sh b/release.sh
@@ -17,10 +17,6 @@ echo "Cleaning previous versions ..."
 rm -rf ${OUTPUT_DIR}
 mkdir -p ${OUTPUT_DIR}
 
-echo "Preparing dependencies ..."
-rm -rf node_modules
-npm install
-
 echo "Generating js aggregation file in ${OUTPUT_JS_FILE}"
 
 webpack ./src/diff2html.js ${OUTPUT_JS_FILE}

diff --git a/sample/index.html b/sample/index.html
@@ -9,15 +9,15 @@
         Author: rtfpessoa
     -->
 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css">
 
     <!-- -->
     <link rel="stylesheet" type="text/css" href="../dist/diff2html.min.css">
     <script type="text/javascript" src="../dist/diff2html.min.js"></script>
     <!-- -->
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/languages/scala.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/languages/scala.min.js"></script>
 
     <script>
         var lineDiffExample =

diff --git a/src/line-by-line-printer.js b/src/line-by-line-printer.js
@@ -28,8 +28,12 @@
         return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
           '     <div class="d2h-file-header">\n' +
           '       <div class="d2h-file-stats">\n' +
-          '         <span class="d2h-lines-added">+' + file.addedLines + '</span>\n' +
-          '         <span class="d2h-lines-deleted">-' + file.deletedLines + '</span>\n' +
+          '         <span class="d2h-lines-added">' +
+          '           <span>+' + file.addedLines + '</span>\n' +
+          '         </span>\n' +
+          '         <span class="d2h-lines-deleted">' +
+          '           <span>-' + file.deletedLines + '</span>\n' +
+          '         </span>\n' +
           '       </div>\n' +
           '       <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
           '     </div>\n' +

diff --git a/src/side-by-side-printer.js b/src/side-by-side-printer.js
@@ -28,8 +28,12 @@
         return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
           '     <div class="d2h-file-header">\n' +
           '       <div class="d2h-file-stats">\n' +
-          '         <span class="d2h-lines-added">+' + file.addedLines + '</span>\n' +
-          '         <span class="d2h-lines-deleted">-' + file.deletedLines + '</span>\n' +
+          '         <span class="d2h-lines-added">' +
+          '           <span>+' + file.addedLines + '</span>\n' +
+          '         </span>\n' +
+          '         <span class="d2h-lines-deleted">' +
+          '           <span>-' + file.deletedLines + '</span>\n' +
+          '         </span>\n' +
           '       </div>\n' +
           '       <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
           '     </div>\n' +