Fixed merge conflict
This commit is contained in:
commit
a99cb5bf0c
@ -1,4 +1,5 @@
|
||||
<html>
|
||||
<<<<<<< HEAD
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<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>
|
||||
</head>
|
||||
<body>
|
||||
<canvas id="glCanvas"></canvas>
|
||||
<canvas id="canvas"></canvas>
|
||||
</body>
|
||||
<script src="./index.js"></script>
|
||||
</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
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
|
||||
function toBinary(text){
|
||||
var output = "";
|
||||
for (var i = 0; i < text.length; i++)
|
||||
@ -7,3 +8,36 @@ function toBinary(text){
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user