FIX for #184: Add loading status to "Versioning" button group when cl…

…icking a button inside dropdown.
unclecheese · Nov 10, 2018 · 24977d4 · 24977d4
1 parent 71f9653
commit 24977d4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -48,6 +48,7 @@ BetterButtonsGroups:
       BetterButton_SaveAndPrev: true
   Versioning:
     label: Versioning...
+    icon: arrow-circle-double
     buttons:
       BetterButton_Rollback: true
       BetterButton_Unpublish: true
@@ -62,4 +63,4 @@ Only:
   classexists: EditableOption
 ---
 EditableOption:
-  better_buttons_versioned_enabled: false
+  better_buttons_versioned_enabled: false
diff --git a/code/extensions/BetterButtonDataObject.php b/code/extensions/BetterButtonDataObject.php
@@ -177,9 +177,11 @@ protected function instantiateButton($className) {
     protected function createButtonGroup($groupName) {        
         $groupConfig = Config::inst()->get("BetterButtonsGroups", $groupName);
         $label = (isset($groupConfig['label'])) ? $groupConfig['label'] : $groupName;
+        $icon = (isset($groupConfig['icon'])) ? $groupConfig['icon'] : '';
         $buttons = (isset($groupConfig['buttons'])) ? $groupConfig['buttons'] : array ();
         $button = DropdownFormAction::create(_t('GridFieldBetterButtons.'.$groupName, $label));
-        foreach($buttons as $b => $bool) {              
+        if ($icon !== '') $button->setAttribute('data-icon', $icon);
+        foreach($buttons as $b => $bool) {
             if($bool) {
                 if($child = $this->instantiateButton($b)) {
                     $button->push($child);

diff --git a/javascript/dropdown_form_action.js b/javascript/dropdown_form_action.js
@@ -61,10 +61,15 @@ $.entwine('ss', function($) {
 			}
 
 			this._super();
+		},
+
+		onmouseup: function() {
+		    $("[data-form-action-dropdown]").addClass('loading');
+		    this._super();
 		}
 
 	});
 
 
 });
-})(jQuery);
+})(jQuery);