Skip to content

Commit

Permalink
Update 1.4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Chhekur committed Jun 25, 2019
1 parent 8180327 commit 8eb9470
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 99 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
- New: Integrated Terminal
- Fixed: HTML Preview, When you link css files in your HTML page
- Improvement: App size
- Improvement: UI
- Improvement: UI
- Fixed: Short cut keys for zoomin and zoomout
4 changes: 3 additions & 1 deletion assets/js/terminal.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var os = require('os');
var pty = require('node-pty');
var Terminal = require('xterm').Terminal;
var fs = require('fs');
let fit = require('../../node_modules/xterm/lib/addons/fit/fit.js');

// Initialize node-pty with an appropriate shell
Expand All @@ -11,7 +12,8 @@ const ptyProcess = pty.spawn(shell, [], {
name: 'xterm-color',
// cols: 10,
// rows: 500,
cwd: (file.path != undefined) ? path.join(file.path, '..') : process.env.HOME,
cwd: ((file.path != undefined) && (fs.existsSync(file.path))) ? path.join(file.path, '..') : process.env.HOME,
// cwd: '.',
env: process.env
});
console.log(file.path);
Expand Down
164 changes: 69 additions & 95 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Colon",
"version": "1.4.3",
"version": "1.4.4",
"description": "A flexible text editor",
"author": "Harendra Chhekur <[email protected]>",
"main": "main.js",
Expand All @@ -21,7 +21,7 @@
"discord-rpc": "^3.0.1",
"electron-log": "^2.2.17",
"electron-updater": "^4.0.6",
"localtunnel": "^1.9.1",
"localtunnel": "^1.9.2",
"node-pty": "^0.8.1",
"ps-tree": "^1.2.0",
"showdown": "^1.8.6",
Expand Down

0 comments on commit 8eb9470

Please sign in to comment.