kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Kenneth Jao 2017-09-30 18:32:52 -04:00
commit ef92415ab1
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gyrio/index.html
View File

@ -1,4 +1,5 @@
<html>
<<<<<<< HEAD
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
@ -12,4 +13,23 @@
<canvas id="canvas"></canvas>
</body>
<script src="./index.js"></script>
</html>
</html>
=======
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>Foxnet</title>
<link rel="icon" href="../assets/favicon.ico">
<link rel="stylesheet" href="./index.css">
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
</head>
<body>
<canvas id="glCanvas"></canvas>
</body>
<script src="./index.js"></script>
</html>
>>>>>>> 3bcdb922df05952a164b59bdb8ad9d2aa2785b4d

10
gyrio/index.js
View File

@ -1,3 +1,4 @@
var canvas = document.getElementById("canvas");
var ctx = canvas.getContext("2d");
canvas.width = screen.width;
@ -20,4 +21,11 @@ function generateString() {
console.log(generateString());
ctx.fillStyle = "#000";
ctx.fillRect(0,0, canvas.width, canvas.height);
ctx.fillRect(0,0, canvas.width, canvas.height);
function getWebsite(geturl) {
xmlhttp=new XMLHttpRequest();
xmlhttp.open("GET", geturl, false);
xmlhttp.send();
var data = xmlhttp.responseText;
}