fix copy empty line #548

jcubic · Dec 18, 2019 · 6324c27 · 6324c27
1 parent 640206a
commit 6324c27
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ http://terminal.jcubic.pl
 
 [![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
 ![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
-[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel&2927582373f2249bc9be6e71a1ff3c600513d68d)](https://travis-ci.org/jcubic/jquery.terminal)
+[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel&640206ad65434176d75f8a56ec304f0e42372ff7)](https://travis-ci.org/jcubic/jquery.terminal)
 [![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&61cd458e5a8c6d4c02575731ac378fd2)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
 ![downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
 [![package quality](http://npm.packagequality.com/shield/jquery.terminal.svg)](http://packagequality.com/#?package=jquery.terminal)

diff --git a/js/jquery.terminal-2.9.0.js b/js/jquery.terminal-2.9.0.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Wed, 18 Dec 2019 11:56:23 +0000
+ * Date: Wed, 18 Dec 2019 12:22:00 +0000
  */
 /* global location, setTimeout, window, global, sprintf, setImmediate,
           IntersectionObserver,  ResizeObserver, module, require, define,
@@ -3869,7 +3869,8 @@
     }
     // -----------------------------------------------------------------
     function process_div(element) {
-        return $(element).find('> div')
+        // span is empty line, div is default case with text
+        return $(element).find('> div, > span')
             .map(process_selected_line).get().join('\n').replace(/\n$/, '');
     }
     // -----------------------------------------------------------------
@@ -3882,7 +3883,7 @@
             stdout = $html.find('div[data-index]').map(function() {
                 return process_div(this);
             }).get().join('\n');
-            // match insdie single echo output
+            // match inside single echo output
             if (!stdout && html.match(/style="width: 100%;?"/)) {
                 stdout = process_div($html);
             }
@@ -4062,7 +4063,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Wed, 18 Dec 2019 11:56:23 +0000',
+        date: 'Wed, 18 Dec 2019 12:22:00 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',

diff --git a/js/jquery.terminal-2.9.0.min.js b/js/jquery.terminal-2.9.0.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -3869,7 +3869,8 @@
     }
     // -----------------------------------------------------------------
     function process_div(element) {
-        return $(element).find('> div')
+        // span is empty line, div is default case with text
+        return $(element).find('> div, > span')
             .map(process_selected_line).get().join('\n').replace(/\n$/, '');
     }
     // -----------------------------------------------------------------
@@ -3882,7 +3883,7 @@
             stdout = $html.find('div[data-index]').map(function() {
                 return process_div(this);
             }).get().join('\n');
-            // match insdie single echo output
+            // match inside single echo output
             if (!stdout && html.match(/style="width: 100%;?"/)) {
                 stdout = process_div($html);
             }

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Wed, 18 Dec 2019 11:56:23 +0000
+ * Date: Wed, 18 Dec 2019 12:22:00 +0000
  */
 /* global location, setTimeout, window, global, sprintf, setImmediate,
           IntersectionObserver,  ResizeObserver, module, require, define,
@@ -3869,7 +3869,8 @@
     }
     // -----------------------------------------------------------------
     function process_div(element) {
-        return $(element).find('> div')
+        // span is empty line, div is default case with text
+        return $(element).find('> div, > span')
             .map(process_selected_line).get().join('\n').replace(/\n$/, '');
     }
     // -----------------------------------------------------------------
@@ -3882,7 +3883,7 @@
             stdout = $html.find('div[data-index]').map(function() {
                 return process_div(this);
             }).get().join('\n');
-            // match insdie single echo output
+            // match inside single echo output
             if (!stdout && html.match(/style="width: 100%;?"/)) {
                 stdout = process_div($html);
             }
@@ -4062,7 +4063,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Wed, 18 Dec 2019 11:56:23 +0000',
+        date: 'Wed, 18 Dec 2019 12:22:00 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',

diff --git a/js/jquery.terminal.min.js b/js/jquery.terminal.min.js
diff --git a/js/jquery.terminal.min.js.map b/js/jquery.terminal.min.js.map