Download as
Browse Code »

Commit 377edbac8ff5f6cdbda40429798771dcf661fce9

Authored by Victor Costa
2 parents 5a3e0732 07b9482c
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Merge branch 'site_tour' into stable 

Conflicts:
	plugins/site_tour/public/main.js
	plugins/site_tour/views/tour_actions.html.erb
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
plugins/site_tour/public/main.js
  Diff comments   View file @377edba
... ... @@ -76,7 +76,7 @@ var siteTourPlugin = (function() {
76 76 var name = jQuery(targetElement).attr('data-intro-name');
77 77 mark(name);
78 78 });
79   - configureIntro(force, actionsOnload);
  79 + configureIntro(force, actionsOnload());
80 80 intro.start();
81 81 },
82 82 force: function() {
... ...
plugins/site_tour/views/tour_actions.html.erb
  Diff comments   View file @377edba
... ... @@ -8,7 +8,7 @@
8 8 <%= "siteTourPlugin.add('#{j action[:group_name]}', '#{j action[:selector]}', '#{j action[:description]}', #{index + 1});" %>
9 9 <% end %>
10 10  
11   - <% group_triggers.each_with_index do |group, index| %>
  11 + <% (group_triggers||[]).each_with_index do |group, index| %>
12 12 <%= "siteTourPlugin.addGroupTrigger('#{j group[:group_name]}', '#{j group[:selector]}', '#{j group[:event]}');" %>
13 13 <% end %>
14 14  
... ...