bootstrap-wysihtml5-rails 0.3.3.7 → 0.3.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8228a3d0994b86448a431492254ab4728ea0279
-  data.tar.gz: d2e5d85e9bbf6d8ab6be7137e50051c1a5a96373
+  metadata.gz: 0b49729214f4bb7a06fb30ea94db63b6bd0111f5
+  data.tar.gz: 60b2e02391b84cd16ec35e27743570a440411f35
 SHA512:
-  metadata.gz: 17579f5fa6c64c23a83b14ed4ce0a8daa416c4875ea998e9dff7b4de68054f285483ad231c3fe56b7a7410b6ac28bde4420342f8cba0889f518f4fe662f910e3
-  data.tar.gz: 241da23dc9903a76c5fa34926595c13bffd1a0dc2ed7533c95c697f13758961117917b2b64bf89947f345ef1636a46bf845c186e09b93c30169497adf4339b6a
+  metadata.gz: 2937ec2234f270db5baa11cce12970a7e4b2d32b1195d4871853d3b51328f8c638aff6ba9a57f4e405859a84447f8a82f489c4827ff663aaeab3f9b34c59f0e3
+  data.tar.gz: cf9d85ee94acddc28344422d3c8957b7bfeec6afa191b3f7c3eb1158f52925fc2ded1691700d837d46a59cd4f39e5368cb2a06822d0d1be65d8f8f193d014319

data/README.md

@@ -6,7 +6,7 @@
 
 [Bootstrap](http://getbootstrap.com) is a toolkit from Twitter designed to kickstart development of webapps and sites. It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
 
-http://twitter.github.com/bootstrap/
+http://getbootstrap.com/
 
 Bootstrap Wysihtml5 is a plugin for Bootstrap designed by James Hollingworth. It provides a stylish wysiwyg editor for Bootstrap. We use Christian Sterzl's fork.
 
@@ -16,6 +16,8 @@ bootstrap-wysihtml5-rails project integrates it with Rails 3 assets pipeline.
 
 https://github.com/Nerian/bootstrap-wysihtml5-rails
 
+__This repo is only for packaging bootstrap-wysihtml5 into a ruby gem. If yor Pull Request is about changing bootstrap-wysihtml5 (any file in the 'vendor' folder) please create it in their repository, not here.__
+
 __Latest version with Bootstrap 2 support was `0.3.1.24`. New releases only package Bootstrap 3 support.__
 
 ## Rails > 3.1
@@ -43,6 +45,11 @@ app/assets/stylesheets/application.css
 *= require bootstrap-wysihtml5
 ```
 
+if you are using SASS: app/assets/stylesheets/application.scss
+``` scss
+@import "bootstrap-wysihtml5/bootstrap3-wysihtml5";
+```
+
 app/assets/javascripts/application.js
 ```javascript
 //= require bootstrap-wysihtml5
@@ -94,6 +101,11 @@ There is `simple_form` input which you can apply via `as: :wysihtml5` option.
 ```erb
 <%= f.input :content, as: :wysihtml5 %>
 ```
+Or with [bootstrap3-wysiwyg](https://github.com/bootstrap-wysiwyg/bootstrap3-wysiwyg#options) options
+
+```erb
+<%= f.input :content, as: :wysihtml5, wysihtml5: { locale: "es-ES" } %>
+```
 
 ## If using Turbolinks
 
@@ -103,6 +115,39 @@ $(document).on('page:load', function(){
 })
 ```
 
+## Using bootstrap-wysihtml5-rails with Font Awesome
+
+In the case you're not using Glyphicons but Font-Awesome, here is how to make Wysihtml5 use Font-Awesome :
+
+```javascript
+$(elem).wysihtml5({ toolbar:{ "fa": true } });
+```
+
+## Passing options
+
+To activate direct html editing and disable blockquote:
+```
+  $('.wysihtml5').wysihtml5({'toolbar': {'blockquote': false, 'html': true}})
+```
+
+Toolbal default options are:
+
+```
+toolbar: {
+      'font-styles': true,
+      'color': false,
+      'emphasis': {
+        'small': true
+      },
+      'blockquote': true,
+      'lists': true,
+      'html': false,
+      'link': true,
+      'image': true,
+      'smallmodals': false
+    }
+```
+
 ## License
 Copyright (c) 2012-2014 Gonzalo Rodríguez-Baltanás Díaz
 

data/bootstrap-wysihtml5-rails.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/bootstrap-wysihtml5-rails/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Gonzalo Rodríguez-Baltanás Díaz"]
   gem.email         = ["siotopo@gmail.com"]
-  gem.description   = %q{A wysiwyg text editor for Twitter Bootstrap}
+  gem.description   = %q{A wysiwyg text editor for Bootstrap}
   gem.homepage      = "https://github.com/Nerian/bootstrap-wysihtml5-rails"
   gem.summary       = gem.description
   gem.license       = 'MIT'

data/lib/bootstrap-wysihtml5-rails/simple_form/wysihtml5_input.rb

@@ -2,7 +2,7 @@ class Wysihtml5Input < SimpleForm::Inputs::TextInput
   def input(wrapper_options)
     idf = "#{lookup_model_names.join("_")}_#{reflection_or_attribute_name}"
     script = template.content_tag(:script, type: 'text/javascript') do
-      "$('textarea[id=#{idf}]').wysihtml5();".html_safe
+      "$('textarea[id=#{idf}]').wysihtml5(#{options[:wysihtml5].to_json});".html_safe
     end
 
     super + script

data/lib/bootstrap-wysihtml5-rails/version.rb

@@ -1,5 +1,5 @@
 module BootstrapWysihtml5Rails
   module Rails
-    VERSION = "0.3.3.7"
+    VERSION = "0.3.3.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-wysihtml5-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3.7
+  version: 0.3.3.8
 platform: ruby
 authors:
 - Gonzalo Rodríguez-Baltanás Díaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A wysiwyg text editor for Twitter Bootstrap
+description: A wysiwyg text editor for Bootstrap
 email:
 - siotopo@gmail.com
 executables: []
@@ -133,8 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A wysiwyg text editor for Twitter Bootstrap
+summary: A wysiwyg text editor for Bootstrap
 test_files: []