Skip to content

Commit

Permalink
Update gem
Browse files Browse the repository at this point in the history
  • Loading branch information
Nerian committed Oct 8, 2014
1 parent ff62e86 commit 1c7cb98
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 24 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,6 @@ Or just add the ones that you want

You may need to restart your rails server.

## Using bootstrap-wysihtml5-rails with simple_form

There is `simple_form` input which you can apply via `as: :wysihtml5` option.

```erb
<%= f.input :content, as: :wysihtml5 %>
```

## Using bootstrap-wysihtml5-rails directly

Just call wysihtml5() with any selector.
Expand All @@ -86,6 +78,14 @@ Just call wysihtml5() with any selector.

```

## Using bootstrap-wysihtml5-rails with simple_form

There is `simple_form` input which you can apply via `as: :wysihtml5` option.

```erb
<%= f.input :content, as: :wysihtml5 %>
```

## If using Turbolinks

```
Expand Down
2 changes: 1 addition & 1 deletion lib/bootstrap-wysihtml5-rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module BootstrapWysihtml5Rails
module Rails
# Change to follow bootstrap3-wysihtml5-bower version as soon as they we can.
VERSION = "0.3.2.100"
VERSION = "0.3.3.1"
end
end
6 changes: 0 additions & 6 deletions testapp/app/views/home/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
<h1>Home#index</h1>
<p>Find me in app/views/home/index.html.erb</p>

<div id="some_div">
Hello
</div>

<textarea class="textarea" placeholder="Enter text ..." style='width: 100%;height: 300px'></textarea>

<script type="text/javascript">
$('.textarea').wysihtml5({locale: 'es-ES'});

$('#some_div').wysihtml5();
</script>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,5 @@ ul.wysihtml5-toolbar div[data-wysihtml5-command-value="orange"] {

.glyphicon-quote:after {
content: "\0000a0";
}
}

0 comments on commit 1c7cb98

Please sign in to comment.