Skip to content

Commit

Permalink
Update version to 0.4.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Pulges committed Jun 2, 2014
1 parent 5783d54 commit ee97264
Show file tree
Hide file tree
Showing 4 changed files with 428 additions and 214 deletions.
2 changes: 1 addition & 1 deletion lib/wysihtml5x/rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Wysihtml5x
module Rails
VERSION = "0.4.5"
VERSION = "0.4.6"
end
end
8 changes: 7 additions & 1 deletion vendor/assets/javascripts/parser_rules/advanced_unwrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ var wysihtml5ParserRules = {


"type_definitions": {

"visible_content_object": {
"methods": {
"has_visible_contet": 1
}
},

"alignment_object": {
"classes": {
Expand Down Expand Up @@ -344,7 +350,7 @@ var wysihtml5ParserRules = {

"div": {
"one_of_type": {
"alignment_object": 1,
"visible_content_object": 1,
},
"remove_action": "unwrap",
"keep_styles": {
Expand Down
Loading

0 comments on commit ee97264

Please sign in to comment.