diff --git a/assets/style/main.scss b/assets/style/main.scss index 660a5d9..d1eff33 100644 --- a/assets/style/main.scss +++ b/assets/style/main.scss @@ -18,10 +18,12 @@ html, body { h1 { font-size: $mega-font-size; + margin: 0.3em 0; } h2 { font-size: $mega-font-size / 12 * 9; + margin: 0.20em 0; } strong { @@ -42,8 +44,29 @@ li { margin: 0 auto; color: $main-text; font-size: $base-font-size; + //border: 1px solid black; + overflow: hidden; + + ul { + display: inline-block; + width: 40%; + .page-1 &, .page-2 &, .page-12 & { + width: auto; + } + } pre, code { + margin: 0; overflow: visible; + + .page-25 & , .page-28 & { + font-size: 0.80em; + } + } + + img { + display: block; + margin: 0 auto; + width: $slide-width; } } diff --git a/data/slide/010-title.md b/data/slide/010-title.md index cc5c38a..9791431 100644 --- a/data/slide/010-title.md +++ b/data/slide/010-title.md @@ -5,4 +5,7 @@ - May 7, 2015 - buddy.sandidge@gmail.com - [github.com/xbudex/phantom-talk](https://github.com/xbudex/phantom-talk) - - `$ docker run -p 8000:8000 buddys/phantom-talk` + +```bawsh +$ docker run -p 8000:8000 buddys/phantom-talk +``` diff --git a/data/slide/060-phantom-npm.md b/data/slide/060-phantom-npm.md index 6428edf..5587e32 100644 --- a/data/slide/060-phantom-npm.md +++ b/data/slide/060-phantom-npm.md @@ -1,3 +1,3 @@ # But Buddy… -On npm there is a "phantom" and "phantomjs" package, what gives? +## On `npm` there is a "`phantom`" and "`phantomjs`" package, what gives? diff --git a/data/slide/110-crash-c.md b/data/slide/110-crash-c.md index c0a4dfd..1dcb41d 100644 --- a/data/slide/110-crash-c.md +++ b/data/slide/110-crash-c.md @@ -15,7 +15,4 @@ int main() { ``` ```bash APP -$ ./a.out -Before pointer dereference -Segmentation fault (core dumped) ``` diff --git a/data/slide/120-use-after-free.md b/data/slide/120-use-after-free.md index 33867d6..72aabb1 100644 --- a/data/slide/120-use-after-free.md +++ b/data/slide/120-use-after-free.md @@ -3,14 +3,3 @@ - Create webpage object in JavaScript - Close webpage in JavaScript - Do something with webpage in JavaScript - -```javascript -var phantom = this.phantom || {exit: function () {}}; -var page = require('webpage').create(); -// code, code, code… -page.open('about:blank', function () { - page.close(); - console.log('☮ out!'); - phantom.exit(); -}); -``` diff --git a/data/slide/130-use-after-free-code.md b/data/slide/130-use-after-free-code.md new file mode 100644 index 0000000..cd3c6e0 --- /dev/null +++ b/data/slide/130-use-after-free-code.md @@ -0,0 +1,11 @@ +# Use After Free + +```javascript +var page = require('webpage').create(); +// code, code, code… +page.open('about:blank', function () { + page.close(); + console.log('☮ out!'); + phantom.exit(); +}); +``` diff --git a/data/slide/130-breathe.md b/data/slide/140-breathe.md similarity index 100% rename from data/slide/130-breathe.md rename to data/slide/140-breathe.md diff --git a/data/slide/140-what-does-it-give-me.md b/data/slide/150-what-does-it-give-me.md similarity index 98% rename from data/slide/140-what-does-it-give-me.md rename to data/slide/150-what-does-it-give-me.md index ada65d6..f5ef219 100644 --- a/data/slide/140-what-does-it-give-me.md +++ b/data/slide/150-what-does-it-give-me.md @@ -3,6 +3,8 @@ - phantom Object - Web Page Module - Child Process Module + + - File System Module - System Module - Web Server Module diff --git a/data/slide/150-phantom-object.md b/data/slide/160-phantom-object.md similarity index 88% rename from data/slide/150-phantom-object.md rename to data/slide/160-phantom-object.md index b4c6f19..340c1f5 100644 --- a/data/slide/150-phantom-object.md +++ b/data/slide/160-phantom-object.md @@ -3,9 +3,12 @@ - exit - onError - version +- libraryPath +- injectJs + + +- scriptName - addCookie - clearCookies - deleteCookie -- libraryPath -- injectJs - … diff --git a/data/slide/160-child.md b/data/slide/170-child.md similarity index 66% rename from data/slide/160-child.md rename to data/slide/170-child.md index 478bcea..69c68fc 100644 --- a/data/slide/160-child.md +++ b/data/slide/170-child.md @@ -9,9 +9,3 @@ child.stderr.on('data', function (data) {...}) child.on('exit', function (code) {...}) child.kill('SIGKILL') ``` -- execFile -```javascript -var execFile = require('child_process').execFile; -execFile('some-command', ['flags'], null, function (err, stdout, stderr) { -}) -``` diff --git a/data/slide/180-child-2.md b/data/slide/180-child-2.md new file mode 100644 index 0000000..715855e --- /dev/null +++ b/data/slide/180-child-2.md @@ -0,0 +1,10 @@ +# Child Process Module + +- execFile +```javascript +var execFile = require('child_process').execFile; +function execCb(err, stdout, stderr) { + // handle callback +} +execFile('some-command', ['flags'], null, execCb); +``` diff --git a/data/slide/170-fs.md b/data/slide/190-fs.md similarity index 66% rename from data/slide/170-fs.md rename to data/slide/190-fs.md index bd6e20d..16ad0de 100644 --- a/data/slide/170-fs.md +++ b/data/slide/190-fs.md @@ -1,10 +1,14 @@ # File System Module +- absolute - read - move - remove - list + + - makeDirectory/makeTree -- isDirectory/isExecutable/isFile/isLink +- isDirectory/isFile +- isExecutable/isLink - removeDirectory/removeTree - … diff --git a/data/slide/180-system.md b/data/slide/200-system.md similarity index 100% rename from data/slide/180-system.md rename to data/slide/200-system.md diff --git a/data/slide/190-web-server.md b/data/slide/210-web-server.md similarity index 100% rename from data/slide/190-web-server.md rename to data/slide/210-web-server.md diff --git a/data/slide/200-web-page.md b/data/slide/220-web-page.md similarity index 66% rename from data/slide/200-web-page.md rename to data/slide/220-web-page.md index 7171b1a..280ff04 100644 --- a/data/slide/200-web-page.md +++ b/data/slide/220-web-page.md @@ -5,7 +5,10 @@ - render - includeJs - url + + - title - content -- onResourceReceived/onResourceRequested +- onResourceReceived +- onResourceRequested - … diff --git a/data/slide/210-js-runtime.md b/data/slide/230-js-runtime.md similarity index 100% rename from data/slide/210-js-runtime.md rename to data/slide/230-js-runtime.md diff --git a/data/slide/220-code-share.md b/data/slide/240-code-share.md similarity index 100% rename from data/slide/220-code-share.md rename to data/slide/240-code-share.md diff --git a/data/slide/230-backbone-umd.md b/data/slide/250-backbone-umd.md similarity index 100% rename from data/slide/230-backbone-umd.md rename to data/slide/250-backbone-umd.md diff --git a/data/slide/240-backbone-phantom.md b/data/slide/260-backbone-phantom.md similarity index 80% rename from data/slide/240-backbone-phantom.md rename to data/slide/260-backbone-phantom.md index 1014c4a..7376b76 100644 --- a/data/slide/240-backbone-phantom.md +++ b/data/slide/260-backbone-phantom.md @@ -2,7 +2,7 @@ ```javascript var phantom = phantom || {exit: function () {}}; -var _ = require('../../vendor/underscore/underscore'); +window._ = require('../../vendor/underscore/underscore'); phantom.injectJs('../../vendor/backbone/backbone.js'); console.log(_.toString()); console.log(Backbone.View.toString()); diff --git a/data/slide/250-jasmine-test.md b/data/slide/270-jasmine-test.md similarity index 100% rename from data/slide/250-jasmine-test.md rename to data/slide/270-jasmine-test.md diff --git a/data/slide/270-more.md b/data/slide/270-more.md deleted file mode 100644 index b0f7528..0000000 --- a/data/slide/270-more.md +++ /dev/null @@ -1,6 +0,0 @@ -# More goodies - - - The `--remote-debugger-port [debug-port]` flag - - Web server module - - Use a WebSocket in a webpage - - So much awesomeness diff --git a/data/slide/260-jasmine-test-runner.md b/data/slide/280-jasmine-test-runner.md similarity index 100% rename from data/slide/260-jasmine-test-runner.md rename to data/slide/280-jasmine-test-runner.md diff --git a/data/slide/290-more.md b/data/slide/290-more.md new file mode 100644 index 0000000..37d98a9 --- /dev/null +++ b/data/slide/290-more.md @@ -0,0 +1,6 @@ +# What about the rest of the browser? + + - HTML5? + + + - CSS3? diff --git a/data/slide/280-fin.md b/data/slide/300-fin.md similarity index 100% rename from data/slide/280-fin.md rename to data/slide/300-fin.md