Skip to content
Browse files

Merge pull request #1356 from brewster1134/bootstrap-wysihtml5-update

support for latest bootstrap-wysihtml5
  • Loading branch information...
2 parents 02c03c1 + 82f3e4f commit 8409c954394720e6112253f60d06cc2fd6e665a0 @bbenezech bbenezech committed Oct 12, 2012
View
2 app/assets/javascripts/rails_admin/ra.widgets.coffee
@@ -195,7 +195,7 @@ $(document).live 'rails_admin.dom_ready', ->
array.each ->
$(@).addClass('bootstrap-wysihtml5ed')
$(@).closest('.controls').addClass('well')
- $(@).wysihtml5()
+ $(@).wysihtml5 { stylesheets: false }
array = $('form [data-richtext=bootstrap-wysihtml5]').not('.bootstrap-wysihtml5ed')
if array.length
View
2 lib/rails_admin/config/fields/types/text.rb
@@ -70,7 +70,7 @@ class Text < RailsAdmin::Config::Fields::Base
end
register_instance_option(:bootstrap_wysihtml5_js_location) do
- '/assets/bootstrap-wysihtml5-all.js'
+ '/assets/bootstrap-wysihtml5.js'
end
register_instance_option(:html_attributes) do

0 comments on commit 8409c95

Please sign in to comment.
Something went wrong with that request. Please try again.