From 60e2222d93ac7fe8d078820795e25302e7e1be4c Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Tue, 3 Feb 2015 18:51:21 -0300
Subject: [PATCH] site_tour: disable step numbers to avoid conflict between groups

---
 plugins/site_tour/public/main.js                     | 1 +
 plugins/site_tour/test/unit/site_tour_plugin_test.rb | 2 +-
 plugins/site_tour/views/tour_actions.html.erb        | 8 +++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/site_tour/public/main.js b/plugins/site_tour/public/main.js
index 3ee72dc..8f84d4b 100644
--- a/plugins/site_tour/public/main.js
+++ b/plugins/site_tour/public/main.js
@@ -77,6 +77,7 @@ var siteTourPlugin = (function() {
 
       intro = introJs();
       intro.setOption('tooltipPosition', 'auto');
+      intro.setOption('showStepNumbers', 'false');
       intro.setOptions(options);
       intro.onafterchange(function(targetElement) {
         var name = jQuery(targetElement).attr('data-intro-name');
diff --git a/plugins/site_tour/test/unit/site_tour_plugin_test.rb b/plugins/site_tour/test/unit/site_tour_plugin_test.rb
index 52907db..cefd3bf 100644
--- a/plugins/site_tour/test/unit/site_tour_plugin_test.rb
+++ b/plugins/site_tour/test/unit/site_tour_plugin_test.rb
@@ -67,7 +67,7 @@ class SiteTourPluginTest < ActionView::TestCase
     body_ending = instance_exec(&plugin.body_ending)
     assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A1', 1\);/, body_ending
     assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A2', 2\);/, body_ending
-    assert_match /siteTourPlugin\.add\('test_b', 'body', 'Test B1', 1\);/, body_ending
+    assert_match /siteTourPlugin\.add\('test_b', 'body', 'Test B1', 3\);/, body_ending
   end
 
 end
diff --git a/plugins/site_tour/views/tour_actions.html.erb b/plugins/site_tour/views/tour_actions.html.erb
index c2e8cc2..f2e8371 100644
--- a/plugins/site_tour/views/tour_actions.html.erb
+++ b/plugins/site_tour/views/tour_actions.html.erb
@@ -5,13 +5,11 @@
 <% if actions.present? %>
 <script>
   jQuery( document ).ready(function( $ ) {
-    <% actions.group_by {|h| h[:group_name]}.each do |group, group_actions| %>
-      <% group_actions.each_with_index do |action, index| %>
-        <%= "siteTourPlugin.add('#{j action[:group_name]}', '#{j action[:selector]}', '#{j parse_tour_description(action[:description])}', #{index + 1});" %>
-      <% end %>
+    <% actions.each_with_index do |action, index| %>
+      <%= "siteTourPlugin.add('#{j action[:group_name]}', '#{j action[:selector]}', '#{j parse_tour_description(action[:description])}', #{index + 1});" %>
     <% end %>
 
-    <% (group_triggers||[]).each_with_index do |group, index| %>
+    <% (group_triggers||[]).each do |group| %>
       <%= "siteTourPlugin.addGroupTrigger('#{j group[:group_name]}', '#{j group[:selector]}', '#{j group[:event]}');" %>
     <% end %>
 
--
libgit2 0.21.2