Skip to content

Commit 650c10d

Browse files
committed
build v1.2.0
1 parent b971e2b commit 650c10d

14 files changed

+483
-342
lines changed

CHANGELOG.md

+21-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,28 @@
11
CHANGELOG
22
=========
33

4+
## 1.2.0 (2014-10-14)
5+
6+
### features
7+
- AMD loader support (See issue [160](https://github.com/janpaepke/ScrollMagic/issues/160))
8+
- added warning for tweens being overwritten (See issue [145](https://github.com/janpaepke/ScrollMagic/issues/145))
9+
10+
#### project changes:
11+
- better code for mobile clicks (See issue [169](https://github.com/janpaepke/ScrollMagic/issues/169))
12+
- updated [draw example](http://janpaepke.github.io/ScrollMagic/examples/advanced/svg_drawing.html) to camel case to support Firefox
13+
- updated [parralax sections example](http://janpaepke.github.io/ScrollMagic/examples/advanced/parallax_sections.html) to moving divs instead of background position
14+
- added new references
15+
- added favicon
16+
17+
#### bugfixes:
18+
- scroll momentum increased in Firefox over fixed elements (See issue [164](https://github.com/janpaepke/ScrollMagic/issues/164))
19+
- parallax example was juggy in Firefox and Safari -> removed reliance of TweenMax ticker in favor of requestAnimationFrame (See issue [167](https://github.com/janpaepke/ScrollMagic/issues/167))
20+
- bugfix for pinned elements jittering if inside a container, because of the delayed position update in refreshInterval
21+
22+
423
## 1.1.0 (2014-09-04)
524

6-
#### potentially breaking changes:
25+
#### potentially breaking code changes:
726
- **zero duration scene events & states**
827
The event logic for zero duration scenes has been changed: From now on a zero duration scene will trigger `enter`, `start`, `progress` (in this order) when scrolling forward past the trigger point and `progress`, `start`, `leave` when scrolling in reverse.
928
This means there will never be an `end` event triggered, which reflects the behaviour more accurately.
@@ -16,7 +35,7 @@ CHANGELOG
1635
- **`change` event only fires when change actually happened**
1736
If a setter is used with the current value or the internal validator fails and defaults to the same value an option is already set to, no `change` event will be fired anymore.
1837

19-
#### non-breaking changes
38+
#### non-breaking code changes
2039
- **scenes are sorted in controller**
2140
Scenes attached to the same controller are now updated in the order of their start position.
2241
This way DOM modifcations (e.g. tweens) that influence each other are sure to be called in the right order.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ScrollMagic <a href='https://github.com/janpaepke/ScrollMagic/blob/master/CHANGELOG.md' class='version' title='Whats New?'>v1.1.2</a> [![Build Status](https://api.travis-ci.org/janpaepke/ScrollMagic.svg?branch=master)](https://travis-ci.org/janpaepke/ScrollMagic)
1+
#ScrollMagic <a href='https://github.com/janpaepke/ScrollMagic/blob/master/CHANGELOG.md' class='version' title='Whats New?'>v1.2.0</a> [![Build Status](https://api.travis-ci.org/janpaepke/ScrollMagic.svg?branch=master)](https://travis-ci.org/janpaepke/ScrollMagic)
22

33
###The jQuery plugin for magical scroll interactions. [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif "Shut up and take my money!")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8BJC8B58XHKLL "Shut up and take my money!")
44

ScrollMagic.jquery.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ScrollMagic",
33
"title": "ScrollMagic",
4-
"version": "1.1.2",
4+
"version": "1.2.0",
55
"description": "The jQuery plugin for magical scroll interactions.",
66
"author": {
77
"name": "Jan Paepke",

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ScrollMagic",
3-
"version": "1.1.2",
3+
"version": "1.2.0",
44
"description": "The jQuery plugin for magical scroll interactions.",
55
"homepage": "http://janpaepke.github.io/ScrollMagic/",
66
"authors": [

docs/ScrollMagic.html

+18-17
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<![endif]-->
1313
<link type="text/css" rel="stylesheet" href="styles/sunlight.default.css">
1414
<link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
15+
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon">
1516

1617

1718
<link type="text/css" rel="stylesheet" href="styles/site.cosmo.css">
@@ -384,7 +385,7 @@ <h6>Properties</h6>
384385

385386
<tr>
386387

387-
<td class="name"><code>_refreshInterval</code></td>
388+
<td class="name"><code>refreshInterval</code></td>
388389

389390

390391
<td class="type">
@@ -455,7 +456,7 @@ <h6>Properties</h6>
455456

456457
<dt class="tag-source">Source:</dt>
457458
<dd class="tag-source"><ul class="dummy"><li>
458-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-55">line 55</a>
459+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-71">line 71</a>
459460
</li></ul></dd>
460461

461462

@@ -600,7 +601,7 @@ <h5>Parameters:</h5>
600601

601602
<dt class="tag-source">Source:</dt>
602603
<dd class="tag-source"><ul class="dummy"><li>
603-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-263">line 263</a>
604+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-275">line 275</a>
604605
</li></ul></dd>
605606

606607

@@ -759,7 +760,7 @@ <h5>Parameters:</h5>
759760

760761
<dt class="tag-source">Source:</dt>
761762
<dd class="tag-source"><ul class="dummy"><li>
762-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-599">line 599</a>
763+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-611">line 611</a>
763764
</li></ul></dd>
764765

765766

@@ -901,7 +902,7 @@ <h5>Parameters:</h5>
901902

902903
<dt class="tag-source">Source:</dt>
903904
<dd class="tag-source"><ul class="dummy"><li>
904-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-306">line 306</a>
905+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-318">line 318</a>
905906
</li></ul></dd>
906907

907908

@@ -1061,7 +1062,7 @@ <h5>Parameters:</h5>
10611062

10621063
<dt class="tag-source">Source:</dt>
10631064
<dd class="tag-source"><ul class="dummy"><li>
1064-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-425">line 425</a>
1065+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-437">line 437</a>
10651066
</li></ul></dd>
10661067

10671068

@@ -1189,7 +1190,7 @@ <h5>Parameters:</h5>
11891190
</td>
11901191

11911192

1192-
<td class="description last"><p>If <code>true</code> the update will be instant, if <code>false</code> it will wait until next tweenmax tick (better performance)</p></td>
1193+
<td class="description last"><p>If <code>true</code> the update will be instant, if <code>false</code> it will wait until next update cycle (better performance)</p></td>
11931194
</tr>
11941195

11951196

@@ -1221,7 +1222,7 @@ <h5>Parameters:</h5>
12211222

12221223
<dt class="tag-source">Source:</dt>
12231224
<dd class="tag-source"><ul class="dummy"><li>
1224-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-385">line 385</a>
1225+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-397">line 397</a>
12251226
</li></ul></dd>
12261227

12271228

@@ -1261,7 +1262,7 @@ <h5>Returns:</h5>
12611262

12621263
<h5>Example</h5>
12631264

1264-
<pre class="sunlight-highlight-javascript">// update the controller on next tick (saves performance)controller.update();// update the controller immediatelycontroller.update(true);</pre>
1265+
<pre class="sunlight-highlight-javascript">// update the controller on next cycle (saves performance due to elimination of redundant updates)controller.update();// update the controller immediatelycontroller.update(true);</pre>
12651266

12661267

12671268

@@ -1383,7 +1384,7 @@ <h5>Parameters:</h5>
13831384
</td>
13841385

13851386

1386-
<td class="description last"><p>If <code>true</code> the update will be instant, if <code>false</code> it will wait until next tweenmax tick.<br> This is useful when changing multiple properties of the scene - this way it will only be updated once all new properties are set (onTick).</p></td>
1387+
<td class="description last"><p>If <code>true</code> the update will be instant, if <code>false</code> it will wait until next update cycle.<br> This is useful when changing multiple properties of the scene - this way it will only be updated once all new properties are set (updateScenes).</p></td>
13871388
</tr>
13881389

13891390

@@ -1415,7 +1416,7 @@ <h5>Parameters:</h5>
14151416

14161417
<dt class="tag-source">Source:</dt>
14171418
<dd class="tag-source"><ul class="dummy"><li>
1418-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-345">line 345</a>
1419+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-357">line 357</a>
14191420
</li></ul></dd>
14201421

14211422

@@ -1455,7 +1456,7 @@ <h5>Returns:</h5>
14551456

14561457
<h5>Example</h5>
14571458

1458-
<pre class="sunlight-highlight-javascript">// update a specific scene on next tickcontroller.updateScene(scene);// update a specific scene immediatelycontroller.updateScene(scene, true);// update multiple scenes scene on next tickcontroller.updateScene([scene1, scene2, scene3]);</pre>
1459+
<pre class="sunlight-highlight-javascript">// update a specific scene on next cyclecontroller.updateScene(scene);// update a specific scene immediatelycontroller.updateScene(scene, true);// update multiple scenes scene on next cyclecontroller.updateScene([scene1, scene2, scene3]);</pre>
14591460

14601461

14611462

@@ -1570,7 +1571,7 @@ <h5>Parameters:</h5>
15701571

15711572
<dt class="tag-source">Source:</dt>
15721573
<dd class="tag-source"><ul class="dummy"><li>
1573-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-575">line 575</a>
1574+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-587">line 587</a>
15741575
</li></ul></dd>
15751576

15761577

@@ -1724,7 +1725,7 @@ <h5>Parameters:</h5>
17241725

17251726
<dt class="tag-source">Source:</dt>
17261727
<dd class="tag-source"><ul class="dummy"><li>
1727-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-551">line 551</a>
1728+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-563">line 563</a>
17281729
</li></ul></dd>
17291730

17301731

@@ -1785,7 +1786,7 @@ <h4 class="name" id="scrollPos"><span class="type-signature"></span>scrollPos<sp
17851786

17861787
<div class="description">
17871788
<p><strong>Get</strong> the current scrollPosition or <strong>Set</strong> a new method to calculate it.<br>-&gt; <strong>GET</strong>:
1788-
When used as a getter this function will return the current scroll position.<br>To get a cached value use ScrollMagic.info(&quot;scrollPos&quot;), which will be updated on tick to save on performance.<br>For vertical controllers it will return the top scroll offset and for horizontal applications it will return the left offset.</p>
1789+
When used as a getter this function will return the current scroll position.<br>To get a cached value use ScrollMagic.info(&quot;scrollPos&quot;), which will be updated in the update cycle.<br>For vertical controllers it will return the top scroll offset and for horizontal applications it will return the left offset.</p>
17891790
<p>-&gt; <strong>SET</strong>:
17901791
When used as a setter this method prodes a way to permanently overwrite the controller's scroll position calculation.<br>A typical usecase is when the scroll position is not reflected by the containers scrollTop or scrollLeft values, but for example by the inner offset of a child container.<br>Moving a child container inside a parent is a commonly used method for several scrolling frameworks, including iScroll.<br>By providing an alternate calculation function you can make sure ScrollMagic receives the correct scroll position.<br>Please also bear in mind that your function should return y values for vertical scrolls an x for horizontals.</p>
17911792
<p>To change the current scroll position please use <code>ScrollMagic.scrollTo()</code>.</p>
@@ -1882,7 +1883,7 @@ <h5>Parameters:</h5>
18821883

18831884
<dt class="tag-source">Source:</dt>
18841885
<dd class="tag-source"><ul class="dummy"><li>
1885-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-485">line 485</a>
1886+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-497">line 497</a>
18861887
</li></ul></dd>
18871888

18881889

@@ -2048,7 +2049,7 @@ <h5>Parameters:</h5>
20482049

20492050
<dt class="tag-source">Source:</dt>
20502051
<dd class="tag-source"><ul class="dummy"><li>
2051-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-518">line 518</a>
2052+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-530">line 530</a>
20522053
</li></ul></dd>
20532054

20542055

0 commit comments

Comments
 (0)