Skip to content

Commit

Permalink
velocity kick is now carried after images get loaded unless Reel ha…
Browse files Browse the repository at this point in the history
…d already been reeled by user. #142
  • Loading branch information
pisi committed Aug 19, 2012
1 parent b4e2eab commit c17d187
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 43 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.markdown
@@ -1,6 +1,12 @@
Changelog
=========

Development
-----------

* For smooth `velocity` kick it now follows `loaded` event (instead of `setup`) (GH-142).


Version 1.2
-----------

Expand Down
13 changes: 8 additions & 5 deletions docs/jquery.reel.html
Expand Up @@ -24,8 +24,8 @@
<span class="cm"> *</span>
<span class="cm"> * jQuery Reel</span>
<span class="cm"> * http://jquery.vostrel.cz/reel</span>
<span class="cm"> * Version: 1.2</span>
<span class="cm"> * Updated: 2012-07-15</span>
<span class="cm"> * Version: 1.2-post-loaded-velocity</span>
<span class="cm"> * Updated: 2012-08-19</span>
<span class="cm"> *</span>
<span class="cm"> * Requires jQuery 1.5 or higher</span>
<span class="cm"> */</span>
Expand Down Expand Up @@ -53,7 +53,7 @@
It is locally referenced as just <code>reel</code> for speedier access.</p> </td> <td class="code"> <div class="highlight"><pre> <span class="kd">var</span>
<span class="nx">reel</span><span class="o">=</span> <span class="nx">$</span><span class="p">.</span><span class="nx">reel</span><span class="o">=</span> <span class="p">{</span></pre></div> </td> </tr> <tr id='reel-version'> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#reel-version">&#182;</a> </div> <h3><code>$.reel.version</code></h3>

<p><code>String</code> (major.minor.patch), since 1.1</p> </td> <td class="code"> <div class="highlight"><pre> <span class="nx">version</span><span class="o">:</span> <span class="s1">&#39;1.2&#39;</span><span class="p">,</span></pre></div> </td> </tr> <tr id='Options'> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#Options">&#182;</a> </div> <h2>Options</h2>
<p><code>String</code> (major.minor.patch), since 1.1</p> </td> <td class="code"> <div class="highlight"><pre> <span class="nx">version</span><span class="o">:</span> <span class="s1">&#39;1.2-post-loaded-velocity&#39;</span><span class="p">,</span></pre></div> </td> </tr> <tr id='Options'> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#Options">&#182;</a> </div> <h2>Options</h2>

<p>When calling <code>.reel()</code> method you have plenty of options (far too many) available.
You collect them into one hash and supply them with your call.</p>
Expand Down Expand Up @@ -558,7 +558,7 @@ <h2>Initialization</h2>
<span class="nx">set</span><span class="p">(</span><span class="nx">_stitched_shift_</span><span class="p">,</span> <span class="mi">0</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_stage_</span><span class="p">,</span> <span class="nx">stage_id</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_backwards_</span><span class="p">,</span> <span class="nx">set</span><span class="p">(</span><span class="nx">_speed_</span><span class="p">,</span> <span class="nx">opt</span><span class="p">.</span><span class="nx">speed</span><span class="p">)</span> <span class="o">&lt;</span> <span class="mi">0</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_velocity_</span><span class="p">,</span> <span class="nx">opt</span><span class="p">.</span><span class="nx">velocity</span> <span class="o">||</span> <span class="mi">0</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_velocity_</span><span class="p">,</span> <span class="mi">0</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_vertical_</span><span class="p">,</span> <span class="nx">opt</span><span class="p">.</span><span class="nx">vertical</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_preloaded_</span><span class="p">,</span> <span class="mi">0</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_cwish_</span><span class="p">,</span> <span class="nx">negative_when</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="o">!</span><span class="nx">opt</span><span class="p">.</span><span class="nx">cw</span> <span class="o">&amp;&amp;</span> <span class="o">!</span><span class="nx">stitched</span><span class="p">));</span>
Expand All @@ -567,6 +567,7 @@ <h2>Initialization</h2>
<span class="nx">set</span><span class="p">(</span><span class="nx">_clicked_on_</span><span class="p">,</span> <span class="nx">set</span><span class="p">(</span><span class="nx">_clicked_tier_</span><span class="p">,</span> <span class="mi">0</span><span class="p">));</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_lo_</span><span class="p">,</span> <span class="nx">set</span><span class="p">(</span><span class="nx">_hi_</span><span class="p">,</span> <span class="mi">0</span><span class="p">));</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_reeling_</span><span class="p">,</span> <span class="kc">false</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_reeled_</span><span class="p">,</span> <span class="kc">false</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_opening_</span><span class="p">,</span> <span class="kc">false</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_brake_</span><span class="p">,</span> <span class="nx">opt</span><span class="p">.</span><span class="nx">brake</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_center_</span><span class="p">,</span> <span class="o">!!</span><span class="nx">opt</span><span class="p">.</span><span class="nx">orbital</span><span class="p">);</span>
Expand Down Expand Up @@ -730,6 +731,7 @@ <h2>Initialization Events</h2>
At this time, all is prepared, preloaded and configured for user interaction
or animation.</p> </td> <td class="code"> <div class="highlight"><pre> <span class="nx">loaded</span><span class="o">:</span> <span class="kd">function</span><span class="p">(</span><span class="nx">e</span><span class="p">){</span>
<span class="nx">get</span><span class="p">(</span><span class="nx">_images_</span><span class="p">).</span><span class="nx">length</span> <span class="o">&gt;</span> <span class="mi">1</span> <span class="o">||</span> <span class="nx">t</span><span class="p">.</span><span class="nx">css</span><span class="p">({</span> <span class="nx">backgroundImage</span><span class="o">:</span> <span class="nx">url</span><span class="p">(</span><span class="nx">opt</span><span class="p">.</span><span class="nx">path</span><span class="o">+</span><span class="nx">get</span><span class="p">(</span><span class="nx">_image_</span><span class="p">))</span> <span class="p">}).</span><span class="nx">attr</span><span class="p">({</span> <span class="nx">src</span><span class="o">:</span> <span class="nx">cdn</span><span class="p">(</span><span class="nx">transparent</span><span class="p">)</span> <span class="p">});</span>
<span class="nx">get</span><span class="p">(</span><span class="nx">_reeled_</span><span class="p">)</span> <span class="o">||</span> <span class="nx">set</span><span class="p">(</span><span class="nx">_velocity_</span><span class="p">,</span> <span class="nx">opt</span><span class="p">.</span><span class="nx">velocity</span> <span class="o">||</span> <span class="mi">0</span><span class="p">);</span>
<span class="p">},</span></pre></div> </td> </tr> <tr id='Animation-Events'> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#Animation-Events">&#182;</a> </div> <hr />

<h2>Animation Events</h2> </td> <td class="code"> <div class="highlight"><pre></pre></div> </td> </tr> <tr id='opening-Event'> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#opening-Event">&#182;</a> </div> <h3><code>opening</code> Event</h3>
Expand Down Expand Up @@ -1280,6 +1282,7 @@ <h2>Instance Private Helpers</h2> </td> <td class="code"
<span class="nx">clearTimeout</span><span class="p">(</span><span class="nx">delay</span><span class="p">);</span>
<span class="nx">pool</span><span class="p">.</span><span class="nx">unbind</span><span class="p">(</span><span class="nx">_tick_</span><span class="o">+</span><span class="nx">dot</span><span class="p">(</span><span class="nx">_opening_</span><span class="p">),</span> <span class="nx">on</span><span class="p">.</span><span class="nx">pool</span><span class="p">[</span><span class="nx">_tick_</span><span class="o">+</span><span class="nx">dot</span><span class="p">(</span><span class="nx">_opening_</span><span class="p">)]);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_opening_ticks_</span><span class="p">,</span> <span class="mi">0</span><span class="p">);</span>
<span class="nx">set</span><span class="p">(</span><span class="nx">_reeled_</span><span class="p">,</span> <span class="kc">true</span><span class="p">);</span>
<span class="k">return</span> <span class="nx">operated</span><span class="o">=</span> <span class="o">-</span><span class="nx">opt</span><span class="p">.</span><span class="nx">timeout</span> <span class="o">*</span> <span class="nx">leader</span><span class="p">(</span><span class="nx">_tempo_</span><span class="p">)</span>
<span class="p">},</span>
<span class="nx">panned</span><span class="o">=</span> <span class="kc">false</span><span class="p">,</span>
Expand Down Expand Up @@ -1659,7 +1662,7 @@ <h2>Shortcuts And Minification Cache</h2> </td> <td clas
<span class="nx">_clicked_</span><span class="o">=</span> <span class="s1">&#39;clicked&#39;</span><span class="p">,</span> <span class="nx">_clicked_location_</span><span class="o">=</span> <span class="s1">&#39;clicked_location&#39;</span><span class="p">,</span> <span class="nx">_clicked_on_</span><span class="o">=</span> <span class="s1">&#39;clicked_on&#39;</span><span class="p">,</span> <span class="nx">_clicked_tier_</span><span class="o">=</span> <span class="s1">&#39;clicked_tier&#39;</span><span class="p">,</span>
<span class="nx">_cwish_</span><span class="o">=</span> <span class="s1">&#39;cwish&#39;</span><span class="p">,</span> <span class="nx">_dimensions_</span><span class="o">=</span> <span class="s1">&#39;dimensions&#39;</span><span class="p">,</span> <span class="nx">_fraction_</span><span class="o">=</span> <span class="s1">&#39;fraction&#39;</span><span class="p">,</span> <span class="nx">_frame_</span><span class="o">=</span> <span class="s1">&#39;frame&#39;</span><span class="p">,</span>
<span class="nx">_frames_</span><span class="o">=</span> <span class="s1">&#39;frames&#39;</span><span class="p">,</span> <span class="nx">_hi_</span><span class="o">=</span> <span class="s1">&#39;hi&#39;</span><span class="p">,</span> <span class="nx">_hidden_</span><span class="o">=</span> <span class="s1">&#39;hidden&#39;</span><span class="p">,</span> <span class="nx">_image_</span><span class="o">=</span> <span class="s1">&#39;image&#39;</span><span class="p">,</span> <span class="nx">_images_</span><span class="o">=</span> <span class="s1">&#39;images&#39;</span><span class="p">,</span> <span class="nx">_opening_</span><span class="o">=</span> <span class="s1">&#39;opening&#39;</span><span class="p">,</span> <span class="nx">_opening_ticks_</span><span class="o">=</span> <span class="nx">_opening_</span><span class="o">+</span><span class="s1">&#39;_ticks&#39;</span><span class="p">,</span>
<span class="nx">_lo_</span><span class="o">=</span> <span class="s1">&#39;lo&#39;</span><span class="p">,</span> <span class="nx">_options_</span><span class="o">=</span> <span class="s1">&#39;options&#39;</span><span class="p">,</span> <span class="nx">_playing_</span><span class="o">=</span> <span class="s1">&#39;playing&#39;</span><span class="p">,</span> <span class="nx">_preloaded_</span><span class="o">=</span> <span class="s1">&#39;preloaded&#39;</span><span class="p">,</span> <span class="nx">_reeling_</span><span class="o">=</span> <span class="s1">&#39;reeling&#39;</span><span class="p">,</span> <span class="nx">_revolution_</span><span class="o">=</span> <span class="s1">&#39;revolution&#39;</span><span class="p">,</span>
<span class="nx">_lo_</span><span class="o">=</span> <span class="s1">&#39;lo&#39;</span><span class="p">,</span> <span class="nx">_options_</span><span class="o">=</span> <span class="s1">&#39;options&#39;</span><span class="p">,</span> <span class="nx">_playing_</span><span class="o">=</span> <span class="s1">&#39;playing&#39;</span><span class="p">,</span> <span class="nx">_preloaded_</span><span class="o">=</span> <span class="s1">&#39;preloaded&#39;</span><span class="p">,</span> <span class="nx">_reeling_</span><span class="o">=</span> <span class="s1">&#39;reeling&#39;</span><span class="p">,</span> <span class="nx">_reeled_</span><span class="o">=</span> <span class="s1">&#39;reeled&#39;</span><span class="p">,</span> <span class="nx">_revolution_</span><span class="o">=</span> <span class="s1">&#39;revolution&#39;</span><span class="p">,</span>
<span class="nx">_revolution_y_</span><span class="o">=</span> <span class="s1">&#39;revolution_y&#39;</span><span class="p">,</span> <span class="nx">_row_</span><span class="o">=</span> <span class="s1">&#39;row&#39;</span><span class="p">,</span> <span class="nx">_rows_</span><span class="o">=</span> <span class="s1">&#39;rows&#39;</span><span class="p">,</span> <span class="nx">_spacing_</span><span class="o">=</span> <span class="s1">&#39;spacing&#39;</span><span class="p">,</span> <span class="nx">_speed_</span><span class="o">=</span> <span class="s1">&#39;speed&#39;</span><span class="p">,</span> <span class="nx">_stage_</span><span class="o">=</span> <span class="s1">&#39;stage&#39;</span><span class="p">,</span> <span class="nx">_stitched_</span><span class="o">=</span> <span class="s1">&#39;stitched&#39;</span><span class="p">,</span>
<span class="nx">_stitched_shift_</span><span class="o">=</span> <span class="s1">&#39;stitched_shift&#39;</span><span class="p">,</span> <span class="nx">_stitched_travel_</span><span class="o">=</span> <span class="s1">&#39;stitched_travel&#39;</span><span class="p">,</span> <span class="nx">_stopped_</span><span class="o">=</span> <span class="s1">&#39;stopped&#39;</span><span class="p">,</span> <span class="nx">_style_</span><span class="o">=</span> <span class="s1">&#39;style&#39;</span><span class="p">,</span> <span class="nx">_tempo_</span><span class="o">=</span> <span class="s1">&#39;tempo&#39;</span><span class="p">,</span> <span class="nx">_tier_</span><span class="o">=</span> <span class="s1">&#39;tier&#39;</span><span class="p">,</span>
<span class="nx">_velocity_</span><span class="o">=</span> <span class="s1">&#39;velocity&#39;</span><span class="p">,</span> <span class="nx">_vertical_</span><span class="o">=</span> <span class="s1">&#39;vertical&#39;</span><span class="p">,</span></pre></div> </td> </tr> <tr id='section-182'> <td class="docs"> <p>And the same goes for browser events too.</p> </td> <td class="code"> <div class="highlight"><pre> <span class="nx">ns</span><span class="o">=</span> <span class="nx">dot</span><span class="p">(</span><span class="nx">klass</span><span class="p">),</span>
Expand Down

0 comments on commit c17d187

Please sign in to comment.