Prepare for 2.0.0-beta17 release

Author: rtfpessoa

CREDITS.md

@@ -21,3 +21,7 @@ Mikko Rantanen, [@Rantanen](https://github.com/Rantanen)
 Wolfgang Illmeyer, [@escitalopram](https://github.com/escitalopram)
 
 Jameskmonger, [@Jameskmonger](https://github.com/Jameskmonger)
+
+Rafael Cortês, [@mrfyda](https://github.com/mrfyda)
+
+Ivan Vorontsov, [@lantian](https://github.com/lantian)

README.md

@@ -19,18 +19,20 @@ diff2html generates pretty HTML diffs from git diff output.
 
 ## Features
 
-* `line-by-line` and `side-by-side` diff
+* Line by line and Side by side diff
 
-* new and old line numbers
+* New and old line numbers
 
-* inserted and removed lines
+* Inserted and removed lines
 
 * GitHub like style
 
 * Code syntax highlight
 
 * Line similarity matching
 
+* Easy code selection
+
 ## Online Example
 
 > Go to [diff2html](http://rtfpessoa.github.io/diff2html/)

bower.json

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

dist/diff2html-ui.js

@@ -16,6 +16,7 @@
 
   var diffJson = null;
   var defaultTarget = "body";
+  var currentSelectionColumnId = -1;
 
   function Diff2HtmlUI(config) {
     var cfg = config || {};
@@ -25,6 +26,8 @@
     } else if (cfg.json) {
       diffJson = cfg.json;
     }
+
+    this._initSelection();
   }
 
   Diff2HtmlUI.prototype.draw = function(targetId, config) {
@@ -132,6 +135,54 @@
     });
   };
 
+  Diff2HtmlUI.prototype._initSelection = function() {
+    var body = $('body');
+    var that = this;
+
+    body.on('mousedown', '.d2h-diff-table', function(event) {
+      var target = $(event.target);
+      var table = target.closest('.d2h-diff-table');
+
+      if (target.closest('.d2h-code-line,.d2h-code-side-line').length) {
+        table.removeClass('selecting-left');
+        table.addClass('selecting-right');
+        currentSelectionColumnId = 1;
+      } else if (target.closest('.d2h-code-linenumber,.d2h-code-side-linenumber').length) {
+        table.removeClass('selecting-right');
+        table.addClass('selecting-left');
+        currentSelectionColumnId = 0;
+      }
+    });
+
+    body.on('copy', '.d2h-diff-table', function(event) {
+      var clipboardData = event.originalEvent.clipboardData;
+      var text = that._getSelectedText();
+      clipboardData.setData('text', text);
+      event.preventDefault();
+    });
+  };
+
+
+  Diff2HtmlUI.prototype._getSelectedText = function() {
+    var sel = window.getSelection();
+    var range = sel.getRangeAt(0);
+    var doc = range.cloneContents();
+    var nodes = doc.querySelectorAll('tr');
+    var text = '';
+    var idx = currentSelectionColumnId;
+
+    if (nodes.length === 0) {
+      text = doc.textContent;
+    } else {
+      [].forEach.call(nodes, function(tr, i) {
+        var td = tr.cells[tr.cells.length === 1 ? 0 : idx];
+        text += (i ? '\n' : '') + td.textContent.replace(/(?:\r\n|\r|\n)/g, '');
+      });
+    }
+
+    return text;
+  };
+
   module.exports.Diff2HtmlUI = Diff2HtmlUI;
 
   // Expose diff2html in the browser

dist/diff2html-ui.min.js

@@ -274,3 +274,33 @@ ins.d2h-change, del.d2h-change {
     font-size: 10px;
     cursor: pointer;
 }
+
+/*
+ * Selection util.
+ */
+
+.selecting-left .d2h-code-line,
+.selecting-left .d2h-code-line *,
+.selecting-right td.d2h-code-linenumber,
+.selecting-right td.d2h-code-linenumber *,
+.selecting-left .d2h-code-side-line,
+.selecting-left .d2h-code-side-line *,
+.selecting-right td.d2h-code-side-linenumber,
+.selecting-right td.d2h-code-side-linenumber *{
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.selecting-left .d2h-code-line::selection,
+.selecting-left .d2h-code-line *::selection
+.selecting-right td.d2h-code-linenumber::selection,
+.selecting-left .d2h-code-side-line::selection,
+.selecting-left .d2h-code-side-line *::selection,
+.selecting-right td.d2h-code-side-linenumber::selection,
+.selecting-right td.d2h-code-side-linenumber *::selection {
+  background: transparent;
+}

dist/diff2html.css

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