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

Fixed merge conflict

Browse Source
This commit is contained in:
Arav-Agarwal 2017-09-30 18:44:37 -04:00
commit a99cb5bf0c
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gyrio/index.html
View File

@ -1,4 +1,5 @@
<html> <html>
<<<<<<< HEAD
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1"> <meta http-equiv="X-UA-Compatible" content="chrome=1">
@ -10,7 +11,26 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
</head> </head>
<body> <body>
<canvas id="glCanvas"></canvas> <canvas id="canvas"></canvas>
</body> </body>
<script src="./index.js"></script> <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

36
gyrio/index.js
View File

@ -1,3 +1,4 @@
function toBinary(text){ function toBinary(text){
var output = ""; var output = "";
for (var i = 0; i < text.length; i++) for (var i = 0; i < text.length; i++)
@ -6,4 +7,37 @@ function toBinary(text){
output += "0".repeat(8-letter.length) + letter; output += "0".repeat(8-letter.length) + letter;
} }
return output; return output;
} }
var canvas = document.getElementById("canvas");
var ctx = canvas.getContext("2d");
canvas.width = screen.width;
canvas.height = screen.height;
function randInt(min,max) {
return Math.floor(Math.random() * (max - min + 1)) + min;
}
function generateString() {
var final = "";
var length = randInt(50,100);
for(var i = 0; i < length; i++) {
final += randInt(0,1);
}
return final;
}
console.log(generateString());
ctx.fillStyle = "#000";
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;
}