Skip to content

Commit

Permalink
Minified source.
Browse files Browse the repository at this point in the history
ready for release :)
  • Loading branch information
janpaepke committed Feb 26, 2014
1 parent 29cb711 commit c468c90
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 58 deletions.
1 change: 1 addition & 0 deletions css/demo.css
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ h3 {

#tweens {
height: auto;
overflow: hidden;
}

#tweens h3 {
Expand Down
16 changes: 8 additions & 8 deletions docs/ScrollMagic.html
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ <h6>Properties</h6>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-52">line 52</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-50">line 50</a>
</li></ul></dd>


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

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-203">line 203</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-201">line 201</a>
</li></ul></dd>


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

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-384">line 384</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-382">line 382</a>
</li></ul></dd>


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

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-327">line 327</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-325">line 325</a>
</li></ul></dd>


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

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-360">line 360</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-358">line 358</a>
</li></ul></dd>


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

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-240">line 240</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-238">line 238</a>
</li></ul></dd>


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

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-299">line 299</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-297">line 297</a>
</li></ul></dd>


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

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-272">line 272</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-270">line 270</a>
</li></ul></dd>


Expand Down
60 changes: 30 additions & 30 deletions docs/ScrollScene.html

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions docs/classes.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ <h6>Properties</h6>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1600">line 1600</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1598">line 1598</a>
</li></ul></dd>


Expand Down Expand Up @@ -654,7 +654,7 @@ <h6>Properties</h6>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1507">line 1507</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1505">line 1505</a>
</li></ul></dd>


Expand Down Expand Up @@ -923,7 +923,7 @@ <h6>Properties</h6>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1526">line 1526</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1524">line 1524</a>
</li></ul></dd>


Expand Down Expand Up @@ -1192,7 +1192,7 @@ <h6>Properties</h6>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1545">line 1545</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1543">line 1543</a>
</li></ul></dd>


Expand Down Expand Up @@ -1460,7 +1460,7 @@ <h6>Properties</h6>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1582">line 1582</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1580">line 1580</a>
</li></ul></dd>


Expand Down Expand Up @@ -1729,7 +1729,7 @@ <h6>Properties</h6>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1488">line 1488</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1486">line 1486</a>
</li></ul></dd>


Expand Down Expand Up @@ -1997,7 +1997,7 @@ <h6>Properties</h6>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1564">line 1564</a>
<a href="jquery.scrollmagic.js.html">/Users/jan/desktop/ScrollMagic/js/jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1562">line 1562</a>
</li></ul></dd>


Expand Down
2 changes: 0 additions & 2 deletions docs/jquery.scrollmagic.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ <h1 class="page-title">Source: /Users/jan/desktop/ScrollMagic/js/jquery.scrollma
@license Dual licensed under MIT license and GPL.
@author Jan Paepke - [email protected]

@todo: minify
-----------------------
@todo: bug: when cascading pins (pinning one element multiple times) and later removing them without reset, positioning errors occur.
@todo: bug: having multiple scroll directions with cascaded pins doesn't work (one scroll vertical, one horizontal)
@todo: bug: pin positioning problems with centered pins in IE9 (i.e. in examples)
Expand Down
6 changes: 3 additions & 3 deletions examples/advanced/parallax_scrolling.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ <h2>No big deal, if you have ScrollMagic.</h2>
// build tween
var tween = new TimelineMax ()
.add([
TweenMax.to("#parallaxContainer .layer1", 1, {"background-position-x": -40, ease: Linear.easeNone}),
TweenMax.to("#parallaxContainer .layer2", 1, {"background-position-x": -500, ease: Linear.easeNone}),
TweenMax.to("#parallaxContainer .layer3", 1, {"background-position-x": -225, ease: Linear.easeNone})
TweenMax.to("#parallaxContainer .layer1", 1, {backgroundPosition: "-40% 0", ease: Linear.easeNone}),
TweenMax.to("#parallaxContainer .layer2", 1, {backgroundPosition: "-500% 0", ease: Linear.easeNone}),
TweenMax.to("#parallaxContainer .layer3", 1, {backgroundPosition: "-225% 0", ease: Linear.easeNone})
]);

// build scene
Expand Down
11 changes: 5 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
<script type="text/javascript" src="js/_dependent/greensock/plugins/ScrollToPlugin.min.js"></script>
<script type="text/javascript" src="js/_dependent/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="js/_examples/modernizr.custom.min.js"></script>
<script type="text/javascript" src="js/jquery.scrollmagic.js"></script>
<script type="text/javascript" src="js/jquery.scrollmagic.debug.js"></script>
<script type="text/javascript" src="js/jquery.scrollmagic.min.js"></script>
<script type="text/javascript" src="js/_examples/demo.js"></script>
</head>
<body>
Expand Down Expand Up @@ -143,7 +142,7 @@ <h3>text properties</h3>
.addTo(controller)
.triggerHook("onCenter")
.triggerElement(elements[1])
.setTween(TweenMax.from(elements[1], 1, {left: "-50%", "margin-left": -200, ease: Back.easeOut}));
.setTween(TweenMax.from(elements[1], 1, {left: "-50%", marginLeft: -200, ease: Back.easeOut}));

// spin
new ScrollScene(sceneOptions)
Expand All @@ -166,7 +165,7 @@ <h3>text properties</h3>
.addTo(controller)
.triggerHook("onCenter")
.triggerElement(elements[4])
.setTween(TweenMax.staggerTo($(elements[4]).children("span"), 0.0001, {"text-decoration": "underline", "text-transform": "uppercase"}, 0.2));
.setTween(TweenMax.staggerTo($(elements[4]).children("span"), 0.0001, {textDecoration: "underline", textTransform: "uppercase"}, 0.2));
</script>
</section>
<section id="pin">
Expand All @@ -183,7 +182,7 @@ <h3 id="unpin">unpin</h3>
// ani
var pinani = new TimelineMax()
// pin move down
.add(TweenMax.from("#pin>h3:first-child", 0.5, {top: "0%", "margin-top": 0}))
.add(TweenMax.from("#pin>h3:first-child", 0.5, {top: "0%", marginTop: 0}))
// wipe
.add(TweenMax.to("#wipe", 1, {width: "100%"}))
// slide
Expand Down Expand Up @@ -243,7 +242,7 @@ <h3 id="big">parallax</h3>
.triggerHook("onCenter")
.setTween(new TimelineMax().add([
TweenMax.fromTo("#parallax #big", 1, {scale: 2, alpha: 0.1, top: "100%"}, {top: "0%", ease: Linear.easeNone}),
TweenMax.to("#parallax #parallaxbg", 1, {"background-position-y": -260, ease: Linear.easeNone})
TweenMax.to("#parallax #parallaxbg", 1, {backgroundPosition: "0 -260%", ease: Linear.easeNone})
]));
</script>
</section>
Expand Down
2 changes: 0 additions & 2 deletions js/jquery.scrollmagic.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Greensock License info at http://www.greensock.com/licensing/
@license Dual licensed under MIT license and GPL.
@author Jan Paepke - [email protected]
@todo: minify
-----------------------
@todo: bug: when cascading pins (pinning one element multiple times) and later removing them without reset, positioning errors occur.
@todo: bug: having multiple scroll directions with cascaded pins doesn't work (one scroll vertical, one horizontal)
@todo: bug: pin positioning problems with centered pins in IE9 (i.e. in examples)
Expand Down
Loading

0 comments on commit c468c90

Please sign in to comment.