Skip to content

Commit

Permalink
Fix focus on click #255
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcubic
jcubic committed Sep 29, 2016
1 parent 07c49ae commit b265dd3
Show file tree
Hide file tree
Showing 15 changed files with 42 additions and 38 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
0.11.10 fix focus on click
0.11.9 fix outputLimit option
0.11.8 add scrollOnEcho option
0.11.7 fix History::last
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=0.11.9
VERSION=0.11.10
COMPRESS=uglifyjs
SED=sed
CP=cp
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
__ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
/ / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
\___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
\/ /____/ version 0.11.9
\/ /____/ version 0.11.10
```
http://terminal.jcubic.pl

Expand Down Expand Up @@ -61,27 +61,27 @@ or npm:
npm install --save jquery.terminal
```

Include js/jquery.terminal-0.11.9.min.js and css/jquery.terminal-0.11.9.css
Include js/jquery.terminal-0.11.10.min.js and css/jquery.terminal-0.11.10.css
You can also include js/jquery.mousewheel-min.js

```html
<script src="js/jquery.terminal-0.11.9.min.js"></script>
<script src="js/jquery.terminal-0.11.10.min.js"></script>
<script src="js/jquery.mousewheel-min.js"></script>
<link href="css/jquery.terminal-0.11.9.css" rel="stylesheet"/>
<link href="css/jquery.terminal-0.11.10.css" rel="stylesheet"/>
```

You can also grab the files from CDN:

```html
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/0.11.9/js/jquery.terminal.min.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/0.11.9/css/jquery.terminal.min.css" rel="stylesheet"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/0.11.10/js/jquery.terminal.min.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/0.11.10/css/jquery.terminal.min.css" rel="stylesheet"/>
```

or

```html
<script src="https://cdn.jsdelivr.net/jquery.terminal/0.11.9/jquery.terminal.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/jquery.terminal/0.11.9/jquery.terminal.min.css">
<script src="https://cdn.jsdelivr.net/jquery.terminal/0.11.10/jquery.terminal.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/jquery.terminal/0.11.10/jquery.terminal.min.css">
```

And you're good to go.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery.terminal",
"version": "0.11.9",
"version": "0.11.10",
"main": [
"js/jquery.terminal.min.js",
"js/jquery.mousewheel-min.js",
Expand Down
4 changes: 2 additions & 2 deletions css/jquery.terminal-0.11.9.css → css/jquery.terminal-0.11.10.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
* \/ /____/ version 0.11.9
* \/ /____/ version 0.11.10
* http://terminal.jcubic.pl
*
* This file is part of jQuery Terminal.
*
* Copyright (c) 2011-2016 Jakub Jankiewicz <http://jcubic.pl>
* Released under the MIT license
*
* Date: Thu, 22 Sep 2016 17:16:21 +0000
* Date: Thu, 29 Sep 2016 10:36:59 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
Expand Down
4 changes: 2 additions & 2 deletions css/jquery.terminal-0.11.9.min.css → css/jquery.terminal-0.11.10.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions css/jquery.terminal.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
* \/ /____/ version 0.11.9
* \/ /____/ version 0.11.10
* http://terminal.jcubic.pl
*
* This file is part of jQuery Terminal.
*
* Copyright (c) 2011-2016 Jakub Jankiewicz <http://jcubic.pl>
* Released under the MIT license
*
* Date: Thu, 22 Sep 2016 17:16:21 +0000
* Date: Thu, 29 Sep 2016 10:36:59 +0000
*/
.terminal .terminal-output .format, .cmd .format,
.cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{
Expand Down
4 changes: 2 additions & 2 deletions css/jquery.terminal.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions js/jquery.terminal-0.11.9.js → js/jquery.terminal-0.11.10.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
* \/ /____/ version 0.11.9
* \/ /____/ version 0.11.10
*
* This file is part of jQuery Terminal. http://terminal.jcubic.pl
*
Expand All @@ -31,7 +31,7 @@
* Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
* licensed under 3 clause BSD license
*
* Date: Thu, 22 Sep 2016 17:16:17 +0000
* Date: Thu, 29 Sep 2016 10:36:55 +0000
*/

/* TODO:
Expand Down Expand Up @@ -1975,7 +1975,7 @@
var format_last_re = /\[\[[!gbiuso]*;[^;]*;[^\]]*\]?$/i;
var format_exec_re = /(\[\[(?:[^\]]|\\\])*\]\])/;
$.terminal = {
version: '0.11.9',
version: '0.11.10',
// colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
color_names: [
'black', 'silver', 'gray', 'white', 'maroon', 'red', 'purple',
Expand Down Expand Up @@ -5194,7 +5194,8 @@
var wasDragging = isDragging;
isDragging = false;
$(window).unbind('mousemove');
if (!wasDragging && count++ == 1) {
if (!wasDragging && ++count == 1) {
count = 0;
if (!self.enabled()) {
self.focus();
command_line.enable();
Expand Down
8 changes: 4 additions & 4 deletions js/jquery.terminal-0.11.9.min.js → js/jquery.terminal-0.11.10.min.js
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion js/jquery.terminal-src.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5194,7 +5194,8 @@
var wasDragging = isDragging;
isDragging = false;
$(window).unbind('mousemove');
if (!wasDragging && count++ == 1) {
if (!wasDragging && ++count == 1) {
count = 0;
if (!self.enabled()) {
self.focus();
command_line.enable();
Expand Down
9 changes: 5 additions & 4 deletions js/jquery.terminal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
* \/ /____/ version 0.11.9
* \/ /____/ version 0.11.10
*
* This file is part of jQuery Terminal. http://terminal.jcubic.pl
*
Expand All @@ -31,7 +31,7 @@
* Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
* licensed under 3 clause BSD license
*
* Date: Thu, 22 Sep 2016 17:16:17 +0000
* Date: Thu, 29 Sep 2016 10:36:55 +0000
*/

/* TODO:
Expand Down Expand Up @@ -1975,7 +1975,7 @@
var format_last_re = /\[\[[!gbiuso]*;[^;]*;[^\]]*\]?$/i;
var format_exec_re = /(\[\[(?:[^\]]|\\\])*\]\])/;
$.terminal = {
version: '0.11.9',
version: '0.11.10',
// colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
color_names: [
'black', 'silver', 'gray', 'white', 'maroon', 'red', 'purple',
Expand Down Expand Up @@ -5194,7 +5194,8 @@
var wasDragging = isDragging;
isDragging = false;
$(window).unbind('mousemove');
if (!wasDragging && count++ == 1) {
if (!wasDragging && ++count == 1) {
count = 0;
if (!self.enabled()) {
self.focus();
command_line.enable();
Expand Down
8 changes: 4 additions & 4 deletions js/jquery.terminal.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "jquery.terminal",
"version": "0.11.9",
"version": "0.11.10",
"description": "jQuery Terminal Emulator is a plugin for creating command line interpreters in your applications.",
"main": "js/jquery.terminal-0.11.9.js",
"main": "js/jquery.terminal-0.11.10.js",
"keywords": [
"terminal",
"emulator",
Expand Down
2 changes: 1 addition & 1 deletion terminal.jquery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "terminal",
"title": "jQuery Terminal Emulator",
"description": "jQuery Terminal Emulator is a plugin for creating command line interpreters in your applications.",
"version": "0.11.9",
"version": "0.11.10",
"keywords": [
"terminal", "emulator", "prompt", "console", "keyboard", "type", "rpc", "input", "ui"
],
Expand Down

0 comments on commit b265dd3

Please sign in to comment.