Add minified css file and fix file versions

jcubic · May 2, 2016 · c41d02c · c41d02c
1 parent e06648c
commit c41d02c
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
-VERSION=0.10.1
+VERSION=0.10.2
 COMPRESS=uglifyjs
 SED=sed
 CP=cp
 RM=rm
 CAT=cat
 DATE=`date -uR`
 
-ALL: js/jquery.terminal-$(VERSION).js js/jquery.terminal-$(VERSION).min.js js/jquery.terminal-min.js css/jquery.terminal-$(VERSION).css css/jquery.terminal.css README.md www/Makefile terminal.jquery.json bower.json package.json
+ALL: js/jquery.terminal-$(VERSION).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 www/Makefile terminal.jquery.json bower.json package.json
 
 bower.json: bower.in .$(VERSION)
 	$(SED) -e "s/{{VER}}/$(VERSION)/g" bower.in > bower.json
@@ -29,6 +29,12 @@ css/jquery.terminal-$(VERSION).css: css/jquery.terminal-src.css .$(VERSION)
 css/jquery.terminal.css: css/jquery.terminal-$(VERSION).css .$(VERSION)
 	cp css/jquery.terminal-$(VERSION).css css/jquery.terminal.css
 
+css/jquery.terminal-min.css: css/jquery.terminal-$(VERSION).min.css
+	$(CP) css/jquery.terminal-$(VERSION).min.css css/jquery.terminal-min.css
+
+css/jquery.terminal-$(VERSION).min.css: css/jquery.terminal-$(VERSION).css
+	java -jar bin/yuicompressor-2.4.8.jar css/jquery.terminal-$(VERSION).css -o css/jquery.terminal-$(VERSION).min.css
+
 README.md: README.in .$(VERSION)
 	$(SED) -e "s/{{VER}}/$(VERSION)/g" < README.in > README.md
 

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
   __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /
  /  / // // // // // ___// / / // / / // ___// / / / / // // /\  // // / /__
  \___//____ \\___//____//_/ _\_  / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
-           \/              /____/                              version 0.10.1
+           \/              /____/                              version 0.10.2
 ```
 http://terminal.jcubic.pl
 
@@ -61,13 +61,13 @@ or npm:
 npm install --save jquery.terminal
 ```
 
-Include js/jquery.terminal-0.10.1.min.js and css/jquery.terminal-0.10.1.css
+Include js/jquery.terminal-0.10.2.min.js and css/jquery.terminal-0.10.2.css
 You can also include js/jquery.mousewheel-min.js
 
 ```html
-<script src="js/jquery.terminal-0.10.1.min.js"></script>
+<script src="js/jquery.terminal-0.10.2.min.js"></script>
 <script src="js/jquery.mousewheel-min.js"></script>
-<link href="css/jquery.terminal-0.10.1.css" rel="stylesheet"/>
+<link href="css/jquery.terminal-0.10.2.css" rel="stylesheet"/>
 ```
 And you're good to go.
 

diff --git a/bin/yuicompressor-2.4.8.jar b/bin/yuicompressor-2.4.8.jar
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "jquery.terminal",
-    "version": "0.10.1",
+    "version": "0.10.2",
     "main": [
         "js/jquery.terminal-min.js",
         "js/jquery.mousewheel-min.js",

diff --git a/css/jquery.terminal-0.9.3.css → css/jquery.terminal-0.10.2.css b/css/jquery.terminal-0.9.3.css → css/jquery.terminal-0.10.2.css
@@ -1,18 +1,18 @@
-/*
+/*!
  *       __ _____                     ________                              __
  *      / // _  /__ __ _____ ___ __ _/__  ___/__ ___ ______ __ __  __ ___  / /
  *  __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /
  * /  / // // // // // ___// / / // / / // ___// / / / / // // /\  // // / /__
  * \___//____ \\___//____//_/ _\_  / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
- *           \/              /____/                              version 0.9.3
+ *           \/              /____/                              version 0.10.2
  * 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: Sat, 23 Apr 2016 16:48:41 +0000
+ * Date: Mon, 02 May 2016 14:27:49 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{

diff --git a/css/jquery.terminal-0.10.2.min.css b/css/jquery.terminal-0.10.2.min.css
diff --git a/css/jquery.terminal-min.css b/css/jquery.terminal-min.css
diff --git a/css/jquery.terminal-src.css b/css/jquery.terminal-src.css
@@ -1,4 +1,4 @@
-/*
+/*!
  *       __ _____                     ________                              __
  *      / // _  /__ __ _____ ___ __ _/__  ___/__ ___ ______ __ __  __ ___  / /
  *  __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /

diff --git a/css/jquery.terminal.css b/css/jquery.terminal.css
@@ -1,18 +1,18 @@
-/*
+/*!
  *       __ _____                     ________                              __
  *      / // _  /__ __ _____ ___ __ _/__  ___/__ ___ ______ __ __  __ ___  / /
  *  __ / // // // // // _  // _// // / / // _  // _//     // //  \/ // _ \/ /
  * /  / // // // // // ___// / / // / / // ___// / / / / // // /\  // // / /__
  * \___//____ \\___//____//_/ _\_  / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
- *           \/              /____/                              version 0.10.1
+ *           \/              /____/                              version 0.10.2
  * 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: Mon, 02 May 2016 09:53:07 +0000
+ * Date: Mon, 02 May 2016 14:27:49 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{

diff --git a/js/jquery.terminal-0.9.3.js → js/jquery.terminal-0.10.2.js b/js/jquery.terminal-0.9.3.js → js/jquery.terminal-0.10.2.js
@@ -31,7 +31,7 @@
  * Copyright (c) 2007-2013 Alexandru Marasteanu <hello at alexei dot ro>
  * licensed under 3 clause BSD license
  *
- * Date: Fri, 29 Apr 2016 13:02:03 +0000
+ * Date: Mon, 02 May 2016 14:27:44 +0000
  */
 
 /* TODO:
@@ -1949,14 +1949,15 @@
     //var url_re = /https?:\/\/(?:(?!&[^;]+;)[^\s:"'<>)])+/g;
     //var url_re = /\bhttps?:\/\/(?:(?!&[^;]+;)[^\s"'<>)])+\b/g;
     var url_re = /(\bhttps?:\/\/(?:(?:(?!&[^;]+;)|(?=&amp;))[^\s"'<>\]\[)])+\b)/gi;
+    var url_nf_re = /\b(https?:\/\/(?:(?:(?!&[^;]+;)|(?=&amp;))[^\s"'<>\][)])+)\b(?![^[\]]*])/gi;
     var email_re = /((([^<>('")[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,})))/g;
     var command_re = /('[^']*'|"(\\"|[^"])*"|(?:\/(\\\/|[^\/])+\/[gimy]*)(?=:? |$)|(\\ |[^ ])+|[\w-]+)/gi;
     var format_begin_re = /(\[\[[!gbiuso]*;[^;]*;[^\]]*\])/i;
     var format_start_re = /^(\[\[[!gbiuso]*;[^;]*;[^\]]*\])/i;
     var format_last_re = /\[\[[!gbiuso]*;[^;]*;[^\]]*\]?$/i;
     var format_exec_re = /(\[\[(?:[^\]]|\\\])*\]\])/;
     $.terminal = {
-        version: '0.9.3',
+        version: '0.10.2',
         // colors from http://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'black', 'silver', 'gray', 'white', 'maroon', 'red', 'purple',
@@ -3062,7 +3063,7 @@
             // urls should always have formatting to keep url if split
             if (settings.convertLinks) {
                 string = string.replace(email_re, '[[!;;]$1]').
-                    replace(url_re, '[[!;;]$1]');
+                    replace(url_nf_re, '[[!;;]$1]');
             }
             var formatters = $.terminal.defaults.formatters;
             var i, len;

diff --git a/js/jquery.terminal-0.9.3.min.js → js/jquery.terminal-0.10.2.min.js b/js/jquery.terminal-0.9.3.min.js → js/jquery.terminal-0.10.2.min.js
diff --git a/js/jquery.terminal-min.js b/js/jquery.terminal-min.js
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "jquery.terminal",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "jQuery Terminal Emulator is a plugin for creating command line interpreters in your applications.",
-  "main": "js/jquery.terminal-0.10.1.js",
+  "main": "js/jquery.terminal-0.10.2.js",
   "keywords": [
     "terminal",
     "emulator",

diff --git a/terminal.jquery.json b/terminal.jquery.json
@@ -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.10.1",
+    "version": "0.10.2",
     "keywords": [
         "terminal", "emulator", "prompt", "console", "keyboard", "type", "rpc", "input", "ui"
     ],