Skip to content

Commit 77d4129

Browse files
dumbNicknamedumbNickname
committed
Minor fixes, marked some more keywords.
1 parent 21e5d0c commit 77d4129

File tree

1 file changed

+39
-32
lines changed

1 file changed

+39
-32
lines changed

‎index.html‎

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ <h2 style="margin-bottom: -0.25em">Are we going to talk about frameworks?</h2>
4242
</section>
4343

4444
<section>
45-
<h2>Nope ...</h2>
46-
<h2>we are going to talk about the platform</h2>
45+
<h2>Not much ...</h2>
46+
<h2>we are going to concentrate on the platform</h2>
4747
<div>
4848
<img class="plain" style="max-height: 4em; margin: 0.5em" src="/src/img/chrome-icon.png">
4949
<img class="plain" style="max-height: 4em; margin: 0.5em" src="/src/img/firefox-logo.png">
@@ -473,8 +473,8 @@ <h1>HTML Imports</h1>
473473
</section>
474474

475475
<section>
476-
<h2 class="fallbackColor" style="text-transform: none;">We're not supposed to talk about frameworks, are we?</h2>
477-
<h1 style="font-size: 2.5em; margin-bottom: -0.25em;" class="secondaryColor" >No, we aren't, but...</h1>
476+
<h2 class="fallbackColor" style="text-transform: none;">We`re supposed to avoid talking about frameworks, are we?</h2>
477+
<h1 style="font-size: 2.5em; margin-bottom: -0.25em;" class="secondaryColor" >Yes, we are, but...</h1>
478478
</section>
479479

480480
<section data-background-color="var(--secondary-color)">
@@ -551,8 +551,14 @@ <h3>AppCache lottery</h3>
551551
<section>
552552
<h2 style="margin-top: -5em;">Web storage</h2>
553553
<div class="replacement">
554-
<div style="margin-top: 4em;" class="fragment fade-out" data-fragment-index="0">
555-
<h3>localStorage / sessionStorage</h3>
554+
<div style="margin-top: 0em;" class="fragment fade-out" data-fragment-index="0">
555+
<!--<h3>localStorage / sessionStorage</h3>-->
556+
<div style="border-top: 15em solid var(--secondary-color); border-right: 25.2em solid transparent;">
557+
<h3 style="position:fixed; top:0em;left:4em;color:white">localStorage</h3>
558+
</div>
559+
<div>
560+
<h3 style="position:fixed; top:3em;left:11em">sessionStorage</h3>
561+
</div>
556562
</div>
557563
<div style="margin-top: 1em;" class="fragment fade-in" data-fragment-index="0">
558564
<div class="fragment fade-out" data-fragment-index="1">
@@ -697,24 +703,24 @@ <h3>task.js (the worker)</h3>
697703
<section>
698704
<h3>Features Available to Workers</h3>
699705
<ul class="no-bullets">
700-
<li>The navigator object</li>
701-
<li>The location object (read-only)</li>
702-
<li><XMLHttpRequest></XMLHttpRequest></li>
706+
<li>The <span class="secondaryColor">navigator</span> object</li>
707+
<li>The <span class="secondaryColor">location</span> object (read-only)</li>
708+
<li>XMLHttpRequest</li>
703709
<li>setTimeout()/clearTimeout() and setInterval()/clearInterval()</li>
704-
<li>The Application Cache</li>
705-
<li>Importing external scripts using the importScripts() method</li>
706-
<li>Spawning other web workers</li>
710+
<li>The Application <span class="secondaryColor">Cache</span></li>
711+
<li>Importing <span class="secondaryColor">external scripts</span> using the importScripts() method</li>
712+
<li><span class="secondaryColor">Spawning other</span> web workers</li>
707713
</ul>
708714
</section>
709715

710716
<section>
711717
<h3>Workers do NOT have access to:</h3>
712718
<ul class="no-bullets">
713-
<li>The DOM (it's not thread-safe)</li>
714-
<li>The window object</li>
715-
<li>The document object</li>
716-
<li>The parent object</li>
717-
<li>will not run locally (e.g. from file://)</li>
719+
<li>The <span class="secondaryColor">DOM</span> (it's not thread-safe)</li>
720+
<li>The <span class="secondaryColor">window</span> object</li>
721+
<li>The <span class="secondaryColor">document</span> object</li>
722+
<li>The <span class="secondaryColor">parent</span> object</li>
723+
<li>will <span class="secondaryColor">not run locally</span> (e.g. from file://)</li>
718724
</ul>
719725
</section>
720726

@@ -1010,10 +1016,10 @@ <h3>Web App Install Banner</h3>
10101016
<section>
10111017
<h3>Web Banner criteria</h3>
10121018
<ul>
1013-
<li>Has a web app manifest</li>
1014-
<li>Has a service worker registered</li>
1015-
<li>Is served over HTTPS</li>
1016-
<li>Is visited at least twice, with at least five minutes between visits</li>
1019+
<li>Has a <span class="secondaryColor">web app manifest</span></li>
1020+
<li>Has a <span class="secondaryColor">service worker registered</span></li>
1021+
<li>Is served over <span class="secondaryColor">HTTPS</span></li>
1022+
<li>Is visited <span class="secondaryColor">at least twice</span>, with at least <span class="secondaryColor">five minutes</span> between visits</li>
10171023
</ul>
10181024
</section>
10191025

@@ -1088,9 +1094,9 @@ <h2 style="margin-top: -4em;">HTTP 2</h2>
10881094
</p>
10891095
</div>
10901096
<div style="margin-top: -0.5em;" class="fragment fade-in" data-fragment-index="0">
1091-
<p>multiplexed downloads over a single connection</p>
1097+
<p><span class="secondaryColor">Multiplexed</span> downloads over a <span class="secondaryColor">single</span> connection</p>
10921098
<h3 style="margin-top: 1em;">HTTP/2 server push</h3>
1093-
<p>allows the server to preemptively send resources to the browser</p>
1099+
<p>Allows the server to <span class="secondaryColor">preemptively send resources</span> to the browser</p>
10941100
</div>
10951101
</div>
10961102
</section>
@@ -1102,18 +1108,18 @@ <h3 style="margin-top: -4em;">HTTP/1 vs. HTTP/2 </h3>
11021108
<div style="margin-top: 0em;" class="fragment fade-out" data-fragment-index="0">
11031109
<h4>HTTP/1</h4>
11041110
<ol>
1105-
<li>The browser requests the HTML file.</li>
1106-
<li>The server returns the HTML file and the browser starts parsing it.</li>
1107-
<li>The browser encounters the <em>&lt;link rel="stylesheet"&gt;</em> tag, and starts a new request for the stylesheet.</li>
1108-
<li>The browser receives the stylesheet.</li>
1111+
<li>The browser requests the <span class="secondaryColor">HTML file</span>.</li>
1112+
<li>The server returns the HTML file and the <span class="secondaryColor">browser starts parsing</span it.</li>
1113+
<li>The browser encounters the <strong><em>&lt;link rel="stylesheet"&gt;</em></strong> tag, and <span class="secondaryColor">starts a new request</span> for the stylesheet.</li>
1114+
<li>The browser <span class="secondaryColor">receives the stylesheet</span>.</li>
11091115
</ol>
11101116
</div>
11111117
<div style="margin-top: 0em;" class="fragment fade-in" data-fragment-index="0">
11121118
<h4>HTTP/2</h4>
11131119
<ol>
1114-
<li>The browser requests the HTML file.</li>
1115-
<li>The server returns the HTML file, and pushes the stylesheet at the same time.</li>
1116-
<li>The browser starts parsing the HTML. By the time it encounters the <em>&lt;link rel="stylesheet"&gt;</em>, the stylesheet is already in the cache.</li>
1120+
<li>The browser requests the <span class="secondaryColor">HTML file</span>.</li>
1121+
<li>The server returns the <span class="secondaryColor">HTML file</span>, and <span class="secondaryColor">pushes</span> the stylesheet <span class="secondaryColor">at the same time</span>.</li>
1122+
<li>The browser starts parsing the HTML. By the time it encounters the <strong><em>&lt;link rel="stylesheet"&gt;</em></strong>, the stylesheet is <span class="secondaryColor">already in the cache</span>.</li>
11171123
</ol>
11181124
</div>
11191125
</div>
@@ -1238,15 +1244,16 @@ <h3>Our personal favourites:</h3>
12381244
</section>
12391245

12401246

1247+
<section data-background-color="var(--secondary-color)">
1248+
<h1 style="font-size: 9em;" class="fallbackColor" >Q<span class="flippedColor">&</span>A</h1>
1249+
</section>
12411250

12421251
<section data-background-color="var(--secondary-color)">
12431252
<h1 style="font-size: 4em; margin-bottom: -0.5em;" class="fallbackColor" >Thank</h1>
12441253
<h1 style="font-size: 6.5em; margin-bottom: 0em;" class="primaryColor" >you</h1>
12451254
<h1 style="font-size: 1.5em;" class="flippedColor" >for your attention!</h1>
12461255
</section>
12471256

1248-
1249-
12501257
</div>
12511258
</div>
12521259

0 commit comments

Comments
 (0)