Skip to content

Commit 093d7d8

Browse files
author
Lanny McNie
committed
Updates to tutorials: Updated to latest available CDN lib (0.8.1). Also fixed a few issues.
1 parent 11df5aa commit 093d7d8

File tree

21 files changed

+55
-29
lines changed

21 files changed

+55
-29
lines changed

_assets/css/shared.css

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,31 @@ code {
6565
padding: 1px 3px;
6666
font-family: Courier New, Courier, serif;
6767
font-weight: bold;
68+
}
69+
70+
/**
71+
* For modern browsers
72+
* 1. The space content is one way to avoid an Opera bug when the
73+
* contenteditable attribute is included anywhere else in the document.
74+
* Otherwise it causes space to appear at the top and bottom of elements
75+
* that are clearfixed.
76+
* 2. The use of `table` rather than `block` is only necessary if using
77+
* `:before` to contain the top-margins of child elements.
78+
*/
79+
.cf:before,
80+
.cf:after {
81+
content: " "; /* 1 */
82+
display: table; /* 2 */
83+
}
84+
85+
.cf:after {
86+
clear: both;
87+
}
88+
89+
/**
90+
* For IE 6/7 only
91+
* Include this rule to trigger hasLayout and contain floats.
92+
*/
93+
.cf {
94+
*zoom: 1;
6895
}

tutorials/Animation and Ticker/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<h1>EaselJS <em>Animation and Ticker</em></h1>
2222
<p>
2323
<strong>Synopsis:</strong> Create a simple programmatic animation, and learn about the Ticker class.<br>
24-
<strong>Topics:</strong> animation, Ticker, setFPS, timingMode, getTime, setPaused,
24+
<strong>Topics:</strong> animation, Ticker, framerate, timingMode, getTime, paused,
2525
requestAnimationFrame, Stage.update, time based animation<br/>
2626
<strong>Target:</strong> EaselJS v0.6.0 and above
2727
</p>
@@ -84,8 +84,8 @@ <h2>Ticker</h2>
8484
</p>
8585
<textarea class="brush: js;" readonly>
8686
// these are equivalent, 1000ms / 40fps = 25ms
87-
createjs.Ticker.setInterval(25);
88-
createjs.Ticker.setFPS(40);
87+
createjs.Ticker.interval = 25;
88+
createjs.Ticker.framerate = 40;
8989
</textarea>
9090
<p>
9191
Let's combine all of that to make a circle move across the stage at 30 frames per second. And don't
@@ -176,7 +176,7 @@ <h2>Timing Modes</h2>
176176
</p>
177177
<textarea class="brush: js;" readonly>
178178
createjs.Ticker.timingMode = createjs.Ticker.RAF_SYNCHED;
179-
createjs.Ticker.setFPS(30);
179+
createjs.Ticker.framerate = 30;
180180
</textarea>
181181
</section>
182182

@@ -186,7 +186,7 @@ <h2>Pausing</h2>
186186
</header>
187187
<p>
188188
<code>Ticker</code> also provides the ability to pause all of your animations. All listener you add to
189-
Ticker are "pauseable". Calling <code>Ticker.setPaused(true);</code> will stop <code>Ticker</code> from
189+
Ticker are "pauseable". Calling <code>Ticker.paused = true;</code> will stop <code>Ticker</code> from
190190
calling <code>tick</code> on all pauseable listeners.
191191
</p>
192192
<p>
@@ -198,7 +198,7 @@ <h2>Pausing</h2>
198198
green "unpauseable" circle does not. You can also see how the total pauseable time stops updating when
199199
<code>Ticker</code> is paused.
200200
</p>
201-
<iframe src="pausing.html" class="demo" data-description="showing Ticker.setPaused() at work. Click to toggle pause." width="100%" height="245px"></iframe>
201+
<iframe src="pausing.html" class="demo" data-description="showing Ticker.paused at work. Click to toggle pause." width="100%" height="245px"></iframe>
202202
</section>
203203

204204
<section>

tutorials/Animation and Ticker/onTick.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>EaselJS demo: DisplayObject.onTick</title>
55
<link href="../_shared/demo.css" rel="stylesheet" type="text/css">
6-
<script src="http://code.createjs.com/easeljs-0.7.0.min.js"></script>
6+
<script src="http://code.createjs.com/easeljs-0.8.1.min.js"></script>
77
<script>
88

99
var stage, circle;

tutorials/Animation and Ticker/pausing.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>EaselJS demo: Ticker.setPaused()</title>
55
<link href="../_shared/demo.css" rel="stylesheet" type="text/css">
6-
<script src="http://code.createjs.com/easeljs-0.7.0.min.js"></script>
6+
<script src="http://code.createjs.com/easeljs-0.8.1.min.js"></script>
77
<script>
88

99
var stage, pauseCircle, goCircle, output;

tutorials/Animation and Ticker/simple.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>EaselJS demo: Simple animation</title>
55
<link href="../_shared/demo.css" rel="stylesheet" type="text/css">
6-
<script src="http://code.createjs.com/easeljs-0.7.0.min.js"></script>
6+
<script src="http://code.createjs.com/easeljs-0.8.1.min.js"></script>
77
<script>
88

99
var stage, circle;

tutorials/Animation and Ticker/timeBased.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>EaselJS demo: Time based animation</title>
55
<link href="../_shared/demo.css" rel="stylesheet" type="text/css">
6-
<script src="http://code.createjs.com/easeljs-0.7.0.min.js"></script>
6+
<script src="http://code.createjs.com/easeljs-0.8.1.min.js"></script>
77
<script>
88

99
var stage, timeCircle, tickCircle;

tutorials/Fonts/GoogleWebFont.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<link href="../_shared/demo.css" rel="stylesheet" type="text/css">
88
<link href='http://fonts.googleapis.com/css?family=Dorsa' rel='stylesheet' type='text/css'>
99
<script src="http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js"></script>
10-
<script src="http://code.createjs.com/easeljs-0.7.0.min.js"></script>
10+
<script src="http://code.createjs.com/easeljs-0.8.1.min.js"></script>
1111
<script type="text/javascript">
1212
WebFont.load({
1313
google: {

tutorials/Fonts/index.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
position: relative;
1313
left: 0px;
1414
width: 800px;
15-
height: 220px;
1615
}
1716
.box {
1817
position: relative;
1918
float: left;
2019
width: 150px;
21-
height: 250px;
2220
}
2321
</style>
2422

@@ -53,7 +51,7 @@ <h2>CSS: Font Primer</h2>
5351
on the viewers machine. Lucky for us CSS has a fallback system: if the font
5452
you have selected is not installed, the browser will choose a similar font from a generic font set.
5553
</p>
56-
<div class="container">
54+
<div class="container cf">
5755
<div class="box" style="left: 0px">
5856
<p align="center">
5957
<b>SERIF</b>

tutorials/Getting Started/demo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>EaselJS demo: Getting started</title>
55
<link href="../_shared/demo.css" rel="stylesheet" type="text/css">
6-
<script src="http://code.createjs.com/easeljs-0.7.0.min.js"></script>
6+
<script src="http://code.createjs.com/easeljs-0.8.1.min.js"></script>
77
<script>
88
function init() {
99
var stage = new createjs.Stage("demoCanvas");

tutorials/Getting Started/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1>EaselJS <em>Getting Started</em></h1>
2222
<p>
2323
<strong>Synopsis:</strong> Set up an HTML document with a canvas tag and the EaselJS libraries, and draw a shape to the stage.<br>
2424
<strong>Topics:</strong> linking libraries, Stage, Shape, addChild, Stage.update(), CDN, source files<br>
25-
<strong>Target:</strong> EaselJS v0.7.0
25+
<strong>Target:</strong> EaselJS v0.8.1
2626
</p>
2727
</header>
2828
<p class="highlight">
@@ -41,7 +41,7 @@ <h2>Setting up your html document</h2>
4141
<!DOCTYPE html>
4242
<html>
4343
<head>
44-
<script src="http://code.createjs.com/easeljs-0.7.0.min.js"></script>
44+
<script src="http://code.createjs.com/easeljs-0.8.1.min.js"></script>
4545
<script>
4646
function init() {
4747
// code here.

0 commit comments

Comments
 (0)