Merge pull request #2643 from myabc/feature/legacy-action-menu-cleanup-classes

Remove superfluous legacy action menu classes
pull/2649/head
ulferts 10 years ago
commit abccb2fc8f
  1. 2
      app/assets/javascripts/action_menu.js
  2. 4
      app/assets/javascripts/top_menu.js
  3. 2
      app/views/layouts/_action_menu_base.html.erb

@ -34,7 +34,7 @@
<li><a>Menu item text</a></li>
<li class="drop-down">
<a class="icon icon-more" href="javascript:">More functions</a>
<ul style="display:none;" class="action_menu_more">
<ul style="display:none;" class="legacy-actions-more">
<li><a>Menu item text</a></li>
</ul>
</li>

@ -111,12 +111,12 @@
var menu_start_position;
if (this.menu_container.next().get(0) != undefined && (this.menu_container.next().get(0).tagName == 'H2')){
menu_start_position = this.menu_container.next().innerHeight() + this.menu_container.next().position().top;
this.menu_container.find("ul.action_menu_more").css({ top: menu_start_position });
this.menu_container.find("ul.legacy-actions-more").css({ top: menu_start_position });
}
else if(this.menu_container.next().hasClass("wiki-content") && this.menu_container.next().children().next().first().get(0) != undefined && this.menu_container.next().children().next().first().get(0).tagName == 'H1'){
var wiki_heading = this.menu_container.next().children().next().first();
menu_start_position = wiki_heading.innerHeight() + wiki_heading.position().top;
this.menu_container.find("ul.action_menu_more").css({ top: menu_start_position });
this.menu_container.find("ul.legacy-actions-more").css({ top: menu_start_position });
}
},

@ -36,7 +36,7 @@ See doc/COPYRIGHT.rdoc for more details.
accesskey="<%= OpenProject::AccessKeys.key_for(:more_menu) %>">
<%= l(:more_actions) %>
</a>
<ul class="action_menu_more legacy-actions-more" style="display:none;">
<ul class="legacy-actions-more" style="display:none;">
<%= content_for :action_menu_more %>
</ul>
</li>

Loading…
Cancel
Save