update jquery, jquery.terminal

recca0120 · Jun 19, 2016 · 4f1eb4c · 4f1eb4c
1 parent e30a163
commit 4f1eb4c
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -6,9 +6,10 @@
   "dependencies": {
     "bootstrap-sass": "^3.3.6",
     "codemirror": "^5.15.2",
-    "jquery": "^2.2.4",
+    "jquery": "^3.0.0",
+    "jquery-migrate": "^3.0.0",
     "jquery-mousewheel": "^3.1.13",
-    "jquery.terminal": "^0.10.11",
+    "jquery.terminal": "^0.10.12",
     "laravel-elixir": "^6.0.0-2"
   }
 }
diff --git a/public/css/bundle.css b/public/css/bundle.css
diff --git a/public/js/bundle.js b/public/js/bundle.js
diff --git a/resources/assets/js/bundle.js b/resources/assets/js/bundle.js
@@ -200,8 +200,8 @@ class Terminal extends Commands {
             let parent = this.$element.parent();
             let width, height;
             if (parent.prop('tagName').toLowerCase() === 'body') {
-                width = parent.width()-20;
-                height = parent.height()-20;
+                width = parent.width() - 20;
+                height = parent.height() - 20;
             } else {
                 width = parent.width();
                 height = parent.height();

diff --git a/resources/assets/js/jquery.js b/resources/assets/js/jquery.js
@@ -1,10 +1,12 @@
 'user strict';
 
 let $;
-if (!window.jQuery) {
-    $ = window.jQuery = window.$ = require('jquery');
+if (!global.jQuery) {
+    $ = global.jQuery = global.$ = require('jquery');
+    $.migrateMute = true;
+    require('jquery-migrate');
 } else {
-    $ = window.jQuery;
+    $ = global.jQuery;
 }
 
 export default $;
diff --git a/resources/assets/sass/bundle.scss b/resources/assets/sass/bundle.scss
@@ -5,12 +5,63 @@
 @import 'node_modules/codemirror/theme/monokai';
 
 #terminal-shell,
-#panel-terminal-shell
 {
     padding: 10px 10px !important;
     min-width: 480px;
 }
 
+.terminal-panel {
+    padding: 10px 10px !important;
+    color: rgb(170, 170, 170) !important;
+    font-family: monospace !important;
+    font-style: normal !important;
+    font-variant: normal !important;
+    font-weight: normal !important;
+    font-size: 12px;
+    overflow-x: hidden;
+    a {
+        color: #0f60ff !important;
+        &:hover {
+            color: red !important;
+            text-decoration: underline !important;
+        }
+    }
+}
+
 .CodeMirror-fullscreen {
     z-index: 50000 !important;
 }
+//
+// <style class="tracy-debug">
+// .Laravel-TerminalPanel {
+//     min-width: 700px;
+//     min-height: 500px;
+//     background: #000;
+//     overflow-x: hidden !important;
+// }
+//
+// .Laravel-TerminalPanel #panel-shell {
+//     margin: 10px 15px;
+// }
+//
+// .Laravel-TerminalPanel div,
+// .Laravel-TerminalPanel span,
+// .Laravel-TerminalPanel a {
+//     background: #000;
+//     color: rgb(170, 170, 170);
+//     font-family: monospace;
+//     font-size: 12px;
+//     font-style: normal;
+//     font-variant: normal;
+//     font-weight: normal;
+// }
+//
+// .Laravel-TerminalPanel a {
+//     color: #0f60ff !important;
+// }
+//
+// .Laravel-TerminalPanel a:hover {
+//     color: red !important;
+//     text-decoration: underline !important;
+// }
+// </style>
diff --git a/resources/views/panel.blade.php b/resources/views/panel.blade.php
@@ -1,4 +1,7 @@
-<div id="panel-terminal-shell"></div>
+@php
+    $id = str_random(30);
+@endphp
+<div id="panel-terminal-shell-{{ $id }}" class="terminal-panel"></div>
 <script>
 (function() {
     var loadStyle = function(id, filename) {
@@ -55,7 +58,7 @@
     };
 
     loadScript('terminal' ,scripts.terminal, function () {
-        new Terminal("#panel-terminal-shell", {!! $options !!});
+        new Terminal("#panel-terminal-shell-{{ $id }}", {!! $options !!});
     });
 })();
 </script>
diff --git a/src/Console/Commands/Cleanup.php b/src/Console/Commands/Cleanup.php
@@ -23,6 +23,11 @@ class Cleanup extends Command
      */
     protected $description = 'cleanup vendor folder';
 
+    /**
+     * $filesystem.
+     *
+     * @var \Illuminate\Filesystem\Filesystem
+     */
     protected $filesystem;
 
     /**
@@ -51,6 +56,12 @@ public function handle(Filesystem $filesystem)
         $this->cleanupComposer(realpath($root.'/vendor'));
     }
 
+    /**
+     * cleanupDirectories.
+     * @method cleanupDirectories
+     *
+     * @param  array             $directories
+     */
     public function cleanupDirectories($directories)
     {
         foreach ($directories as $directory) {
@@ -59,6 +70,13 @@ public function cleanupDirectories($directories)
         }
     }
 
+    /**
+     * cleanupComposer.
+     *
+     * @method cleanupComposer
+     *
+     * @param  string          $vendorDirectory
+     */
     public function cleanupComposer($vendorDirectory)
     {
         $rules = static::getRules();
@@ -77,6 +95,13 @@ public function cleanupComposer($vendorDirectory)
         }
     }
 
+    /**
+     * cleanup.
+     *
+     * @method cleanup
+     *
+     * @param  array $files
+     */
     public function cleanup($files)
     {
         if (count($files) === 0) {
@@ -97,6 +122,13 @@ public function cleanup($files)
         }
     }
 
+    /**
+     * getRules.
+     *
+     * @method getRules
+     * 
+     * @return array
+     */
     public static function getRules()
     {
         // Default patterns for common files