twitter-bootstrap-rails-confirm 1.0.1 → 1.0.2

data/README.md

@@ -7,8 +7,9 @@ The normal confirm dialog shows a text with buttons 'ok' and 'cancel'. More info
 * data-confirm-fade (default: false)
 * data-confirm-title (default: window.top.location.origin)
 * data-confirm-cancel (default: 'cancel')
+* data-confirm-cancel-class (default: 'btn cancel')
 * data-confirm-proceed (default: 'ok')
-* data-confirm-proceed-class (default: 'brn-primary')
+* data-confirm-proceed-class (default: 'btn-primary')
 
 This behaviour is similar to that of a "regular" confirm box in ways that it uses the same title and button labels. Defaults can be changed in two ways:
 
@@ -18,6 +19,7 @@ Changing all default values:
         fade: false,
         title: null, // if title equals null window.top.location.origin is used
         cancel: "Cancel",
+        cancel_class: "btn cancel",
         proceed: "OK",
         proceed_class: "btn proceed btn-primary"
     };
@@ -26,20 +28,19 @@ Only changing one default value:
 
     $.fn.twitter_bootstrap_confirmbox.defaults.proceed_class = "btn proceed btn-success";
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
 
     gem 'twitter-bootstrap-rails-confirm'
 
-And then execute:
+Or for Bootstrap 3 support:
 
-    $ bundle
+    gem 'twitter-bootstrap-rails-confirm', github: 'bluerail/twitter-bootstrap-rails-confirm', branch: 'bootstrap3'
 
-Or install it yourself as:
+And then execute:
 
-    $ gem install twitter-bootstrap-rails-confirm
+    $ bundle
 
 ## Usage
 
@@ -57,6 +58,7 @@ Next... nothing. There is nothing you need to do to get this working. A helper c
         "data-confirm-fade" => true,
         "data-confirm-title" => t('.destroy_confirm.title', :item => options[:item]),
         "data-confirm-cancel" => t('.destroy_confirm.cancel', :item => options[:item]),
+        "data-confirm-cancel-class" => "btn-cancel"),
         "data-confirm-proceed" => t('.destroy_confirm.proceed', :item => options[:item]),
         "data-confirm-proceed-class" => "btn-danger"
     end
@@ -71,13 +73,24 @@ Next... nothing. There is nothing you need to do to get this working. A helper c
 
 ## Changelog
 
+### In active development
+
+* Javascript testing using Jasmine
+
+### 1.0.2 (Oktober 11, 2013)
+
+* [(kramerc)](https://github.com/kramerc) [Prevent the default action on the modal's buttons.](https://github.com/bluerail/twitter-bootstrap-rails-confirm/pull/9)
+* [(taavo)](https://github.com/taavo) [click handler returns false](https://github.com/bluerail/twitter-bootstrap-rails-confirm/pull/6)
+* [(stevelacey)](https://github.com/stevelacey) [Swap out new lines for br's in message](https://github.com/bluerail/twitter-bootstrap-rails-confirm/pull/16)
+* [(DavyCardinaal)](https://github.com/DavyCardinaal) [Confirmbox defaults: Cancel button btn-default](https://github.com/bluerail/twitter-bootstrap-rails-confirm/pull/15) (Bootstrap 3 only)
+* [(digitalfrost)](https://github.com/digitalfrost) [Create "click" event using an event constructor](https://github.com/bluerail/twitter-bootstrap-rails-confirm/pull/14)
+
 ### 1.0.1 (April 23, 2013)
 
-* (kramerc) Add an option for including the fade class.
-* (taavo) update docs to remove DOM load requirement when setting defaults
-* (taavo) don't wait for dom to load
+* [(kramerc)](https://github.com/kramerc) [Add an option for including the fade class](https://github.com/bluerail/twitter-bootstrap-rails-confirm/pull/8)
+* [(taavo)](https://github.com/taavo) [Load asap](https://github.com/bluerail/twitter-bootstrap-rails-confirm/pull/5)
 
 ### 1.0.0 (February 22, 2013)
 
 * First 'official' release
-* Many thanks to taavo for his contributions
+* Many thanks to [taavo](https://github.com/taavo) for his contributions

data/lib/twitter-bootstrap-rails-confirm/version.rb

@@ -2,7 +2,7 @@ module Twitter
   module Bootstrap
     module Rails
       module Confirm
-        VERSION = "1.0.1"
+        VERSION = "1.0.2"
       end
     end
   end

data/vendor/assets/javascripts/twitter/bootstrap/rails/confirm.coffee

@@ -3,6 +3,7 @@ $.fn.twitter_bootstrap_confirmbox =
     fade: false
     title: null
     cancel: "Cancel"
+    cancel_class: "btn cancel"
     proceed: "OK"
     proceed_class: "btn proceed btn-primary"
 
@@ -18,20 +19,22 @@ TwitterBootstrapConfirmBox = (message, element, callback) ->
   )
 
   $("#confirmation_dialog").addClass("fade") if element.data("confirm-fade") || $.fn.twitter_bootstrap_confirmbox.defaults.fade
-  $("#confirmation_dialog .modal-body").html(message)
+  $("#confirmation_dialog .modal-body").html(message.replace(/\n/g, "<br />"))
   $("#confirmation_dialog .modal-header h3").html(element.data("confirm-title") || $.fn.twitter_bootstrap_confirmbox.defaults.title || window.top.location.origin)
-  $("#confirmation_dialog .modal-footer .cancel").html(element.data("confirm-cancel") || $.fn.twitter_bootstrap_confirmbox.defaults.cancel)
+  $("#confirmation_dialog .modal-footer .cancel").html(element.data("confirm-cancel") || $.fn.twitter_bootstrap_confirmbox.defaults.cancel).attr("class", $.fn.twitter_bootstrap_confirmbox.defaults.cancel_class).addClass(element.data("confirm-cancel-class"))
   $("#confirmation_dialog .modal-footer .proceed").html(element.data("confirm-proceed") || $.fn.twitter_bootstrap_confirmbox.defaults.proceed).attr("class", $.fn.twitter_bootstrap_confirmbox.defaults.proceed_class).addClass(element.data("confirm-proceed-class"))
   $("#confirmation_dialog").modal("show").on("hidden", ->
     $(this).remove()
   )
 
-  $("#confirmation_dialog .proceed").click ->
+  $("#confirmation_dialog .proceed").click (event) ->
+    event.preventDefault()
     $("#confirmation_dialog").modal("hide")
     callback()
-    true
+    false
 
-  $("#confirmation_dialog .cancel").click ->
+  $("#confirmation_dialog .cancel").click (event) ->
+    event.preventDefault()
     $("#confirmation_dialog").modal("hide")
     false
 
@@ -50,29 +53,25 @@ $.rails.allowAction = (element) ->
         
         if element.get(0).click
           element.get(0).click()
-        else if $.isFunction(document.createEvent)
-          evt = document.createEvent "MouseEvents"
-          evt.initMouseEvent(
-            "click",
-            true,   # e.bubbles,
-            true,   #e.cancelable,
-            window, #e.view,
-            0,      #e.detail,
-            0,      #e.screenX,
-            0,      #e.screenY,
-            0,      #e.clientX,
-            0,      #e.clientY,
-            false,  #e.ctrlKey,
-            false,  #e.altKey,
-            false,  #e.shiftKey,
-            false,  #e.metaKey,
-            0,      #e.button,
-            document.body.parentNode #e.relatedTarget
-          )
-          element.get(0).dispatchEvent(evt)
         else
-          element.trigger "click"
+          evt = new MouseEvents("click", {
+            bubbles : true,
+            cancelable : true,
+            view : window,
+            detail : 0,
+            screenX : 0,
+            screenY : 0,
+            clientX : 0,
+            clientY : 0,
+            ctrlKey : false,
+            altKey : false,
+            shiftKey : false,
+            metaKey : false,
+            button : 0,
+            relatedTarget : document.body.parentNode
+          })
+          element.get(0).dispatchEvent(evt)
 
         $.rails.allowAction = allowAction
   
-  false
+  false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-bootstrap-rails-confirm
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Rene van Lieshout
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-23 00:00:00 Z
+date: 2013-10-11 00:00:00 Z
 dependencies: []
 
 description: Confirm dialogs using Twitter Bootstrap
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Applies a custom confirm dialog for elements with a data-confirm attribute.