Commit e18b3490 authored by Jakob Moser's avatar Jakob Moser
Browse files

Merge branch 'add-jslinux-2022' into 'master' 

Add jslinux 2022

Closes #2

See merge request moser/yalikejazz!2
parents 9f14db2c 8e52d956

LICENSE-3RD-PARTY.md

+5 −2
Original line number Diff line number Diff line
@@ -7,14 +7,17 @@ 
* Author: Fabrice Bellard

* License: [MIT License](https://opensource.org/licenses/MIT)



There is a downloadable JSLinux demo ZIP at https://bellard.org/tinyemu/. We started off with this ZIP, but reorganized the file structure and ultimately replaced some files with updated versions from the live website.



### Derivatives



* The file `static/index.html` is a modified version of the original `index.html` shipped with the JSLinux demo

* The file `static/index.html` is a modified version of the original `index.html` available at https://bellard.org/jslinux

* `static/lib/jslinux/css/style.css`

  * Modified paths to scrollbar images

  * Included missing `;`

* `static/lib/jslinux/js/jslinux.js`

  * Modified path to VM (call of `loadScript` function)

  * Modified paths to distro images

  * Modified paths to distro images (and re-introduced a default path that was lost during update)

* `static/lib/jslinux/distros/busybox/root-riscv64.cfg`

  * Modified path to hard drive file

* `static/lib/jslinux/distros/busybox/root-x86.cfg`

static/index.html

+2 −6
Original line number Diff line number Diff line
@@ -2,18 +2,14 @@ 
<!DOCTYPE html>

<html>

<head>

  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

  <title>JSLinux</title>

  <link href="./lib/jslinux/css/style.css" type="text/css" rel="stylesheet"/>

<style>

</style>

</head>

<body>

<div id="term_wrap">

  <div id="term_container">

  </div>

  <div>

    <textarea id="term_paste" cols="10" rows="1" autocorrect="off">Paste Here</textarea>

  <div id="term_bar">

    <label>

      <img title="Upload files" src="./lib/jslinux/img/upload-icon.png"><input type="file" id="files" multiple onchange="on_update_files(this.files)">

    </label>
@@ -23,6 +19,6 @@ 
</div>

<script type="text/javascript" src="./lib/jslinux/js/term.js"></script>

<script type="text/javascript" src="./lib/jslinux/js/jslinux.js"></script>

<div id="copyright">&copy; 2017-2019 Fabrice Bellard</div>

<div id="copyright">&copy; 2011-2021 Fabrice Bellard</div>

</body>

</html>

static/lib/jslinux/css/style.css

+72 −8
Original line number Diff line number Diff line 
#os_table {

    border: 1px solid;

    border-collapse: collapse;

    margin: 20px;

}



#os_table td,#os_table th, #os_table tr {

    border: 1px solid;

    padding: 6px;

}



.os_comment {

    font-size: 12px;

}



#copyright {

    font-size: 10px;

}



/* for the terminal */

#term_wrap {

    margin: 20px;

    resize: both;

    overflow: hidden;

}



.term {

    font-family: courier,fixed,swiss,monospace,sans-serif;

    font-size: 15px;

    font-family: monospace,courier,fixed,swiss,sans-serif;

    font-weight: normal;

    font-variant-ligatures: none;

    color: #f0f0f0;

    background: #000000;

    line-height: normal;

    overflow: hidden;

    white-space: nowrap;

}



.term_content a {

    color: #ffff00;

    color: inherit;

    text-decoration: none;

}



.term_content a:hover {

    color: inherit;

    text-decoration: underline;

}



.term_cursor {
@@ -14,14 +50,37 @@ 
    background: #00ff00;

}



.term_scrollbar { background: transparent url(../img/bg-scrollbar-track-y.png) no-repeat 0 0; position: relative; background-position: 0 0; float: right; width: 15px; height: 100%; }

.term_char_size {

    display: inline-block;

    visibility: hidden;

    position: absolute;

    top: 0px;

    left: -1000px;

    padding: 0px;

}



.term_textarea {

    position: absolute;

    top: 0px;

    left: 0px;

    width: 0px;

    height: 0px;

    padding: 0px;

    border: 0px;

    margin: 0px;

    opacity: 0;

    resize: none;

}



.term_scrollbar { background: transparent url(../img/bg-scrollbar-track-y.png) no-repeat 0 0; position: relative; background-position: 0 0; float: right; height: 100%; }

.term_track { background: transparent url(../img/bg-scrollbar-trackend-y.png) no-repeat 0 100%; height: 100%; width:13px; position: relative; padding: 0 1px; }

.term_thumb { background: transparent url(../img/bg-scrollbar-thumb-y.png) no-repeat 50% 100%; height: 20px; width: 25px; cursor: pointer; overflow: hidden; position: absolute; top: 0; left: -5px; }

.term_thumb .term_end { background: transparent url(../img/bg-scrollbar-thumb-y.png) no-repeat 50% 0; overflow: hidden; height: 5px; width: 25px; }

.noSelect { user-select: none; -o-user-select: none; -moz-user-select: none; -khtml-user-select: none; -webkit-user-select: none; }

#term_paste {

    border: 1px solid;

    height: 19px;



#keyboard-icon {

    margin-left: 5px;

    margin-right: 5px;

}



/* file import */
@@ -31,7 +90,7 @@ 
    height:1px;

    padding: 0px;

    margin: 0px;

    bordex: 0px;

    border: 0px;

}



label {
@@ -39,3 +98,8 @@ label { 
    margin-left: 5px;

    margin-right: 5px;

}



#net_progress {

    visibility: hidden;

    width: 80px;

}

static/lib/jslinux/js/emulators/riscvemu32-wasm.js

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.