merge with devel

Author: jcubic

CHANGELOG.md

@@ -1,3 +1,10 @@
+## Next
+* create empty div for function line that return empty string, that was causing issues with update
+  [#363](https://github.com/jcubic/jquery.terminal/issues/363)
+* set classes from terminal to fake terminal that is used to calculate character size
+* don't use length css variable on formatting when length is the same as wcwidth
+* css fixes for terminal in jQuery UI dialog (dterm)
+
 ## 1.11.2
 * fix issue with --char-width == 0 if terminal have display:none
 * fix DELETE numpad key on IE

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Jakub Jankiewicz
+Copyright (c) 2011-2018 Jakub Jankiewicz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.in

@@ -186,4 +186,4 @@ If you want to contrubite read [CONTRIBUTING.md](CONTRIBUTING.md) first. Here ar
 
 Licensed under [MIT](http://opensource.org/licenses/MIT) license
 
-Copyright (c) 2011-2017 [Jakub Jankiewicz](http://jcubic.pl/jakub-jankiewicz)
+Copyright (c) 2011-2018 [Jakub Jankiewicz](http://jcubic.pl/jakub-jankiewicz)

README.md

@@ -4,15 +4,15 @@
   __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /
  /  / // // // // // ___// / / // / / // ___// / / / / // // /\  // // / /__
  \___//____ \\___//____//_/ _\_  / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
-           \/              /____/                              version 1.11.2
+           \/              /____/                              version DEV
 ```
 http://terminal.jcubic.pl
 
-[![npm](https://img.shields.io/badge/npm-1.11.2-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
-![bower](https://img.shields.io/badge/bower-1.11.2-yellow.svg)
-[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=master)](https://travis-ci.org/jcubic/jquery.terminal)
+[![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)](https://travis-ci.org/jcubic/jquery.terminal)
 [![Known Vulnerabilities](https://snyk.io/test/npm/jquery.terminal/badge.svg)](https://snyk.io/test/npm/jquery.terminal)
-[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=master&a5d5e31e60f437ec7098a886ab4bc6d8)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&a5d5e31e60f437ec7098a886ab4bc6d8)](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)
 
@@ -67,20 +67,20 @@ Include jQuery library, you can use cdn from http://jquery.com/download/
 ```
 
 
-Then include js/jquery.terminal-1.11.2.min.js and css/jquery.terminal-1.11.2.min.css
+Then include js/jquery.terminal-DEV.min.js and css/jquery.terminal-DEV.min.css
 
 You can grab the files from CDN:
 
 ```html
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.11.2/js/jquery.terminal.min.js"></script>
-<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.11.2/css/jquery.terminal.min.css" rel="stylesheet"/>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/js/jquery.terminal.min.js"></script>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/css/jquery.terminal.min.css" rel="stylesheet"/>
 ```
 
 or
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@1.11.2/js/jquery.terminal.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@1.11.2/css/jquery.terminal.min.css">
+<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/js/jquery.terminal.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/css/jquery.terminal.min.css">
 ```
 
 If you always want latest version, you can grab the files directly from github using rawgit.com (that service grab the files from github and use propert MIME type so you can use it in your page, you can also grab from devel branch):
@@ -186,4 +186,4 @@ If you want to contrubite read [CONTRIBUTING.md](CONTRIBUTING.md) first. Here ar
 
 Licensed under [MIT](http://opensource.org/licenses/MIT) license
 
-Copyright (c) 2011-2017 [Jakub Jankiewicz](http://jcubic.pl/jakub-jankiewicz)
+Copyright (c) 2011-2018 [Jakub Jankiewicz](http://jcubic.pl/jakub-jankiewicz)

css/jquery.terminal-1.11.2.css

@@ -4,15 +4,15 @@
  *  __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /
  * /  / // // // // // ___// / / // / / // ___// / / / / // // /\  // // / /__
  * \___//____ \\___//____//_/ _\_  / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
- *           \/              /____/                              version 1.11.2
+ *           \/              /____/                              version DEV
  * http://terminal.jcubic.pl
  *
  * This file is part of jQuery Terminal.
  *
- * Copyright (c) 2011-2017 Jakub Jankiewicz <http://jcubic.pl>
+ * Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Thu, 28 Dec 2017 08:38:49 +0000
+ * Date: Sun, 07 Jan 2018 08:27:00 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -113,6 +113,9 @@ body.terminal {
     line-height: 14px;
     height: auto;
 }
+.terminal .terminal-output > div:not(.raw) div {
+    white-space: nowrap;
+}
 .cmd .prompt > span {
     float: left;
 }
@@ -132,15 +135,14 @@ body.terminal {
 .cmd .prompt + div {
     clear: right;
 }
-.terminal-output > div, .terminal-output > div > div {
-    /*padding-top: 3px;*/
+.terminal-output > div > div {
     min-height: 14px;
 }
 terminal .terminal-output > div {
     margin-top: -1px;
 }
-.terminal-output > div > div * {
-    overflow-wrap: break-word; /* when echo html */
+.terminal-output > div.raw > div * {
+    overflow-wrap: break-word;
     word-wrap: break-word;
 }
 .terminal .font {
@@ -263,9 +265,8 @@ terminal .terminal-output > div {
     width: 100%;
     height: 100%;
     box-sizing: border-box;
-    padding: 0;
 }
-.ui-dialog-content .terminal, .ui-dialog-content .terminal .terminal-fill {
+.ui-dialog .ui-dialog-content.dterm {
     padding: 0;
 }
 .clear {
@@ -469,11 +470,11 @@ terminal .terminal-output > div {
         width: calc(var(--length, 1) * var(--char-width) * 1px);
         display: inline-block;
     }
-    .terminal, .cmd, .terminal .terminal-output div div, .cmd .prompt {
+    .terminal, .cmd, .terminal .terminal-output > div > div, .cmd .prompt {
         font-size: calc(var(--size, 1) * 12px);
         line-height: calc(var(--size, 1) * 14px);
     }
-    .terminal .terminal-output div div {
+    .terminal .terminal-output > div > div {
         min-height: calc(var(--size, 1) * 14px);
     }
     .terminal .inverted, .cmd .inverted {

css/jquery.terminal-1.11.2.min.css

@@ -9,7 +9,7 @@
  *
  * This file is part of jQuery Terminal.
  *
- * Copyright (c) 2011-2017 Jakub Jankiewicz <http://jcubic.pl>
+ * Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
  * Date: {{DATE}}
@@ -113,6 +113,9 @@ body.terminal {
     line-height: 14px;
     height: auto;
 }
+.terminal .terminal-output > div:not(.raw) div {
+    white-space: nowrap;
+}
 .cmd .prompt > span {
     float: left;
 }
@@ -132,15 +135,14 @@ body.terminal {
 .cmd .prompt + div {
     clear: right;
 }
-.terminal-output > div, .terminal-output > div > div {
-    /*padding-top: 3px;*/
+.terminal-output > div > div {
     min-height: 14px;
 }
 terminal .terminal-output > div {
     margin-top: -1px;
 }
-.terminal-output > div > div * {
-    overflow-wrap: break-word; /* when echo html */
+.terminal-output > div.raw > div * {
+    overflow-wrap: break-word;
     word-wrap: break-word;
 }
 .terminal .font {
@@ -263,9 +265,8 @@ terminal .terminal-output > div {
     width: 100%;
     height: 100%;
     box-sizing: border-box;
-    padding: 0;
 }
-.ui-dialog-content .terminal, .ui-dialog-content .terminal .terminal-fill {
+.ui-dialog .ui-dialog-content.dterm {
     padding: 0;
 }
 .clear {
@@ -469,11 +470,11 @@ terminal .terminal-output > div {
         width: calc(var(--length, 1) * var(--char-width) * 1px);
         display: inline-block;
     }
-    .terminal, .cmd, .terminal .terminal-output div div, .cmd .prompt {
+    .terminal, .cmd, .terminal .terminal-output > div > div, .cmd .prompt {
         font-size: calc(var(--size, 1) * 12px);
         line-height: calc(var(--size, 1) * 14px);
     }
-    .terminal .terminal-output div div {
+    .terminal .terminal-output > div > div {
         min-height: calc(var(--size, 1) * 14px);
     }
     .terminal .inverted, .cmd .inverted {

css/jquery.terminal-src.css

@@ -4,15 +4,15 @@
  *  __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /
  * /  / // // // // // ___// / / // / / // ___// / / / / // // /\  // // / /__
  * \___//____ \\___//____//_/ _\_  / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
- *           \/              /____/                              version 1.11.2
+ *           \/              /____/                              version DEV
  * http://terminal.jcubic.pl
  *
  * This file is part of jQuery Terminal.
  *
- * Copyright (c) 2011-2017 Jakub Jankiewicz <http://jcubic.pl>
+ * Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Thu, 28 Dec 2017 08:38:49 +0000
+ * Date: Sun, 07 Jan 2018 08:27:00 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -113,6 +113,9 @@ body.terminal {
     line-height: 14px;
     height: auto;
 }
+.terminal .terminal-output > div:not(.raw) div {
+    white-space: nowrap;
+}
 .cmd .prompt > span {
     float: left;
 }
@@ -132,15 +135,14 @@ body.terminal {
 .cmd .prompt + div {
     clear: right;
 }
-.terminal-output > div, .terminal-output > div > div {
-    /*padding-top: 3px;*/
+.terminal-output > div > div {
     min-height: 14px;
 }
 terminal .terminal-output > div {
     margin-top: -1px;
 }
-.terminal-output > div > div * {
-    overflow-wrap: break-word; /* when echo html */
+.terminal-output > div.raw > div * {
+    overflow-wrap: break-word;
     word-wrap: break-word;
 }
 .terminal .font {
@@ -263,9 +265,8 @@ terminal .terminal-output > div {
     width: 100%;
     height: 100%;
     box-sizing: border-box;
-    padding: 0;
 }
-.ui-dialog-content .terminal, .ui-dialog-content .terminal .terminal-fill {
+.ui-dialog .ui-dialog-content.dterm {
     padding: 0;
 }
 .clear {
@@ -469,11 +470,11 @@ terminal .terminal-output > div {
         width: calc(var(--length, 1) * var(--char-width) * 1px);
         display: inline-block;
     }
-    .terminal, .cmd, .terminal .terminal-output div div, .cmd .prompt {
+    .terminal, .cmd, .terminal .terminal-output > div > div, .cmd .prompt {
         font-size: calc(var(--size, 1) * 12px);
         line-height: calc(var(--size, 1) * 14px);
     }
-    .terminal .terminal-output div div {
+    .terminal .terminal-output > div > div {
         min-height: calc(var(--size, 1) * 14px);
     }
     .terminal .inverted, .cmd .inverted {