Merge branch 'master' into framework-ui

Author: scambra

app/assets/javascripts/jquery/active_scaffold.js

@@ -41,7 +41,9 @@
       jQuery(document).on('blur', ':input', function(e) { ActiveScaffold.last_focus = e.relatedTarget; });
       jQuery(document).click(function(event) {
         if (!jQuery(event.target).closest('.action_group.dyn').length) {
-          jQuery('.action_group.dyn > ul').remove();
+          jQuery('.action_group.dyn > .dynamic-menu').each(function() {
+            ActiveScaffold.remove_dynamic_action_group(this);
+          });
         }
       });
       jQuery(document).on('ajax:beforeSend', 'form.as_form', function(event) {
@@ -304,12 +306,12 @@
           return true;
         } else return false;
       });
-      jQuery(document).on('ajax:complete', '.action_group.dyn > ul a', function(event) {
+      jQuery(document).on('ajax:complete', '.action_group.dyn > .dynamic-menu a', function(event) {
         var action_link = ActiveScaffold.find_action_link(event.target), link = jQuery(event.target);
         if (action_link && action_link.loading_indicator) action_link.loading_indicator.css('visibility', 'hidden');
         setTimeout(function() {
           if (!link.parent().is('.action_group.dyn')) {
-            link.closest('.action_group.dyn > ul').remove();
+            ActiveScaffold.remove_dynamic_action_group(link.closest('.action_group.dyn > .dynamic-menu'));
           }
         }, 100);
       });
@@ -1030,10 +1032,16 @@
         if (ActiveScaffold.config.dynamic_group_parent_class) {
           container.addClass(ActiveScaffold.config.dynamic_group_parent_class);
         }
-        container.find('> ul.dynamic-menu').remove();
+        container.find('> .dynamic-menu').remove();
         container.append(html);
       },
 
+      remove_dynamic_action_group: function(group) {
+        group = jQuery(group);
+        group.closest('.action_group.dyn').removeClass(ActiveScaffold.config.dynamic_group_parent_class);
+        group.remove();
+      },
+
       scroll_to: function(element, checkInViewport) {
         if (typeof checkInViewport == 'undefined') checkInViewport = true;
         if (typeof(element) == 'string') element = '#' + element;

lib/active_scaffold/helpers/action_link_helpers.rb

@@ -24,7 +24,9 @@ def action_link_authorized?(link, *args) # rubocop:disable Naming/PredicateMetho
       def display_dynamic_action_group(action_link, links, record_or_ul_options = nil, ul_options = nil)
         ul_options = record_or_ul_options if ul_options.nil? && record_or_ul_options.is_a?(Hash)
         record = record_or_ul_options unless record_or_ul_options.is_a?(Hash)
-        html = as_element :dynamic_action_group, ul_options do
+        ul_options ||= {}
+        ul_options[:class] = [ul_options[:class], 'dynamic-menu'].compact.join(' ')
+        html = as_element :dynamic_action_group, **ul_options do
           safe_join(links.map { |link| as_element :dynamic_action_group_element, link })
         end
         raw "ActiveScaffold.display_dynamic_action_group('#{get_action_link_id action_link, record}', '#{escape_javascript html}');" # rubocop:disable Rails/OutputSafety