Merge pull request #1547 from transloadit/fix/unconfuse-logs

website: output console logs in order

website/src/_template/contributing.md

@@ -88,7 +88,7 @@ npm install
 npm start
 ```
 
-Releases are managed by [Lerna](https://github.com/lerna/lerna/tree/2.x). We do some cleanup and compile work around releases too. Use the npm release script:
+Releases are managed by [Lerna](https://github.com/lerna/lerna). We do some cleanup and compile work around releases too. Use the npm release script:
 
 ```bash
 npm run release

website/src/examples/bundle/index.ejs

@@ -14,7 +14,7 @@ This example showcases using a pre-built bundle from a CDN.
 <hr />
 
 <p id="console-wrapper">
-  Console output (latest logs are at the top): <br />
+  Console output: <br />
 </p>
 
 <p>

website/src/examples/dashboard/index.ejs

@@ -15,7 +15,7 @@ Dashboard is the full-featured UI for Uppy that shows nice file previews and up
 
 <hr />
 
-<p id="console-wrapper">Console output (latest logs are at the top): <br /></p>
+<p id="console-wrapper">Console output: <br /></p>
 
 <p>On this page we're using the following JavaScript snippet:</p>
 

website/src/examples/dragdrop/index.ejs

@@ -17,7 +17,7 @@ Here you'll see a demo of how you might set up Drag and Drop with Uppy.
 <hr />
 
 <p id="console-wrapper">
-  Console output (latest logs are at the top): <br />
+  Console output: <br />
 </p>
 
 <p>
@@ -28,4 +28,4 @@ Here you'll see a demo of how you might set up Drag and Drop with Uppy.
 <p>
   Along with this JavaScript:
 </p>
-{% include_code lang:js dragdrop/app.es6 %}
+{% include_code lang:js dragdrop/app.es6 %}

website/src/examples/i18n/index.ejs

@@ -16,7 +16,7 @@ Here you’ll see a demo of how you might use internationalization (i18n) in Upp
 <hr />
 
 <p id="console-wrapper">
-  Console output (latest logs are at the top): <br />
+  Console output: <br />
 </p>
 
 <p>

website/src/examples/markdown-snippets/index.ejs

@@ -9,13 +9,13 @@ category: 'File Processing'
 {% blockquote %}
 This is a demo app that works a bit like Github Gists or Pastebin. You can add markdown snippets, and add file attachments to each snippet.
 
-Uppy <a href="/docs/robodog/">Robodog</a> (using <a href="https://transloadit.com">Transloadit</a> internally) generates an inline preview image for images, videos, and audio files. 
+Uppy <a href="/docs/robodog/">Robodog</a> (using <a href="https://transloadit.com">Transloadit</a> internally) generates an inline preview image for images, videos, and audio files.
 
 You can view the <a target="_blank" href="https://github.com/transloadit/uppy/blob/master/examples/transloadit-textarea/template.json">Transloadit Assembly Template</a> and the <a href="#snippet-example-code"> code for this demo</a>.
 {% endblockquote %}
 
 <p>
- 
+
 </p>
 
 <p>
@@ -29,7 +29,7 @@ You can view the <a target="_blank" href="https://github.com/transloadit/uppy/bl
 <hr />
 
 <p id="console-wrapper">
-  Console output (latest logs are at the top): <br />
+  Console output: <br />
 </p>
 
 <p id="snippet-example-code">

website/src/examples/statusbar/index.ejs

@@ -16,7 +16,7 @@ The StatusBar plugin shows detailed upload/processing progress with pause/resume
 <hr />
 
 <p id="console-wrapper">
-  Console output (latest logs are at the top): <br />
+  Console output: <br />
 </p>
 
 <p>

website/src/examples/transloadit/index.ejs

@@ -47,7 +47,7 @@ This example demonstrates how to unlock Transloadit’s features within Uppy.
 
 <hr />
 
-<p id="console-wrapper">Console output (latest logs are at the top):
+<p id="console-wrapper">Console output:
   <br />
 </p>
 

website/src/examples/xhrupload/index.ejs

@@ -23,7 +23,7 @@ Uppy recommends using tus resumable file uploads, but if you want you can also u
 <hr />
 
 <p id="console-wrapper">
-  Console output (latest logs are at the top): <br />
+  Console output: <br />
 </p>
 
 <p>

website/themes/uppy/layout/example.ejs

@@ -27,17 +27,18 @@
 
   <textarea id="console-log" class="Console"></textarea>
   <script>
-  console.log = (function (old_function, div_log) {
-    return function (text) {
-      old_function(text);
-
-      if (text !== (text + '')) {
-        text = JSON.stringify(text);
-      }
-
-      div_log.value = text + "\n" + div_log.value;
-    };
-  } (console.log.bind(console), document.getElementById("console-log")));
+    console.log = (function (log, container) {
+      return function (text) {
+        log(text);
+
+        if (text !== (text + '')) {
+          text = JSON.stringify(text);
+        }
+
+        container.value += text + '\n';
+        container.scrollTop = container.scrollHeight;
+      };
+    }(console.log.bind(console), document.getElementById("console-log")));
   </script>
 
   <script>

website/themes/uppy/layout/partials/generated_stargazers.ejs

@@ -1 +1 @@
-19048
+19157