The modal helper now accepts an animated: option

examples/middleman/source/index.html.erb

@@ -50,7 +50,7 @@
         <!-- Try setting different :title, :size, :button or :context options -->
         <%= modal 'Do what you want!', button: {size: :small, context: :info} %>
 
-        <% modal size: :large, id: 'modal', button: {class: :en} do %>
+        <% modal size: :large, id: 'modal', button: {class: :en}, animated: false do %>
           <div class="modal-body">Please accept the Terms of service.</div>
           <div class="modal-footer"><button type="button" class="btn btn-primary">Accept</button></div>
         <% end %>
@@ -155,4 +155,4 @@
     <%= javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js' %>
     <%= javascript_include_tag bootstrap_js %>
   </body>
-</html>
+</html>

examples/padrino/app/views/index.html.erb

@@ -47,7 +47,7 @@
         <!-- Try setting different :title, :size, :button or :context options -->
         <%= modal 'Do what you want!', button: {size: :small, context: :info} %>
 
-        <% modal title: 'Terms of service', size: :large, id: 'modal', button: {class: :en} do %>
+        <% modal title: 'Terms of service', size: :large, id: 'modal', button: {class: :en}, animated: false do %>
           <div class="modal-body">Please accept the Terms of service.</div>
           <div class="modal-footer"><button type="button" class="btn btn-primary">Accept</button></div>
         <% end %>
@@ -152,4 +152,4 @@
     <%= javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js' %>
     <%= javascript_include_tag bootstrap_js %>
   </body>
-</html>
+</html>

examples/rails/app/views/application/index.html.erb

@@ -47,7 +47,7 @@
       <!-- Try setting different :title, :size, :button or :context options -->
       <%= modal 'Do what you want!', button: {size: :small, context: :info} %>
 
-      <%= modal title: 'Terms of service', size: :large, id: 'modal', button: {class: :en} do %>
+      <%= modal title: 'Terms of service', size: :large, id: 'modal', button: {class: :en}, animated: false do %>
         <div class="modal-body">Please accept the Terms of service.</div>
         <div class="modal-footer"><button type="button" class="btn btn-primary">Accept</button></div>
       <% end %>
@@ -157,4 +157,4 @@
     <%= javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js' %>
     <%= javascript_include_tag bootstrap_js %>
   </body>
-</html>
+</html>

lib/bh/classes/modal.rb

@@ -29,6 +29,11 @@ def dialog_size_class
         Modal.dialog_sizes[@options[:size]]
       end
 
+      # @return [#to_s] the animation-related class to assign to the modal.
+      def animation_class
+        Modal.animation_class if @options.fetch :animated, true
+      end
+
       # @return [#to_s] the caption for the modal button.
       def caption
         @options.fetch(:button, {}).fetch :caption, title
@@ -56,6 +61,11 @@ def self.dialog_sizes
         end
       end
 
+      # @return [#to_s] the class that defines the modal's animation.
+      def self.animation_class
+        'fade'
+      end
+
       def extract_content_from(*args, &block)
         if block_given?
           super
@@ -65,4 +75,4 @@ def extract_content_from(*args, &block)
       end
     end
   end
-end
+end

lib/bh/helpers/modal_helper.rb

@@ -24,6 +24,8 @@ module Helpers
     #       (alias `:xs`), `:large` (alias `:lg`) or `:small` (alias `:sm`).
     #     * :layout (#to_s) if set to `:block`, span the button for the full
     #       width of the parent.
+    #   @option options [Boolean] :animated (true) option for disabling the
+    #   default modal animation.
     #   @example Display a simple modal toggled by a blue button.
     #       modal 'You clicked me!', title: 'Click me', button: {context: :info}
     # @overload modal(options = {}, &block)
@@ -37,7 +39,9 @@ module Helpers
     #       end
     def modal(*args, &block)
       modal = Bh::Modal.new self, *args, &block
-      modal.extract! :button, :size, :body, :title, :id
+      modal.extract! :animated, :button, :size, :body, :title, :id
+
+      modal.append_class_to! :animation, modal.animation_class
 
       modal.extract_from :button, [:context, :size, :layout, :caption]
       modal.append_class_to! :button, :btn
@@ -52,4 +56,4 @@ def modal(*args, &block)
       modal.render_partial 'modal'
     end
   end
-end
+end

lib/bh/views/bh/_modal.html.erb

@@ -1,5 +1,5 @@
 <button class="<%= button[:class] %>" data-toggle="modal" data-target="#<%= div[:id] %>"><%= button[:caption] %></button>
-<div class="modal fade" id="<%= div[:id] %>" tabindex="-1" role="dialog" aria-labelledby="label-<%= div[:id] %>" aria-hidden="true">
+<div class="modal <%= animation[:class] %>" id="<%= div[:id] %>" tabindex="-1" role="dialog" aria-labelledby="label-<%= div[:id] %>" aria-hidden="true">
   <div class="<%= div[:class] %>">
     <div class="modal-content">
       <div class="modal-header">
@@ -11,4 +11,4 @@
       <%= content %>
     </div>
   </div>
-</div>
+</div>

spec/shared/modal_helper.rb

@@ -8,6 +8,7 @@
   all_tests_pass_with 'the button: :context modal option'
   all_tests_pass_with 'the button: :size modal option'
   all_tests_pass_with 'the button: :class modal option'
+  all_tests_pass_with 'the animated: modal option'
 end
 
 #--
@@ -101,4 +102,16 @@
     html = %r{<button class="important btn btn-default"}
     expect(modal: {button: {class: 'important'}}).to generate html
   end
-end
+end
+
+shared_examples_for 'the animated: modal option' do
+  specify 'set to true, keeps the class "fade"' do
+    html = %r{<div class="modal fade" id=}
+    expect(modal: {animated: true}).to generate html
+  end
+
+  specify 'set to false, removes the class "fade"' do
+    html = %r{<div class="modal.*" id=}
+    expect(modal: {animated: false}).to generate html
+  end
+end