Comparer le texte

Trouver la différence entre deux fichiers texte

Éditeur live

Cacher identiques

Sans retour à la ligne

Vue

Niveau de précision

Coloration syntaxique

Diffchecker Desktop La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !Obtenir Desktop

Untitled Diff

Créé il y a 4 ansLe diff n'expire jamais

53 suppressions

Lignes
Total
Supprimé

Caractères
Total
Supprimé

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

266 lignes

4 ajouts

Lignes
Total
Ajouté

Caractères
Total
Ajouté

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

222 lignes

<!DOCTYPE html>

<html>

<head>

<title>Waking up ･ﾟ✧</title>

</noscript>

<style>

* {

box-sizing: border-box;

}

body {

background-color: white;

font-family: "Benton Sans", "Helvetica Neue", helvetica, arial, sans-serif;

}

main {

padding: 1rem;

}

p {

max-width: 500px

}

.note{

font-size: small;

color: #9B9B9B;

}

.content{

margin: 50px;

position: fixed;

}

#loader:after {

overflow: hidden;

display: inline-block;

vertical-align: bottom;

animation: ellipsis steps(4,end) 1000ms infinite;

content: "\2026";

width: 0px;

}

@keyframes ellipsis {

to {

width: 1.25em

}

canvas#background {

position: fixed;

height: 100%;

width: 100%;

top: 0;

left: 0;

z-index: -1;

}

</style>

</head>

<body>

<main>

<span id="message">Waking up</span>

</p>

To keep Glitch fast for everyone, inactive projects go to sleep and wake up on request.

</p>

</div>

</main>

// drawing

var canvas, context, canvasImage;

var cursorPosition = {

x: undefined,

y: undefined,

};

var color = '#e5e5e5';

var size = 30;

function randomColor() {

var colors = [

'#fcd1c4',

'#abfcec',

'#a3d9e1',

'#fbbfff',

'#a9ef8f',

'#fff0b2',

];

color = colors[Math.floor(Math.random() * colors.length)];

}

function throttle(ms, fn) {

var lastCallTime;

return function () {

var now = Date.now();

if (!lastCallTime || now - lastCallTime > ms) {

lastCallTime = now;

fn.apply(this, arguments);

}

function drawCircle(event) {

context.beginPath();

context.arc(cursorPosition.x, cursorPosition.y, size, 0, 2 * Math.PI);

context.closePath();

context.fillStyle = color;

context.fill();

canvasImage = context.getImageData(0, 0, window.innerWidth, window.innerHeight);

}

window.onload = function () {

randomColor();

canvas = document.getElementById('background');

canvas.width = window.innerWidth;

canvas.height = window.innerHeight;

context = canvas.getContext('2d');

window.onresize = throttle(100, function () {

canvas.width = window.innerWidth;

canvas.height = window.innerHeight;

context.clearRect(0,0, window.innerWidth, window.innerHeight);

canvasImage && context.putImageData(canvasImage, 0, 0);

});

window.onmousemove = throttle(10, function (event) {

cursorPosition = {

x: event.clientX,

y: event.clientY,

};

drawCircle(event);

});

window.ontouchmove = throttle(10, function (event) {

cursorPosition = {

x: event.touches[0].clientX,

y: event.touches[0].clientY,

};

drawCircle(event);

});

}

</script>

// container status updates

setTimeout(function () {

function reloadAfterDelay(delay) {

delay = delay || 1000;

return setTimeout(function () {

window.location.reload(true);

}, delay);

}

// Either check that the container is ready and resolve with `true` or

// false (when enabled because we are expecting multiple "listening"

// messages) or just resolve `true` (when we aren't).

function checkReady(enabled = false) {

if (enabled) {

return fetch('/.glitch/ready').then(function (response) {

return response.json();

});

} else {

return Promise.resolve(true);

}

try {

var isValidBrowser = bowser.check({

ios: "7",

msie: "10",

android: "4.4",

chrome: "16",

firefox: "11",

});

if (!isValidBrowser) {

throw new Error("Jump to refresh");

}

var initialReloadHandler = reloadAfterDelay(5000);

var ws = new WebSocket("wss://" + document.location.hostname + "/___glitch_loading_status___");

ws.onmessage = updateContainerStatus;

ws.onerror = reloadAfterDelay;

ws.onopen = function () {

clearTimeout(initialReloadHandler);

setInterval(function () {

ws.send("keepalive");

}, 15000);

};

ws.onclose = function () {

reloadAfterDelay(1000);

};

function updateContainerStatus(event) {

try {

// Interpolate into a string even though an unquoted `true` or `false`

// would be okay, just in case we get something weird.

var readyCheck = "false" === "true";

var data = JSON.parse(event.data);

var message = document.getElementById('message')

var text = "";

switch (data.text) {

case "initialize":

text = "Waking up";

break;

case "install":

text = "Preparing";

break;

case "restart":

text = "Starting";

break;

case "listening":

// In cases of multiple "listening" messages, this might only

// be the first one. We're going to rely on `checkReady` for

// the final answer, so don't report "Ready" until that comes

// back `true`.

text = readyCheck ? "Starting" : "Ready";

break;

default:

return;

}

message.innerHTML = text;

document.title = text + " ･ﾟ✧";

if (data.text === 'listening') {

// Check that the container is ready before reloading in case

// of multiple things sending `listening` messages.

checkReady(readyCheck).then(function (ready) {

if (ready) {

// We may have already set this if `readyCheck` is `false`,

// but that's fine.

message.innerHTML = "Ready";

document.title = text + " ･ﾟ✧";

window.location.reload(true);

}

}).catch((e) => {

reloadAfterDelay();

});

}

} catch (e) {

reloadAfterDelay();

}

} catch (e) {

reloadAfterDelay();

}

}, 0);

</script>

</body>

</html>

</canvas></body></html>

Différences enregistrées

Texte d'origine

Ouvrir un fichier

<!DOCTYPE html>
<html>
  <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <title>Waking up ･ﾟ✧</title>
    <noscript>
      <meta http-equiv="refresh" content="1">
    </noscript>
    <style>
      * {
        box-sizing: border-box;
      }

body {
        background-color: white;
        font-family: "Benton Sans", "Helvetica Neue", helvetica, arial, sans-serif;
      }

main {
        padding: 1rem;
      }

p {
        max-width: 500px
      }

.note{
        font-size: small;
        color: #9B9B9B;
      }

.content{
        margin: 50px;
        position: fixed;
      }

#loader:after {
        overflow: hidden;
        display: inline-block;
        vertical-align: bottom;
        animation: ellipsis steps(4,end) 1000ms infinite;
        content: "\2026";
        width: 0px;
      }

@keyframes ellipsis {
        to {
          width: 1.25em
        }
      }

canvas#background {
        position: fixed;
        height: 100%;
        width: 100%;
        top: 0;
        left: 0;
        z-index: -1;
      }
    </style>
  </head>

<body>
    <main>
      <div class="content">
        <p class="status">
          <span id="message">Waking up</span>
          <span id="loader" ></span>
        </p>
        <p class="note">
          To keep Glitch fast for everyone, inactive projects go to sleep and wake up on request.
        </p>
      </div>
    </main>
    <canvas id="background"/>

<script>
// drawing

var canvas, context, canvasImage;

var cursorPosition = {
  x: undefined,
  y: undefined,
};
var color = '#e5e5e5';
var size = 30;

function randomColor() {
  var colors = [
    '#fcd1c4',
    '#abfcec',
    '#a3d9e1',
    '#fbbfff',
    '#a9ef8f',
    '#fff0b2',
    '#fff0b2',
  ];
  color = colors[Math.floor(Math.random() * colors.length)];
}

function drawCircle(event) {
  context.beginPath();
  context.arc(cursorPosition.x, cursorPosition.y, size, 0, 2 * Math.PI);
  context.closePath();
  context.fillStyle = color;
  context.fill();
  canvasImage = context.getImageData(0, 0, window.innerWidth, window.innerHeight);
}

window.onload = function () {
  randomColor();
  canvas = document.getElementById('background');
  canvas.width = window.innerWidth;
  canvas.height = window.innerHeight;
  context = canvas.getContext('2d');

window.onresize = throttle(100, function () {
    canvas.width = window.innerWidth;
    canvas.height = window.innerHeight;
    context.clearRect(0,0, window.innerWidth, window.innerHeight);
    canvasImage && context.putImageData(canvasImage, 0, 0);
  });

window.onmousemove = throttle(10, function (event) {
    cursorPosition = {
      x: event.clientX,
      y: event.clientY,
    };
    drawCircle(event);
  });

window.ontouchmove = throttle(10, function (event) {
    cursorPosition = {
      x: event.touches[0].clientX,
      y: event.touches[0].clientY,
    };
    drawCircle(event);
  });
}
</script>

// Either check that the container is ready and resolve with `true` or
  // false (when enabled because we are expecting multiple "listening"
  // messages) or just resolve `true` (when we aren't).
  function checkReady(enabled = false) {
    if (enabled) {
      return fetch('/.glitch/ready').then(function (response) {
        return response.json();
      });
    } else {
      return Promise.resolve(true);
    }
  }

try {
    var isValidBrowser = bowser.check({
      ios: "7",
      msie: "10",
      android: "4.4",
      chrome: "16",
      firefox: "11",
    });

if (!isValidBrowser) {
      throw new Error("Jump to refresh");
    }

var initialReloadHandler = reloadAfterDelay(5000);

function updateContainerStatus(event) {
      try {
        // Interpolate into a string even though an unquoted `true` or `false`
        // would be okay, just in case we get something weird.
        var readyCheck = "false" === "true";
        var data = JSON.parse(event.data);
        var message = document.getElementById('message')
        var text = "";
        switch (data.text) {
          case "initialize":
            text = "Waking up";
            break;
          case "install":
            text = "Preparing";
            break;
          case "restart":
            text = "Starting";
            break;
          case "listening":
            // In cases of multiple "listening" messages, this might only
            // be the first one. We're going to rely on `checkReady` for
            // the final answer, so don't report "Ready" until that comes
            // back `true`.
            text = readyCheck ? "Starting" : "Ready";
            break;
          default:
            return;
        }

message.innerHTML = text;
        document.title = text + " ･ﾟ✧";

if (data.text === 'listening') {
          // Check that the container is ready before reloading in case
          // of multiple things sending `listening` messages.
          checkReady(readyCheck).then(function (ready) {
            if (ready) {
              // We may have already set this if `readyCheck` is `false`,
              // but that's fine.
              message.innerHTML = "Ready";
              document.title = text + " ･ﾟ✧";
              window.location.reload(true);
            }
          }).catch((e) => {
            reloadAfterDelay();
          });
        }
      } catch (e) {
        reloadAfterDelay();
      }
    }
  } catch (e) {
    reloadAfterDelay();
  }
}, 0);
</script>
  </body>
</html>

Texte modifié

Ouvrir un fichier

<!DOCTYPE html>
<html><head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <title>Draw, draw, draw!</title>
    <style>
      * {
        box-sizing: border-box;
      }

body {
        background-color: white;
        font-family: "Benton Sans", "Helvetica Neue", helvetica, arial, sans-serif;
      }

main {
        padding: 1rem;
      }

p {
        max-width: 500px
      }

.note{
        font-size: small;
        color: #9B9B9B;
      }

.content{
        margin: 50px;
        position: fixed;
      }

@keyframes ellipsis {
        to {
          width: 1.25em
        }
      }

canvas#background {
        position: fixed;
        height: 100%;
        width: 100%;
        top: 0;
        left: 0;
        z-index: -1;
      }
    </style>
  </head>

<script>
// drawing

var canvas, context, canvasImage;

var cursorPosition = {
  x: undefined,
  y: undefined,
};
var color = '#e5e5e5';
var size = 30;

window.onmousemove = throttle(10, function (event) {
    cursorPosition = {
      x: event.clientX,
      y: event.clientY,
    };
    drawCircle(event);
  });

window.ontouchmove = throttle(10, function (event) {
    cursorPosition = {
      x: event.touches[0].clientX,
      y: event.touches[0].clientY,
    };
    drawCircle(event);
  });
}
</script>

try {
    var isValidBrowser = bowser.check({
      ios: "7",
      msie: "10",
      android: "4.4",
      chrome: "16",
      firefox: "11",
    });

if (!isValidBrowser) {
      throw new Error("Jump to refresh");
    }

var initialReloadHandler = reloadAfterDelay(5000);

message.innerHTML = text;
        document.title = text + " ･ﾟ✧";

</script>

</canvas></body></html>