jro_apps/redmine Commit - r15554:18073c971e69

app/helpers/application_helper.rb +2 -2

                  end
                end
-               def context_menu(url)
+               def context_menu
                  unless @context_menu_included
                    content_for :header_tags do
                      javascript_include_tag('context_menu') +
                    end
                    @context_menu_included = true
                  end
-                 javascript_tag "contextMenuInit('#{ url_for(url) }')"
+                 nil
                end
                def calendar_for(field_id)

app/helpers/issues_helper.rb +2 -2

                end
                def render_descendants_tree(issue)
-                 s = '<form><table class="list issues">'
+                 s = '<table class="list issues">'
                  issue_list(issue.descendants.visible.preload(:status, :priority, :tracker, :assigned_to).sort_by(&:lft)) do |child, level|
                    css = "issue issue-#{child.id} hascontextmenu #{child.css_classes}"
                    css << " idnt idnt-#{level}" if level > 0
                           content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio'),
                           :class => css)
                  end
-                 s << '</table></form>'
+                 s << '</table>'
                  s.html_safe
                end

app/views/issues/_list.html.erb +1 -1

-             <%= form_tag({}) do -%>
+             <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
              <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
              <div class="autoscroll">
              <table class="list issues <%= sort_css_classes %>">

app/views/issues/_list_simple.html.erb +1 -1

              <% if issues && issues.any? %>
-             <%= form_tag({}) do %>
+             <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %>
                <table class="list list-simple issues">
                  <thead><tr>
                  <th class="id">#</th>

app/views/issues/_relations.html.erb +2 -2

              <p><strong><%=l(:label_related_issues)%></strong></p>
              <% if @relations.present? %>
-             <form>
+             <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %>
              <table class="list issues">
              <% @relations.each do |relation| %>
                <% other_issue = relation.other_issue(@issue) -%>
                </tr>
              <% end %>
              </table>
-             </form>
+             <% end %>
              <% end %>
              <%= form_for @relation, {

app/views/issues/index.html.erb +1 -1

                                              :title => l(:label_changes_details)) %>
              <% end %>
-             <%= context_menu issues_context_menu_path %>
+             <%= context_menu %>

app/views/issues/show.html.erb +3 -1

                <%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
              </div>
              <p><strong><%=l(:label_subtask_plural)%></strong></p>
+             <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %>
              <%= render_descendants_tree(@issue) unless @issue.leaf? %>
+             <% end %>
              </div>
              <% end %>
                  <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
              <% end %>
-             <%= context_menu issues_context_menu_path %>
+             <%= context_menu %>

app/views/my/page.html.erb +1 -1

                <%= render_blocks(@blocks['right'], @user) %>
              </div>
-             <%= context_menu issues_context_menu_path %>
+             <%= context_menu %>
              <% html_title(l(:label_my_page)) -%>

app/views/timelog/_list.html.erb +2 -2

-             <%= form_tag({}) do -%>
+             <%= form_tag({}, :data => {:cm_url => time_entries_context_menu_path}) do -%>
              <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
              <div class="autoscroll">
              <table class="list time-entries">
              </div>
              <% end -%>
-             <%= context_menu time_entries_context_menu_path %>
+             <%= context_menu %>

app/views/versions/index.html.erb +2 -2

                  <%= render(:partial => "wiki/content",
                             :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
                  <% if (issues = @issues_by_version[version]) && issues.size > 0 %>
-                   <%= form_tag({}) do -%>
+                   <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
                      <table class="list related-issues">
                      <caption><%= l(:label_related_issues) %></caption>
                      <% issues.each do |issue| -%>
              <% html_title(l(:label_roadmap)) %>
-             <%= context_menu issues_context_menu_path %>
+             <%= context_menu %>

app/views/versions/show.html.erb +2 -2

              </div>
              <% if @issues.present? %>
-             <%= form_tag({}) do -%>
+             <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
                <table class="list related-issues">
                <caption><%= l(:label_related_issues) %></caption>
                <%- @issues.each do |issue| -%>
                <% end %>
                </table>
              <% end %>
-             <%= context_menu issues_context_menu_path %>
+             <%= context_menu %>
              <% end %>
              </div>

public/javascripts/context_menu.js +6 -4

                 Copyright (C) 2006-2016  Jean-Philippe Lang */
              var contextMenuObserving;
-             var contextMenuUrl;
              function contextMenuRightClick(event) {
                var target = $(event.target);
                var window_height;
                var max_width;
                var max_height;
+               var url;
                $('#context-menu').css('left', (render_x + 'px'));
                $('#context-menu').css('top', (render_y + 'px'));
                $('#context-menu').html('');
+               url = $(event.target).parents('form').first().data('cm-url');
                $.ajax({
-                 url: contextMenuUrl,
+                 url: url,
                  data: $(event.target).parents('form').first().serialize(),
                  success: function(data, textStatus, jqXHR) {
                    $('#context-menu').html(data);
                }
              }
-             function contextMenuInit(url) {
-               contextMenuUrl = url;
+             function contextMenuInit() {
                contextMenuCreate();
                contextMenuUnselectAll();
              }
              $(document).ready(function(){
+               contextMenuInit();
                $('input[type=checkbox].toggle-selection').on('change', toggleIssuesSelection);
              });

test/functional/versions_controller_test.rb +1 -1

                  assert_select 'h3', :text => Version.find(1).name, :count => 0
                  # Context menu on issues
-                 assert_select "script", :text => Regexp.new(Regexp.escape("contextMenuInit('/issues/context_menu')"))
+                 assert_select "form[data-cm-url=?]", '/issues/context_menu'
                  assert_select "div#sidebar" do
                    # Links to versions anchors
                    assert_select 'a[href=?]', '#2.0'

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages