Skip to content

Commit

Permalink
build v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@janpaepke
janpaepke committed Oct 14, 2014
1 parent b971e2b commit 650c10d
Show file tree
Hide file tree
Showing 14 changed files with 483 additions and 342 deletions.
23 changes: 21 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
CHANGELOG
=========

## 1.2.0 (2014-10-14)

### features
- AMD loader support (See issue [160](https://github.com/janpaepke/ScrollMagic/issues/160))
- added warning for tweens being overwritten (See issue [145](https://github.com/janpaepke/ScrollMagic/issues/145))

#### project changes:
- better code for mobile clicks (See issue [169](https://github.com/janpaepke/ScrollMagic/issues/169))
- updated [draw example](http://janpaepke.github.io/ScrollMagic/examples/advanced/svg_drawing.html) to camel case to support Firefox
- updated [parralax sections example](http://janpaepke.github.io/ScrollMagic/examples/advanced/parallax_sections.html) to moving divs instead of background position
- added new references
- added favicon

#### bugfixes:
- scroll momentum increased in Firefox over fixed elements (See issue [164](https://github.com/janpaepke/ScrollMagic/issues/164))
- 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))
- bugfix for pinned elements jittering if inside a container, because of the delayed position update in refreshInterval


## 1.1.0 (2014-09-04)

#### potentially breaking changes:
#### potentially breaking code changes:
- **zero duration scene events & states**
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.
This means there will never be an `end` event triggered, which reflects the behaviour more accurately.
Expand All @@ -16,7 +35,7 @@ CHANGELOG
- **`change` event only fires when change actually happened**
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.

#### non-breaking changes
#### non-breaking code changes
- **scenes are sorted in controller**
Scenes attached to the same controller are now updated in the order of their start position.
This way DOM modifcations (e.g. tweens) that influence each other are sure to be called in the right order.
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#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)
#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)

###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!")

Expand Down
2 changes: 1 addition & 1 deletion ScrollMagic.jquery.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ScrollMagic",
"title": "ScrollMagic",
"version": "1.1.2",
"version": "1.2.0",
"description": "The jQuery plugin for magical scroll interactions.",
"author": {
"name": "Jan Paepke",
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ScrollMagic",
"version": "1.1.2",
"version": "1.2.0",
"description": "The jQuery plugin for magical scroll interactions.",
"homepage": "http://janpaepke.github.io/ScrollMagic/",
"authors": [
Expand Down
35 changes: 18 additions & 17 deletions docs/ScrollMagic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<![endif]-->
<link type="text/css" rel="stylesheet" href="styles/sunlight.default.css">
<link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon">


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

<tr>

<td class="name"><code>_refreshInterval</code></td>
<td class="name"><code>refreshInterval</code></td>


<td class="type">
Expand Down Expand Up @@ -455,7 +456,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -600,7 +601,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -759,7 +760,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -901,7 +902,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -1061,7 +1062,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -1189,7 +1190,7 @@ <h5>Parameters:</h5>
</td>


<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>
<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>
</tr>


Expand Down Expand Up @@ -1221,7 +1222,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -1261,7 +1262,7 @@ <h5>Returns:</h5>

<h5>Example</h5>

<pre class="sunlight-highlight-javascript">// update the controller on next tick (saves performance)controller.update();// update the controller immediatelycontroller.update(true);</pre>
<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>



Expand Down Expand Up @@ -1383,7 +1384,7 @@ <h5>Parameters:</h5>
</td>


<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>
<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>
</tr>


Expand Down Expand Up @@ -1415,7 +1416,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -1455,7 +1456,7 @@ <h5>Returns:</h5>

<h5>Example</h5>

<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>
<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>



Expand Down Expand Up @@ -1570,7 +1571,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -1724,7 +1725,7 @@ <h5>Parameters:</h5>

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


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

<div class="description">
<p><strong>Get</strong> the current scrollPosition or <strong>Set</strong> a new method to calculate it.<br>-&gt; <strong>GET</strong>:
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>
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>
<p>-&gt; <strong>SET</strong>:
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>
<p>To change the current scroll position please use <code>ScrollMagic.scrollTo()</code>.</p>
Expand Down Expand Up @@ -1882,7 +1883,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -2048,7 +2049,7 @@ <h5>Parameters:</h5>

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


Expand Down
Loading

0 comments on commit 650c10d

Please sign in to comment.