Update an App(console) [0.0.3]

diff --git a/app/console/console.css b/app/console/console.css
index f34ff55..c8f23a4 100644 (file)
--- a/app/console/console.css
+++ b/app/console/console.css
@@ -19,13 +19,16 @@
     margin: 9px;
     margin-right: 0px;
 }
-.winc-console .simple-box{
+.winc-console .console-wrapper{
+    padding: 2px;
     border : 1px solid gray;
     margin-top : 10px;
+    overflow: auto;
+}
+.winc-console .simple-box{
     font-size: 13px;
-    padding: 5px;
+    padding: 2px;
     height: 100px;
-    overflow-y: scroll;
 }
 
 .winc-console .simple-box::selection{

diff --git a/app/console/console.js b/app/console/console.js
index 1bb7e2f..0a39c8c 100644 (file)
--- a/app/console/console.js
+++ b/app/console/console.js
@@ -1,9 +1,10 @@
 app_console(pid);
-var prevCommand;
 
 function app_console(_pid) {
+    let prevCommand = "";
+
     $("#w" + _pid).resizable({
-        alsoResize: "#w" + _pid + " .simple-box",
+        alsoResize: "#w" + _pid + " .console-wrapper",
         minWidth: "200"
     });
 
@@ -11,16 +12,26 @@ function app_console(_pid) {
         var log = $("#winc"+_pid+" .simple-box").html();
         var exec = $("#winc"+_pid+" .textbox").val();
         prevCommand = exec;
-        $("#winc"+_pid+" .simple-box").html(exec+"<br><span class='fa fa-arrow-left'></span>");
-        $("#winc"+_pid+" .simple-box").append( JSON.stringify( eval(exec) )+"<br><div class='console-log'>"+log+"</div>");
+        var _return = JSON.stringify( eval(exec) );
+        if( _return ){
+            $("#winc"+_pid+" .simple-box").html(exec+"<br><span class='fa fa-arrow-left'></span>");
+            $("#winc"+_pid+" .simple-box").append( _return+"<br><div class='console-log'>"+log+"</div>");
+        }
         $("#winc"+_pid+" .textbox").val("");
     });
+
     $("#winc"+_pid+" .textbox").keypress(function(e){
         if(e.which == 13){
             $("#winc"+_pid+" .console-exec").click();
         }
-        else if(e.which == 38){
+      });
+
+      $(document).on("keydown", "#winc"+_pid+" .textbox", function(e){
+        if(e.which == 38){
             $("#winc"+_pid+" .textbox").val(prevCommand);
         }
+        else if(e.which == 40){
+            $("#winc"+_pid+" .textbox").val("");
+        }
       });
 }
\ No newline at end of file

diff --git a/app/console/default.html b/app/console/default.html
index 5016f94..7a46711 100644 (file)
--- a/app/console/default.html
+++ b/app/console/default.html
@@ -1,3 +1,8 @@
 <a class="console-exec fa fa-chevron-circle-right"></a>
 <input type="text" class="textbox">
-<div class="simple-box">kitConsole(0.0.0)<br></div>
\ No newline at end of file
+<div class="console-wrapper" data-simplebar>
+    <div class="simple-box">
+        kitConsole(1.0.1)
+        <br>
+    </div>
+</div>
\ No newline at end of file

diff --git a/system.js b/system.js
index 9b1b3f9..e7d5b3f 100644 (file)
--- a/system.js
+++ b/system.js
@@ -31,9 +31,9 @@ function Load() {
     //イベントハンドラ定義
     $( "#desktops" ).click( function() {
         $( "#desktop-" + currentDesktop ).toggleClass( "selected-section" );
-    } ).hover( function() {
+    } ).mousedown( function() {
         $( ".window" ).css( "opacity", "0.6" );
-    }, function() {
+    } ).mouseup( function() {
         $( ".window" ).css( "opacity", "1.0" );
     } );
     //タスク一覧