Skip to content

Commit

Permalink
phpcs fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Recca Tsai committed Sep 11, 2016
1 parent 8700ab2 commit b55888a
Show file tree
Hide file tree
Showing 13 changed files with 125 additions and 126 deletions.
8 changes: 4 additions & 4 deletions config/terminal.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

return [
'enabled' => true,
'enabled' => true,
'whitelists' => [],
'route' => [
'prefix' => 'terminal',
'as' => 'terminal.',
'route' => [
'prefix' => 'terminal',
'as' => 'terminal.',
'middleware' => ['web'],
],
];
4 changes: 1 addition & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ elixir((mix) => {
.sass([
'bundle.scss'
], `${cssOutputFolder}/bundle.css`)
.rollup('bundle.js', `${jsOutputFolder}/bundle.js`, null, {
moduleName: 'Terminal'
})
.webpack('bundle.js', `${jsOutputFolder}/bundle.js`)
.browserSync({
files: [
'src/**/*.php',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"jquery.terminal": "^0.11.0",
"laravel-elixir": "^6.0.0-10",
"laravel-elixir-browsersync-official": "^1.0.0",
"laravel-elixir-rollup-official": "^1.0.4"
"laravel-elixir-webpack-official": "^1.0.5"
}
}
4 changes: 2 additions & 2 deletions public/css/bundle.css

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

31 changes: 15 additions & 16 deletions public/js/bundle.js

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion resources/assets/js/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Mysql from './commands/mysql';
import Tinker from './commands/tinker';
import Vi from './commands/vi';

export default class Terminal {
class Terminal {
constructor(element, options = {}) {
this.$element = $(element);
this.$parent = this.$element.parent();
Expand Down Expand Up @@ -131,6 +131,7 @@ export default class Terminal {
let os = this.question(`${this.options.os}`);
let path = this.comment(`${this.options.basePath}`);
this.$term.echo(`${host} ${os} ${path}`);
this.scrollToBottom();
}

error(text) {
Expand Down Expand Up @@ -190,6 +191,7 @@ export default class Terminal {
this.$term.echo(title);
}
this.$term.echo(message);
this.api.scrollToBottom();
this.$term.push((result) => {
if (this.toBoolean(result) === true) {
resolve(true);
Expand Down Expand Up @@ -224,3 +226,5 @@ export default class Terminal {
return false;
}
};

window.Terminal = Terminal;
2 changes: 0 additions & 2 deletions resources/assets/js/commands/command.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ export default class Command {
this.api.loading.hide();
this.api.echo(responseResult);
this.api.serverInfo();
this.api.scrollToBottom();
}, (response) => {
let responseResult = response.result ? response.result : response;
this.api.loading.hide();
this.api.echo(responseResult);
this.api.serverInfo();
this.api.scrollToBottom();
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/Console/Commands/Artisan.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Artisan extends Command
* @var array
*/
protected $notSupport = [
'down' => '',
'down' => '',
'tinker' => '',
];

Expand Down
Loading

0 comments on commit b55888a

Please sign in to comment.