merge with devel

jcubic · Mar 24, 2018 · 9fe0536 · 9fe0536
2 parents e3aa7d1 + 20ebec4
commit 9fe0536
Show file tree

Hide file tree

Showing 22 changed files with 907 additions and 513 deletions.
diff --git a/.npmignore b/.npmignore
@@ -22,4 +22,4 @@ options
 files
 contributors
 update-contributors
-*.in
+templates
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 1.14.0
+
+### Features
+* pass options to formatters and accept option unixFormattingEscapeBrackets in unix_formatting
+  (PR by [Marcel Link](https://github.com/ml1nk)
+* improve performance of repaint and layout whole page when changing content of the terminal
+* use ch unit for wide characters if browser support it (it have wide support then css variables)
+* keymap terminal method and allow to set shortcuts on runtime
+
+### Bugs
+* fix newline as first character in formatting [#375](https://github.com/jcubic/jquery.terminal/pull/375).
+* fix error when echo undefined (it will echo string undefined since it's converted to string)
+* fix first argument to keymap function, it's now keypress event
+* fix resizing issue when scrollbar appear/disappear while you type
+  [#378](https://github.com/jcubic/jquery.terminal/issues/378)
+* fix cut of cursor when command line had full length lines and it was at the end
+  [#379](https://github.com/jcubic/jquery.terminal/issues/379)
+
 ## 1.12.1
 * fix minified css file + fix scrollbar
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -42,3 +42,8 @@ you can also run test covarage using
 ```
 make coverage
 ```
+
+## README
+
+if you want to modify readme please modify the one in templates directory because that one is source file with {{VER}}
+markers that get filled with current version.
diff --git a/Makefile b/Makefile
@@ -18,13 +18,15 @@ SPEC_CHECKSUM=`md5sum spec/terminalSpec.js | cut -d' ' -f 1`
 COMMIT=`git log -n 1 | grep commit | sed 's/commit //'`
 URL=`git config --get remote.origin.url`
 
+.PHONY: coverage
+
 ALL: Makefile .$(VERSION) terminal.jquery.json bower.json package.json js/jquery.terminal-$(VERSION).js js/jquery.terminal.js js/jquery.terminal-$(VERSION).min.js js/jquery.terminal.min.js css/jquery.terminal-$(VERSION).css css/jquery.terminal-$(VERSION).min.css css/jquery.terminal.min.css css/jquery.terminal.css README.md import.html js/terminal.widget.js www/Makefile
 
-bower.json: bower.in .$(VERSION)
-	$(SED) -e "s/{{VER}}/$(VERSION)/g" bower.in > bower.json
+bower.json: templates/bower.in .$(VERSION)
+	$(SED) -e "s/{{VER}}/$(VERSION)/g" templates/bower.in > bower.json
 
-package.json: package.in .$(VERSION)
-	$(SED) -e "s/{{VER}}/$(VERSION)/g" package.in > package.json
+package.json: templates/package.in .$(VERSION)
+	$(SED) -e "s/{{VER}}/$(VERSION)/g" templates/package.in > package.json
 
 js/jquery.terminal-$(VERSION).js: js/jquery.terminal-src.js .$(VERSION)
 	$(GIT) branch | grep '* devel' > /dev/null && $(SED) -e "s/{{VER}}/DEV/g" -e "s/{{DATE}}/$(DATE)/g" js/jquery.terminal-src.js > js/jquery.terminal-$(VERSION).js || $(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s/{{DATE}}/$(DATE)/g" js/jquery.terminal-src.js > js/jquery.terminal-$(VERSION).js
@@ -50,21 +52,21 @@ css/jquery.terminal.min.css: css/jquery.terminal-$(VERSION).min.css
 css/jquery.terminal-$(VERSION).min.css: css/jquery.terminal-$(VERSION).css
 	$(CSSNANO) css/jquery.terminal-$(VERSION).css css/jquery.terminal-$(VERSION).min.css --no-discardUnused --safe
 
-README.md: README.in .$(VERSION)
+README.md: templates/README.in .$(VERSION)
 	$(GIT) branch | grep '* devel' > /dev/null && $(SED) -e "s/{{VER}}/DEV/g" -e \
 	"s/{{BRANCH}}/$(BRANCH)/g" -e "s/{{CHECKSUM}}/$(SPEC_CHECKSUM)/" \
-	-e "s/{{COMMIT}}/$(COMMIT)/g" < README.in > README.md || $(SED) -e \
+	-e "s/{{COMMIT}}/$(COMMIT)/g" < templates/README.in > README.md || $(SED) -e \
 	"s/{{VER}}/$(VERSION)/g" -e "s/{{BRANCH}}/$(BRANCH)/g" -e \
-	"s/{{CHECKSUM}}/$(SPEC_CHECKSUM)/" -e "s/{{COMMIT}}/$(COMMIT)/g" < README.in > README.md
+	"s/{{CHECKSUM}}/$(SPEC_CHECKSUM)/" -e "s/{{COMMIT}}/$(COMMIT)/g" < templates/README.in > README.md
 
 .$(VERSION): Makefile
 	touch .$(VERSION)
 
-Makefile: Makefile.in
-	$(SED) -e "s/{{VER""SION}}/"$(VERSION)"/" Makefile.in > Makefile
+Makefile: templates/Makefile.in
+	$(SED) -e "s/{{VER""SION}}/"$(VERSION)"/" templates/Makefile.in > Makefile
 
-import.html: import.in
-	$(SED) -e "s/{{BRANCH}}/$(BRANCH)/g" import.in > import.html
+import.html: templates/import.in
+	$(SED) -e "s/{{BRANCH}}/$(BRANCH)/g" templates/import.in > import.html
 
 js/terminal.widget.js: js/terminal.widget.in
 	$(GIT) branch | grep '* devel' > /dev/null || $(SED) -e "s/{{VER}}/$(VERSION)/g" js/terminal.widget.in > js/terminal.widget.js
@@ -78,7 +80,7 @@ www/Makefile: $(wildcard www/Makefile.in) Makefile .$(VERSION)
 test:
 	$(JASMINE) --captureExceptions --verbose --junitreport --color --forceexit spec
 
-cover:
+coverage:
 	$(ISTANBUL) cover node_modules/jasmine/bin/jasmine.js
 
 coveralls:

diff --git a/README.md b/README.md
@@ -4,17 +4,18 @@
   __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /
  /  / // // // // // ___// / / // / / // ___// / / / / // // /\  // // / /__
  \___//____ \\___//____//_/ _\_  / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
-           \/              /____/                              version 1.12.1
+           \/              /____/                              version DEV
 ```
 http://terminal.jcubic.pl
 
-[![npm](https://img.shields.io/badge/npm-1.12.1-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
-![bower](https://img.shields.io/badge/bower-1.12.1-yellow.svg)
-[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=master&d76c147a6f7e17ec861355a4bc09a202e321b20d)](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&020287b3e681eabd0aee6b4f291208d57f4329e6)](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&705f81311e25989b4ee57676db0f7564)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&a403bddc443d55ece038847bb49f3786)](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)
+[![](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded)](https://www.jsdelivr.com/package/npm/jquery.terminal)
 
 ### Summary
 
@@ -67,20 +68,20 @@ Include jQuery library, you can use cdn from http://jquery.com/download/
 ```
 
 
-Then include js/jquery.terminal-1.12.1.min.js and css/jquery.terminal-1.12.1.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.12.1/js/jquery.terminal.min.js"></script>
-<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.12.1/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.12.1/js/jquery.terminal.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@1.12.1/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):

diff --git a/css/jquery.terminal-1.12.1.css b/css/jquery.terminal-1.12.1.css
@@ -4,15 +4,15 @@
  *  __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /
  * /  / // // // // // ___// / / // / / // ___// / / / / // // /\  // // / /__
  * \___//____ \\___//____//_/ _\_  / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
- *           \/              /____/                              version 1.12.1
+ *           \/              /____/                              version DEV
  * http://terminal.jcubic.pl
  *
  * This file is part of jQuery Terminal.
  *
  * Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Sat, 03 Mar 2018 21:54:25 +0000
+ * Date: Fri, 23 Mar 2018 20:04:17 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -67,7 +67,10 @@
     position: relative;
     /*overflow: hidden;*/
     overflow-y: auto;
-    overflow-x: hidden;
+    /* overflow-x: hidden; */
+}
+.terminal, .cmd {
+    contain: content;
 }
 body.terminal {
     height: 100%;
@@ -77,6 +80,20 @@ body.terminal {
 .terminal > div {
     overflow: hidden;
 }
+.terminal > .resizer, .terminal > .font .resizer{
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    overflow: hidden;
+    z-index: -1;
+    visibility: hidden;
+    height: 100%;
+    border: none;
+    padding: 0;
+    width: 100%
+}
 .cmd {
     padding: 0;
     position: relative;

diff --git a/css/jquery.terminal-1.12.1.min.css b/css/jquery.terminal-1.12.1.min.css
diff --git a/css/jquery.terminal-src.css b/css/jquery.terminal-src.css
@@ -67,7 +67,10 @@
     position: relative;
     /*overflow: hidden;*/
     overflow-y: auto;
-    overflow-x: hidden;
+    /* overflow-x: hidden; */
+}
+.terminal, .cmd {
+    contain: content;
 }
 body.terminal {
     height: 100%;
@@ -77,6 +80,20 @@ body.terminal {
 .terminal > div {
     overflow: hidden;
 }
+.terminal > .resizer, .terminal > .font .resizer{
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    overflow: hidden;
+    z-index: -1;
+    visibility: hidden;
+    height: 100%;
+    border: none;
+    padding: 0;
+    width: 100%
+}
 .cmd {
     padding: 0;
     position: relative;

diff --git a/css/jquery.terminal.css b/css/jquery.terminal.css
@@ -4,15 +4,15 @@
  *  __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /
  * /  / // // // // // ___// / / // / / // ___// / / / / // // /\  // // / /__
  * \___//____ \\___//____//_/ _\_  / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
- *           \/              /____/                              version 1.12.1
+ *           \/              /____/                              version DEV
  * http://terminal.jcubic.pl
  *
  * This file is part of jQuery Terminal.
  *
  * Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Sat, 03 Mar 2018 21:54:25 +0000
+ * Date: Fri, 23 Mar 2018 20:04:17 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
@@ -67,7 +67,10 @@
     position: relative;
     /*overflow: hidden;*/
     overflow-y: auto;
-    overflow-x: hidden;
+    /* overflow-x: hidden; */
+}
+.terminal, .cmd {
+    contain: content;
 }
 body.terminal {
     height: 100%;
@@ -77,6 +80,20 @@ body.terminal {
 .terminal > div {
     overflow: hidden;
 }
+.terminal > .resizer, .terminal > .font .resizer{
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    overflow: hidden;
+    z-index: -1;
+    visibility: hidden;
+    height: 100%;
+    border: none;
+    padding: 0;
+    width: 100%
+}
 .cmd {
     padding: 0;
     position: relative;