' . "\n";
< $output .= theme('views_slideshow_singleframe_control_previous', $id, $view, $options);
< $output .= theme('views_slideshow_singleframe_control_pause', $id, $view, $options);
< $output .= theme('views_slideshow_singleframe_control_next', $id, $view, $options);
---
> function theme_views_slideshow_singleframe_controls($vss_id, $view, $options) {
> $output = '
' . "\n";
> $output .= theme('views_slideshow_singleframe_control_previous', $vss_id, $view, $options);
> $output .= theme('views_slideshow_singleframe_control_pause', $vss_id, $view, $options);
> $output .= theme('views_slideshow_singleframe_control_next', $vss_id, $view, $options);
100,101c100,101
< function theme_views_slideshow_singleframe_control_previous($id, $view, $options) {
< return '
' . t('Previous') . "\n";
---
> function theme_views_slideshow_singleframe_control_previous($vss_id, $view, $options) {
> return '
' . t('Previous') . "\n";
107,108c107,108
< function theme_views_slideshow_singleframe_control_pause($id, $view, $options) {
< return '
' . t('Pause') . "\n";
---
> function theme_views_slideshow_singleframe_control_pause($vss_id, $view, $options) {
> return '
' . t('Pause') . "\n";
114,115c114,115
< function theme_views_slideshow_singleframe_control_next($id, $view, $options) {
< return '
' . t('Next') . "\n";
---
> function theme_views_slideshow_singleframe_control_next($vss_id, $view, $options) {
> return '
' . t('Next') . "\n";
118,119c118,119
< function theme_views_slideshow_singleframe_pager($id, $view, $options) {
< return '';
---
> function theme_views_slideshow_singleframe_pager($vss_id, $view, $options) {
> return '';
122,123c122,123
< function theme_views_slideshow_singleframe_image_count($id, $view, $options) {
< return '
' . t('of') .'
';
---
> function theme_views_slideshow_singleframe_image_count($vss_id, $view, $options) {
> return '
' . t('of') .'
';
Index: contrib/views_slideshow_thumbnailhover/views_slideshow.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow.js,v
retrieving revision 1.1.2.2.2.14
diff -r1.1.2.2.2.14 views_slideshow.js
23c23
< pager:(settings.pager_event == 'hoverIntent') ? null : '#views_slideshow_breakout_teasers_' + settings.id,
---
> pager:(settings.pager_event == 'hoverIntent') ? null : '#views_slideshow_thumbnailhover_breakout_teasers_' + settings.vss_id,
25c25
< return '#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.id + '_' + idx;
---
> return '#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.vss_id + '_' + idx;
30,31c30,31
< $('#views_slideshow_thumbnailhover_image_count_' + settings.id + ' span.num').html(opts.currSlide + 1);
< $('#views_slideshow_thumbnailhover_image_count_' + settings.id + ' span.total').html(opts.slideCount);
---
> $('#views_slideshow_thumbnailhover_image_count_' + settings.vss_id + ' span.num').html(opts.currSlide + 1);
> $('#views_slideshow_thumbnailhover_image_count_' + settings.vss_id + ' span.total').html(opts.slideCount);
37,38c37,38
< $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.id + '_' + currId).removeClass('activeSlide');
< $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.id + '_' + nextId).addClass('activeSlide');
---
> $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.vss_id + '_' + currId).removeClass('activeSlide');
> $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.vss_id + '_' + nextId).addClass('activeSlide');
41,42c41,42
< prev:(settings.controls > 0)?'#views_slideshow_thumbnailhover_prev_' + settings.id:null,
< next:(settings.controls > 0)?'#views_slideshow_thumbnailhover_next_' + settings.id:null,
---
> prev:(settings.controls > 0)?'#views_slideshow_thumbnailhover_prev_' + settings.vss_id:null,
> next:(settings.controls > 0)?'#views_slideshow_thumbnailhover_next_' + settings.vss_id:null,
85,86c85,86
< $('#views_slideshow_thumbnailhover_image_count_' + settings.id).show();
<
---
> $('#views_slideshow_thumbnailhover_image_count_' + settings.vss_id).show();
>
88c88
< $('#views_slideshow_thumbnailhover_breakout_teasers_' + settings.id + ' .views_slideshow_thumbnailhover_div_breakout_teaser').each(function(i,obj) {
---
> $('#views_slideshow_thumbnailhover_breakout_teasers_' + settings.vss_id + ' .views_slideshow_thumbnailhover_div_breakout_teaser').each(function(i,obj) {
95c95
< $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.id + '_' + id).addClass('activeSlide');
---
> $('#views_slideshow_thumbnailhover_div_breakout_teaser_' + settings.vss_id + '_' + id).addClass('activeSlide');
109c109
< $('#views_slideshow_thumbnailhover_controls_' + settings.id).show();
---
> $('#views_slideshow_thumbnailhover_controls_' + settings.vss_id).show();
111c111
< $('#views_slideshow_thumbnailhover_playpause_' + settings.id).click(function(e) {
---
> $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id).click(function(e) {
114c114
< $('#views_slideshow_thumbnailhover_playpause_' + settings.id)
---
> $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id)
124c124
< $('#views_slideshow_thumbnailhover_playpause_' + settings.id)
---
> $('#views_slideshow_thumbnailhover_playpause_' + settings.vss_id)
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.module,v
retrieving revision 1.1.2.1.2.4
diff -r1.1.2.1.2.4 views_slideshow_thumbnailhover.module
25c25
< 'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
---
> 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
29c29
< 'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
---
> 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
33c33
< 'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
---
> 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
37c37
< 'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
---
> 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
41c41
< 'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
---
> 'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
45c45
< 'arguments' => array('item' => NULL, 'id' => NULL, 'count' => NULL),
---
> 'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
49c49
< 'arguments' => array('view' => NULL, 'rows' => NULL, 'id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
---
> 'arguments' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
53c53
< 'arguments' => array('item' => NULL, 'id' => NULL, 'count' => NULL),
---
> 'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
57c57
< 'arguments' => array('items' => NULL, 'id' => NULL),
---
> 'arguments' => array('items' => NULL, 'vss_id' => NULL),
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.theme.inc,v
retrieving revision 1.1.2.1.2.12
diff -r1.1.2.1.2.12 views_slideshow_thumbnailhover.theme.inc
27c27
< 'id' => $vars['id'],
---
> 'vss_id' => $vars['id'],
30a31
> $vars['vss_id'] = $vars['id'];
32c33
< drupal_add_js(array('viewsSlideshowThumbnailHover' => array('#views_slideshow_thumbnailhover_main_'. $vars['id'] => $settings)), 'setting');
---
> drupal_add_js(array('viewsSlideshowThumbnailHover' => array('#views_slideshow_thumbnailhover_main_'. $vars['vss_id'] => $settings)), 'setting');
50c51
< function theme_views_slideshow_thumbnailhover_no_display_section($view, $rows, $id, $options, $teaser = TRUE) {
---
> function theme_views_slideshow_thumbnailhover_no_display_section($view, $rows, $vss_id, $options, $teaser = TRUE) {
65c66
< $output = '
' . "\n";
---
> $output = '
' . "\n";
81c82
< $output .= theme('views_slideshow_thumbnailhover_no_display_teaser', $rendered, $id, $count);
---
> $output .= theme('views_slideshow_thumbnailhover_no_display_teaser', $rendered, $vss_id, $count);
90c91
< function theme_views_slideshow_thumbnailhover_no_display_teaser($item, $id, $count) {
---
> function theme_views_slideshow_thumbnailhover_no_display_teaser($item, $vss_id, $count) {
102c103
< $output = '
' . "\n ";
---
> $output = '
' . "\n ";
104c105
< $output .= '
' . "\n\n";
---
> $output .= '
' . "\n\n";
111,112c112,113
< function theme_views_slideshow_thumbnailhover_breakout_teasers($view, $items, $id, $options) {
< $output = '
' . "\n";
---
> function theme_views_slideshow_thumbnailhover_breakout_teasers($view, $items, $vss_id, $options) {
> $output = '
' . "\n";
124c125
< $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $rendered_fields, $id, $count);
---
> $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $rendered_fields, $vss_id, $count);
129c130
< $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $item, $id, $count);
---
> $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $item, $vss_id, $count);
141c142
< function theme_views_slideshow_thumbnailhover_breakout_teaser($item, $id, $count) {
---
> function theme_views_slideshow_thumbnailhover_breakout_teaser($item, $vss_id, $count) {
153c154
< $output = '
' . "\n ";
---
> $output = '
' . "\n ";
155c156
< $output .= '
' . "\n\n";
---
> $output .= '
' . "\n\n";
163,167c164,168
< function theme_views_slideshow_thumbnailhover_controls($id, $view, $options) {
< $output = '
' . "\n";
< $output .= theme('views_slideshow_thumbnailhover_control_previous', $id, $view, $options);
< $output .= theme('views_slideshow_thumbnailhover_control_pause', $id, $view, $options);
< $output .= theme('views_slideshow_thumbnailhover_control_next', $id, $view, $options);
---
> function theme_views_slideshow_thumbnailhover_controls($vss_id, $view, $options) {
> $output = '
' . "\n";
> $output .= theme('views_slideshow_thumbnailhover_control_previous', $vss_id, $view, $options);
> $output .= theme('views_slideshow_thumbnailhover_control_pause', $vss_id, $view, $options);
> $output .= theme('views_slideshow_thumbnailhover_control_next', $vss_id, $view, $options);
175,176c176,177
< function theme_views_slideshow_thumbnailhover_control_previous($id, $view, $options) {
< return '
' . t('Previous') . "\n";
---
> function theme_views_slideshow_thumbnailhover_control_previous($vss_id, $view, $options) {
> return '
' . t('Previous') . "\n";
182,183c183,184
< function theme_views_slideshow_thumbnailhover_control_pause($id, $view, $options) {
< return '
' . t('Pause') . "\n";
---
> function theme_views_slideshow_thumbnailhover_control_pause($vss_id, $view, $options) {
> return '
' . t('Pause') . "\n";
189,190c190,191
< function theme_views_slideshow_thumbnailhover_control_next($id, $view, $options) {
< return '
' . t('Next') . "\n";
---
> function theme_views_slideshow_thumbnailhover_control_next($vss_id, $view, $options) {
> return '
' . t('Next') . "\n";
193,194c194,195
< function theme_views_slideshow_thumbnailhover_image_count($id, $view, $options) {
< $output = '
' . t('of') .'
';
---
> function theme_views_slideshow_thumbnailhover_image_count($vss_id, $view, $options) {
> $output = '
' . t('of') .'
';
196c197
< }
\ No newline at end of file
---
> }