Fix repeated variable name in same scope (thanks Codacy)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "diff2html",
-  "version": "2.0.0-beta3",
+  "version": "2.0.0-beta7",
   "homepage": "http://rtfpessoa.github.io/diff2html/",
   "description": "Fast Diff to colorized HTML",
   "keywords": [
@@ -40,6 +40,7 @@
   ],
   "ignore": [
     "**/.*",
+    "webpack.config.js",
     "package.json",
     "release.sh",
     "circle.yml",

dist/diff2html-templates.js

@@ -12,7 +12,7 @@ output += runtime.suppressValue(runtime.memberLookup((runtime.memberLookup((runt
 output += "\">\n        <div class=\"d2h-code-line ";
 output += runtime.suppressValue(runtime.memberLookup((runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "diffParser")),"LINE_TYPE")),"INFO"), env.opts.autoescape);
 output += "\"> ";
-output += runtime.suppressValue((lineno = 3, colno = 73, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"escape"), "utils[\"escape\"]", context, [runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "block")),"header")])), env.opts.autoescape);
+output += runtime.suppressValue((lineno = 3, colno = 77, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"escape"), "utils[\"escape\"]", context, [runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "block")),"header")])), env.opts.autoescape);
 output += "</div>\n    </td>\n</tr>\n";
 if(parentTemplate) {
 parentTemplate.rootRenderFunc(env, context, frame, runtime, cb);
@@ -104,25 +104,24 @@ var parentTemplate = null;
 output += "<tr>\n    <td class=\"d2h-code-linenumber ";
 output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "type"), env.opts.autoescape);
 output += "\">\n        <div class=\"line-num1\">";
-output += runtime.suppressValue(env.getFilter("safe").call(context, (lineno = 2, colno = 46, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"valueOrEmpty"), "utils[\"valueOrEmp\"]", context, [runtime.contextOrFrameLookup(context, frame, "oldNumber")]))), env.opts.autoescape);
+output += runtime.suppressValue(env.getFilter("safe").call(context, (lineno = 2, colno = 50, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"valueOrEmpty"), "utils[\"valueOrEmp\"]", context, [runtime.contextOrFrameLookup(context, frame, "oldNumber")]))), env.opts.autoescape);
 output += "</div>\n        <div class=\"line-num2\">";
-output += runtime.suppressValue(env.getFilter("safe").call(context, (lineno = 3, colno = 46, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"valueOrEmpty"), "utils[\"valueOrEmp\"]", context, [runtime.contextOrFrameLookup(context, frame, "newNumber")]))), env.opts.autoescape);
+output += runtime.suppressValue(env.getFilter("safe").call(context, (lineno = 3, colno = 50, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"valueOrEmpty"), "utils[\"valueOrEmp\"]", context, [runtime.contextOrFrameLookup(context, frame, "newNumber")]))), env.opts.autoescape);
 output += "</div>\n    </td>\n    <td class=\"";
 output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "type"), env.opts.autoescape);
 output += "\">\n        <div class=\"d2h-code-line ";
 output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "type"), env.opts.autoescape);
-output += "\">\n";
+output += "\">";
 if(runtime.contextOrFrameLookup(context, frame, "prefix")) {
 output += "\n            <span class=\"d2h-code-line-prefix\">";
-output += runtime.suppressValue(env.getFilter("safe").call(context, (lineno = 8, colno = 83, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"convertWhiteSpaceToNonBreakingSpace"), "utils[\"convertWhi\"]", context, [runtime.contextOrFrameLookup(context, frame, "prefix")]))), env.opts.autoescape);
+output += runtime.suppressValue(env.getFilter("safe").call(context, (lineno = 8, colno = 89, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"convertWhiteSpaceToNonBreakingSpace"), "utils[\"convertWhi\"]", context, [runtime.contextOrFrameLookup(context, frame, "prefix")]))), env.opts.autoescape);
 output += "</span>\n            ";
 ;
 }
-output += "\n";
 if(runtime.contextOrFrameLookup(context, frame, "content")) {
-output += "\n      <span class=\"d2h-code-line-ctn\">";
+output += "<span class=\"d2h-code-line-ctn\">";
-output += runtime.suppressValue(env.getFilter("safe").call(context, (lineno = 11, colno = 80, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"convertWhiteSpaceToNonBreakingSpace"), "utils[\"convertWhi\"]", context, [runtime.contextOrFrameLookup(context, frame, "content")]))), env.opts.autoescape);
+output += runtime.suppressValue(env.getFilter("safe").call(context, (lineno = 11, colno = 86, runtime.callWrap(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "utils")),"convertWhiteSpaceToNonBreakingSpace"), "utils[\"convertWhi\"]", context, [runtime.contextOrFrameLookup(context, frame, "content")]))), env.opts.autoescape);
-output += "</span>\n";
+output += "</span>";
 ;
 }
 output += "\n        </div>\n    </td>\n</tr>\n";

dist/diff2html-ui.js

@@ -126,9 +126,14 @@
 
 	  Diff2HtmlUI.prototype._getTarget = function(targetId) {
 	    var $target;
-	    if (targetId) {
+
+	    if (typeof(targetId) === 'object' && targetId instanceof jQuery) {
+	      $target = targetId;
+	    } else if (typeof(targetId) === 'string') {
 	      $target = $(targetId);
 	    } else {
+	      console.error("Wrong target provided! Falling back to default value 'body'.");
+	      console.log("Please provide a jQuery object or a valid DOM query string.");
 	      $target = $(defaultTarget);
 	    }
 

dist/diff2html-ui.min.js

@@ -1 +1 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){(function(global){!function(){function Diff2HtmlUI(config){var cfg=config||{};cfg.diff?diffJson=Diff2Html.getJsonFromDiff(cfg.diff):cfg.json&&(diffJson=cfg.json)}var diffJson=null,defaultTarget="body";Diff2HtmlUI.prototype.draw=function(targetId,config){var cfg=config||{},$target=this._getTarget(targetId);$target.html(Diff2Html.getPrettyHtml(diffJson,cfg))},Diff2HtmlUI.prototype.fileListCloseable=function(targetId,startVisible){function show(){$showBtn.hide(),$hideBtn.show(),$fileList.show()}function hide(){$hideBtn.hide(),$showBtn.show(),$fileList.hide()}var $target=this._getTarget(targetId),hashTag=this._getHashTag(),$showBtn=$target.find(".d2h-show"),$hideBtn=$target.find(".d2h-hide"),$fileList=$target.find(".d2h-file-list");"files-summary-show"===hashTag?show():"files-summary-hide"===hashTag?hide():startVisible?show():hide(),$showBtn.click(show),$hideBtn.click(hide)},Diff2HtmlUI.prototype.highlightCode=function(targetId){var that=this,$target=that._getTarget(targetId),languages=that._getLanguages($target);hljs.configure({languages:languages});var $codeLines=$target.find(".d2h-code-line-ctn");$codeLines.map(function(i,line){hljs.highlightBlock(line)})},Diff2HtmlUI.prototype._getTarget=function(targetId){var $target;return $target=$(targetId?targetId:defaultTarget)},Diff2HtmlUI.prototype._getLanguages=function($target){var allFileLanguages=[];return diffJson?allFileLanguages=diffJson.map(function(line){return line.language}):$target.find(".d2h-file-wrapper").map(function(i,file){allFileLanguages.push($(file).data("lang"))}),this._distinct(allFileLanguages)},Diff2HtmlUI.prototype._getHashTag=function(){var docUrl=document.URL,hashTagIndex=docUrl.indexOf("#"),hashTag=null;return-1!==hashTagIndex&&(hashTag=docUrl.substr(hashTagIndex+1)),hashTag},Diff2HtmlUI.prototype._distinct=function(collection){return collection.filter(function(v,i){return collection.indexOf(v)===i})},module.exports.Diff2HtmlUI=Diff2HtmlUI,global.Diff2HtmlUI=Diff2HtmlUI}()}).call(exports,function(){return this}())}]);
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){(function(global){!function(){function Diff2HtmlUI(config){var cfg=config||{};cfg.diff?diffJson=Diff2Html.getJsonFromDiff(cfg.diff):cfg.json&&(diffJson=cfg.json)}var diffJson=null,defaultTarget="body";Diff2HtmlUI.prototype.draw=function(targetId,config){var cfg=config||{},$target=this._getTarget(targetId);$target.html(Diff2Html.getPrettyHtml(diffJson,cfg))},Diff2HtmlUI.prototype.fileListCloseable=function(targetId,startVisible){function show(){$showBtn.hide(),$hideBtn.show(),$fileList.show()}function hide(){$hideBtn.hide(),$showBtn.show(),$fileList.hide()}var $target=this._getTarget(targetId),hashTag=this._getHashTag(),$showBtn=$target.find(".d2h-show"),$hideBtn=$target.find(".d2h-hide"),$fileList=$target.find(".d2h-file-list");"files-summary-show"===hashTag?show():"files-summary-hide"===hashTag?hide():startVisible?show():hide(),$showBtn.click(show),$hideBtn.click(hide)},Diff2HtmlUI.prototype.highlightCode=function(targetId){var that=this,$target=that._getTarget(targetId),languages=that._getLanguages($target);hljs.configure({languages:languages});var $codeLines=$target.find(".d2h-code-line-ctn");$codeLines.map(function(i,line){hljs.highlightBlock(line)})},Diff2HtmlUI.prototype._getTarget=function(targetId){var $target;return"object"==typeof targetId&&targetId instanceof jQuery?$target=targetId:"string"==typeof targetId?$target=$(targetId):(console.error("Wrong target provided! Falling back to default value 'body'."),console.log("Please provide a jQuery object or a valid DOM query string."),$target=$(defaultTarget)),$target},Diff2HtmlUI.prototype._getLanguages=function($target){var allFileLanguages=[];return diffJson?allFileLanguages=diffJson.map(function(line){return line.language}):$target.find(".d2h-file-wrapper").map(function(i,file){allFileLanguages.push($(file).data("lang"))}),this._distinct(allFileLanguages)},Diff2HtmlUI.prototype._getHashTag=function(){var docUrl=document.URL,hashTagIndex=docUrl.indexOf("#"),hashTag=null;return-1!==hashTagIndex&&(hashTag=docUrl.substr(hashTagIndex+1)),hashTag},Diff2HtmlUI.prototype._distinct=function(collection){return collection.filter(function(v,i){return collection.indexOf(v)===i})},module.exports.Diff2HtmlUI=Diff2HtmlUI,global.Diff2HtmlUI=Diff2HtmlUI}()}).call(exports,function(){return this}())}]);

dist/diff2html.js

@@ -325,10 +325,10 @@
 	      if (utils.startsWith(line, 'diff')) {
 	        startFile();
 	      } else if (currentFile && !currentFile.oldName && (values = getSrcFilename(line, config))) {
-	        currentFile.oldName = values[1];
+	        currentFile.oldName = values;
 	        currentFile.language = getExtension(currentFile.oldName, currentFile.language);
 	      } else if (currentFile && !currentFile.newName && (values = getDstFilename(line, config))) {
-	        currentFile.newName = values[1];
+	        currentFile.newName = values;
 	        currentFile.language = getExtension(currentFile.newName, currentFile.language);
 	      } else if (currentFile && utils.startsWith(line, '@@')) {
 	        startBlock(line);
@@ -391,7 +391,7 @@
 	  }
 
 	  function getSrcFilename(line, cfg) {
-	    var prefixes = ["a\\/", "i\\/", "w\\/", "c\\/", "o\\/"];
+	    var prefixes = ["a/", "i/", "w/", "c/", "o/"];
 
 	    if (cfg.srcPrefix) prefixes.push(cfg.srcPrefix);
 
@@ -399,7 +399,7 @@
 	  }
 
 	  function getDstFilename(line, cfg) {
-	    var prefixes = ["b\\/", "i\\/", "w\\/", "c\\/", "o\\/"];
+	    var prefixes = ["b/", "i/", "w/", "c/", "o/"];
 
 	    if (cfg.dstPrefix) prefixes.push(cfg.dstPrefix);
 
@@ -407,8 +407,20 @@
 	  }
 
 	  function _getFilename(linePrefix, line, prefixes) {
-	    var prefixesStr = prefixes.join("|");
+	    var FilenameRegExp = new RegExp('^' + linePrefix + ' "?(.+?)"?$');
-	    return new RegExp('^' + linePrefix + ' "?(?:' + prefixesStr + ')(.+?)"?$').exec(line);
+
+	    var filename;
+	    var values = FilenameRegExp.exec(line);
+	    if (values && values[1]) {
+	      filename = values[1];
+	      var matchingPrefixes = prefixes.filter(function(p) {
+	        return filename.indexOf(p) === 0;
+	      });
+
+	      if (matchingPrefixes[0]) filename = filename.slice(matchingPrefixes[0].length); // remove prefix if exists
+	    }
+
+	    return filename;
 	  }
 
 	  module.exports.DiffParser = new DiffParser();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "diff2html",
-  "version": "2.0.0-beta3",
+  "version": "2.0.0-beta7",
   "homepage": "http://rtfpessoa.github.io/diff2html/",
   "description": "Fast Diff to colorized HTML",
   "keywords": [

src/diff-parser.js

@@ -249,11 +249,11 @@
     var values = FilenameRegExp.exec(line);
     if (values && values[1]) {
       filename = values[1];
-      var prefix = prefixes.find(function(prefix) {
+      var matchingPrefixes = prefixes.filter(function(p) {
-        return filename.startsWith(prefix);
+        return filename.indexOf(p) === 0;
       });
 
-      if (prefix) filename = filename.slice(prefix.length); // remove prefix if exists
+      if (matchingPrefixes[0]) filename = filename.slice(matchingPrefixes[0].length); // remove prefix if exists
     }
 
     return filename;

src/templates/line-by-line/line.html

@@ -5,12 +5,12 @@
     </td>
     <td class="{{ type }}">
         <div class="d2h-code-line {{ type }}">
-{% if prefix %}
+            {%- if prefix %}
             <span class="d2h-code-line-prefix">{{ utils.convertWhiteSpaceToNonBreakingSpace(prefix) | safe }}</span>
-{% endif %}
+            {% endif -%}
-{% if content %}
+            {% if content -%}
             <span class="d2h-code-line-ctn">{{ utils.convertWhiteSpaceToNonBreakingSpace(content) | safe }}</span>
-{% endif %}
+            {%- endif %}
         </div>
     </td>
 </tr>

src/ui/js/diff2html-ui.js

@@ -80,9 +80,14 @@
 
   Diff2HtmlUI.prototype._getTarget = function(targetId) {
     var $target;
-    if (targetId) {
+
+    if (typeof(targetId) === 'object' && targetId instanceof jQuery) {
+      $target = targetId;
+    } else if (typeof(targetId) === 'string') {
       $target = $(targetId);
     } else {
+      console.error("Wrong target provided! Falling back to default value 'body'.");
+      console.log("Please provide a jQuery object or a valid DOM query string.");
       $target = $(defaultTarget);
     }