/[drupal]/contributions/modules/rotor/rotor.js
ViewVC logotype

Diff of /contributions/modules/rotor/rotor.js

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1.2.4.2.8, Sun Nov 8 13:01:11 2009 UTC revision 1.1.2.4.2.9, Sun Nov 8 22:01:17 2009 UTC
# Line 1  Line 1 
1  // $Id: rotor.js,v 1.1.2.4.2.7 2009/04/08 23:37:45 mrfelton Exp $  // $Id: rotor.js,v 1.1.2.4.2.8 2009/11/08 13:01:11 mrfelton Exp $
2    
3  (function($) {  (function($) {
4    
# Line 17  Drupal.RotorBanner.animate = function() Line 17  Drupal.RotorBanner.animate = function()
17    
18    for (rotor_item in Drupal.settings.RotorBanner) {    for (rotor_item in Drupal.settings.RotorBanner) {
19      var settings = Drupal.settings.RotorBanner[rotor_item];      var settings = Drupal.settings.RotorBanner[rotor_item];
 <<<<<<< rotor.js  
         $('.view-id-'+ settings.id +' .rotor-items').cycle({  
 =======  
20      // cache the jquery context for a performance boost      // cache the jquery context for a performance boost
21      var $rotor = $('#rotor-view-id-'+ settings.view_id +'-view-display-id-'+ settings.display_id);      var $rotor = $('#rotor-view-id-'+ settings.view_id +'-view-display-id-'+ settings.display_id);
22    
23          $('div.rotor-items', $rotor).cycle({          $('div.rotor-items', $rotor).cycle({
 >>>>>>> 1.1.2.4.2.7  
24                  timeout: settings.time * 1000,                  timeout: settings.time * 1000,
25                  speed: settings.speed,                  speed: settings.speed,
26                  fx: settings.effect,                  fx: settings.effect,
Legend:
Removed from v.1.1.2.4.2.8  
changed lines
  Added in v.1.1.2.4.2.9
  ViewVC Help
Powered by ViewVC 1.1.2