Update Kernel and Apps(console, settings)

diff --git a/app/console/console.js b/app/console/console.js
index 0a39c8c..70e1e70 100644 (file)
--- a/app/console/console.js
+++ b/app/console/console.js
@@ -13,9 +13,9 @@ function app_console(_pid) {
         var exec = $("#winc"+_pid+" .textbox").val();
         prevCommand = exec;
         var _return = JSON.stringify( eval(exec) );
-        if( _return ){
+        if( exec ){
             $("#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+" .simple-box").append( JSON.stringify( eval(exec) )+"<br><div class='console-log'>"+log+"</div>");
         }
         $("#winc"+_pid+" .textbox").val("");
     });

diff --git a/app/console/default.html b/app/console/default.html
index 7a46711..7d7f447 100644 (file)
--- a/app/console/default.html
+++ b/app/console/default.html
@@ -2,7 +2,7 @@
 <input type="text" class="textbox">
 <div class="console-wrapper" data-simplebar>
     <div class="simple-box">
-        kitConsole(1.0.1)
+        kitConsole(1.0.2)
         <br>
     </div>
 </div>
\ No newline at end of file

diff --git a/app/settings/about.html b/app/settings/about.html
index cf7d6e9..9c51af5 100644 (file)
--- a/app/settings/about.html
+++ b/app/settings/about.html
@@ -1,6 +1,19 @@
 <script>
-    $(".settings-kitv").text(System.version);
-    $("#settings-license-textarea-1").load("./fa/LICENSE.txt");
+    $( ".settings-kitv" ).text( System.version );
+    $( "#settings-license-1" ).load( "./system/jquery-ui-1.12.1/LICENSE.txt" );
+    $( "#settings-license-2" ).load( "./fa/LICENSE.txt" );
+
+    function latest_kit(){
+        $.getJSON("https://api.github.com/repos/mtsgi/kit/tags", function(data){
+            let result = "github.com/mtsgi/kitから情報を取得しました。<br>";
+            for( i in data ){
+                result += "[" +i+ "] v" + data[i].name;
+                if( i == 0 ) result += "(最新)";
+                result += "<br>" + data[i].commit.sha + "<br>";
+            }
+            System.alert("お使いのkitは" +System.version+ "です",result);
+        });
+    }
 </script>
 <a class='btn settings-default'><span class='fa fa-arrow-circle-left'></span>設定</a>
 <h3><span class='fa fa-info-circle'></span> kitについて</h3>
@@ -8,12 +21,18 @@
     <img src="system/ico/logo.png" style="max-width: 100%;">
     <br>バージョン<span class="settings-kitv"></span>
 </div>
-KWS 0.0.5 <span style='color:silver'>(kit Window System)</span><br>
-<a class="kit-hyperlink">kitのアップデートを確認する</a><br>
+KWS 0.0.6 <span style='color:silver'>(kit Window System)</span><br>
+<a class="kit-hyperlink" onclick="latest_kit()">kitのアップデートを確認する</a>
+<div class="little">取得には時間がかかる場合があります</div>
 Based on <span class="fab fa-html5"></span>HTML5
 <span class="fab fa-css3-alt"></span>CSS3
 <span class="fab fa-js"></span>JavaScript<br>
-[LICENSE]<br>
-<textarea class="textbox" id="settings-license-textarea-1" disabled data-simplebar></textarea>
-<br>
+[LICENSE]
+<div class="settings-license-area" data-simplebar>
+    jQueryUI
+    <div id="settings-license-1"></div>
+    Font Awesome
+    <div id="settings-license-2"></div>
+    <div id="settings-license-3"></div>
+</div>
 App icons by <a href="https://icons8.com" class="kit-hyperlink">icons8</a>.
\ No newline at end of file

diff --git a/app/settings/settings.css b/app/settings/settings.css
index 1bc0f41..dfea2e9 100644 (file)
--- a/app/settings/settings.css
+++ b/app/settings/settings.css
@@ -26,6 +26,14 @@
 .winc-settings h3{
     padding: 5px 0px;
 }
+.winc-settings .settings-license-area{
+    background: silver;
+    padding: 3px;
+    border-radius: 6px;
+    height: 150px;
+    width: 100%;
+    box-sizing: border-box;
+}
 .settings-advanced-envar{
     width: 100%;
     max-height: 350px;

diff --git a/index.html b/index.html
index c80938c..212666c 100644 (file)
--- a/index.html
+++ b/index.html
@@ -56,7 +56,8 @@
        </div>
 
        <div id="kit-milp">
-                       <a id="kit-milp-launch"></a><a id="kit-milp-search"></a><a id="kit-milp-tweet"></a>
+               <span id="kit-milp-text"></span>について
+               <a id="kit-milp-launch"></a><a id="kit-milp-search"></a><a id="kit-milp-wikipedia"></a>
        </div>
 
        <footer>

diff --git a/system.js b/system.js
index e7d5b3f..fc311b4 100644 (file)
--- a/system.js
+++ b/system.js
@@ -26,7 +26,7 @@ function Load() {
     for( i in System.startup ) {
         if( System.startup[i] != "" ) launch( System.startup[i] );
     }
-    Notification.push( "kitへようこそ", localStorage["kit-username"] + "さん、こんにちは。pid:" + processID, "system" );
+    Notification.push( "kitへようこそ", localStorage["kit-username"] + "さん、こんにちは。", processID );
 
     //イベントハンドラ定義
     $( "#desktops" ).click( function() {
@@ -133,7 +133,7 @@ function Load() {
     } ).on( "blur", function() {
         $( "#kit-milp" ).fadeOut( 200 );
     } ).on( 'keydown keyup keypress change', function() {
-        $( "#kit-milp-launch, #kit-milp-search, #kit-milp-tweet" ).text( $( this ).val() );
+        $( "#kit-milp-text" ).text( $( this ).val() );
     } );;
     $( "#kit-milp-launch" ).click( function() {
         launch( $( "#milp" ).val() );
@@ -141,6 +141,9 @@ function Load() {
     $( "#kit-milp-search" ).click( function() {
         launch( "browser", "https://www.bing.com/search?q=" + $( "#milp" ).val() );
     } );
+    $( "#kit-milp-wikipedia" ).click( function() {
+        launch( "browser", "https://ja.wikipedia.org/wiki/" + $( "#milp" ).val() );
+    } );
 
     //コンテキストメニュー
     //$("section").contextMenu("contextmenu", function () {
@@ -216,8 +219,8 @@ function appData( data ) {
     } ).load( "./app/" + data.id + "/" + data.view );
 
     //スクリプト読み込み
-    $.getScript( "./app/" + data.id + "/" + data.script );
-    $( "head link:last" ).append( '<link href="./app/' + data.id + '/' + data.css + '" rel="stylesheet">' );
+    if( data.script != "none" ) $.getScript( "./app/" + data.id + "/" + data.script );
+    if( data.css != "none" ) $( "head link:last" ).append( '<link href="./app/' + data.id + '/' + data.css + '" rel="stylesheet">' );
 
     processID++;
     localStorage.setItem( "kit-pid", processID );
@@ -247,7 +250,7 @@ function appDefine() {
 
 //システムクラス
 const System = new function() {
-    this.version = "0.0.3";
+    this.version = "0.0.4";
     this.username = localStorage.getItem( "kit-username" );
 
     this.appCache = {};

diff --git a/system/theme/theme-default.css b/system/theme/theme-default.css
index bea475f..68d7dfb 100644 (file)
--- a/system/theme/theme-default.css
+++ b/system/theme/theme-default.css
@@ -138,18 +138,25 @@ header a:hover{
        text-shadow: 0px 1px 3px dodgerblue;
 }
 #kit-milp{
+       z-index: 9994;
        display: none;
        position: fixed;
        background: #ffffff;
        padding-top: 38px;
-       padding-bottom: 4px;
+       padding-bottom: 8px;
        left: 100px;
        width: 216px;
        border-radius: 0px 0px 6px 6px;
        box-shadow: 0px 1px 4px 0px rgba(0,0,0,.4);
 }
+#kit-milp-text{
+       font-size: 19px;
+       font-weight: 700;
+       padding: 0px 3px;
+       margin-bottom: 4px;
+}
 #kit-milp a{
-       padding: 0px 6px;
+       padding: 3px 6px;
        display: block;
        cursor: default;
        overflow: hidden;
@@ -158,13 +165,13 @@ header a:hover{
        background: skyblue;
 }
 #kit-milp-launch:before{
-       content: "起動："
+       content: "アプリを起動する"
 }
 #kit-milp-search:before{
-       content: "Web検索："
+       content: "Webで検索する"
 }
-#kit-milp-tweet:before{
-       content: "Tweet："
+#kit-milp-wikipedia:before{
+       content: "Wikipediaで調べる"
 }
 .home-icon:before{
        line-height: 0px;