Merge pull request #3174 from Squeegy/master

Prevent active admin from clobbering all jQuery UI dialog close buttons
activeadmin · May 28, 2014 · ebf2ccf · ebf2ccf
2 parents b6fb717 + 8818bc8
commit ebf2ccf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/assets/javascripts/active_admin/lib/modal_dialog.js.coffee b/app/assets/javascripts/active_admin/lib/modal_dialog.js.coffee
@@ -28,6 +28,7 @@ ActiveAdmin.modal_dialog = (message, inputs, callback)->
   html += "</ul></form>"
   $(html).appendTo('body').dialog
     modal: true
+    dialogClass: 'active_admin_dialog'
     buttons:
       OK: ->
         callback $(@).serializeObject()

diff --git a/app/assets/stylesheets/active_admin/components/_modal_dialog.scss b/app/assets/stylesheets/active_admin/components/_modal_dialog.scss
@@ -15,7 +15,6 @@
     @include section-header;
     span { font-size: 1.1em }
   }
-  .ui-dialog-titlebar-close { display: none }
 
   ul { list-style-type: none }
   li { margin: 10px 0 }
@@ -29,3 +28,7 @@
     &:last-child { @include light-button } // Cancel
   }
 }
+
+.active_admin_dialog.ui-dialog {
+  .ui-dialog-titlebar-close { display: none }
+}