From 75ea564daae181320022097f844fa24d11921c6e Mon Sep 17 00:00:00 2001
From: Tanel Jakobsoo <tanel.jakobsoo@gmail.com>
Date: Thu, 11 Dec 2014 16:12:00 +0200
Subject: [PATCH] Renamed gem from "wysihtml5x-rails" to "wysihtml-rails" and
 released version 0.5.0.beta2.

* Added latest version of wysihtml (previously wysihtml5x)
* Bumped version to 0.5.0.beta2
* Moved gem repository from https://github.com/Edicy/wysihtml-rails to https://github.com/Voog/wysihtml-rails due rebranding of the wysihtml and Edicy (now Voog - www.voog.com).
---
 Gemfile                                       |   2 +-
 README.md                                     |  22 +-
 lib/wysihtml/rails.rb                         |   9 +
 lib/wysihtml/rails/version.rb                 |   5 +
 lib/wysihtml5x/rails.rb                       |   9 -
 lib/wysihtml5x/rails/version.rb               |   5 -
 .../parser_rules/advanced_and_extended.js     | 684 ++++++++++++++++++
 ...ihtml5x-toolbar.js => wysihtml-toolbar.js} |   8 +-
 .../{wysihtml5x.js => wysihtml.js}            |   8 +-
 .../{wysihtml5x.css => wysihtml.css}          |   0
 wysihtml-rails.gemspec                        |  25 +
 wysihtml5x-rails.gemspec                      |  25 -
 12 files changed, 743 insertions(+), 59 deletions(-)
 create mode 100644 lib/wysihtml/rails.rb
 create mode 100644 lib/wysihtml/rails/version.rb
 delete mode 100644 lib/wysihtml5x/rails.rb
 delete mode 100644 lib/wysihtml5x/rails/version.rb
 create mode 100644 vendor/assets/javascripts/parser_rules/advanced_and_extended.js
 rename vendor/assets/javascripts/{wysihtml5x-toolbar.js => wysihtml-toolbar.js} (99%)
 rename vendor/assets/javascripts/{wysihtml5x.js => wysihtml.js} (99%)
 rename vendor/assets/stylesheets/{wysihtml5x.css => wysihtml.css} (100%)
 create mode 100644 wysihtml-rails.gemspec
 delete mode 100644 wysihtml5x-rails.gemspec

diff --git a/Gemfile b/Gemfile
index afe860f..020eb74 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in wysihtml5x-rails.gemspec
+# Specify your gem's dependencies in wysihtml-rails.gemspec
 gemspec
diff --git a/README.md b/README.md
index ea77392..3450385 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,21 @@
-# wysihtml5x for Rails
+# wysihtml for Rails
 
-[Edicy/wysihtml5x](http://edicy.github.io/wysihtml5/) is an extended and less strict approach on [xing/wysihtml5](http://xing.github.io/wysihtml5/) open source rich text editor based on HTML5 technology.
+[Voog/wysihtml](https://github.com/Voog/wysihtml) is an extended and less strict approach on [xing/wysihtml5](http://xing.github.io/wysihtml5/) open source rich text editor based on HTML5 technology.
 
-This gem adds wysihtml5x to Rails assets pipeline.
+This gem adds wysihtml to Rails assets pipeline.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'wysihtml5x-rails'
+gem 'wysihtml-rails'
 ```
 
 Or you can install from latest build:
 
 ```ruby
-gem 'wysihtml5x-rails', :git => 'https://github.com/Edicy/wysihtml5x-rails.git'
+gem 'wysihtml-rails', :git => 'https://github.com/Voog/wysihtml-rails.git'
 ```
 
 And then execute:
@@ -27,7 +27,7 @@ bundle
 Or install it yourself as:
 
 ```sh
-$ gem install wysihtml5x-rails
+$ gem install wysihtml-rails
 ```
 
 ## Usage
@@ -35,13 +35,13 @@ $ gem install wysihtml5x-rails
 Require it in your JS manifest's file `application.js`:
 
 ```js
-//= require wysihtml5x
+//= require wysihtml
 ```
 
 or if you need wysihtml with built-in toolbar:
 
 ```js
-//= require wysihtml5x-toolbar
+//= require wysihtml-toolbar
 ```
 
 Additionally include predefined `simple`, `advanced` or `advanced_unwrap` parsing rules in your `application.js`:
@@ -50,10 +50,10 @@ Additionally include predefined `simple`, `advanced` or `advanced_unwrap` parsin
 //= require parser_rules/advanced_unwrap
 ```
 
-Additionally include predefined `wysihtml5x` stiles in your `application.css.scss` file:
+Additionally include predefined `wysihtml` stiles in your `application.css.scss` file:
 
 ```scss
-*= require wysihtml5x
+*= require wysihtml
 ```
 
 The simple initialise:
@@ -62,7 +62,7 @@ The simple initialise:
 <script>
    var editor = new wysihtml5.Editor("wysihtml5-textarea", { // id of textarea element
       toolbar:      "wysihtml5-toolbar", // id of toolbar element
-      stylesheets:  "<%= stylesheet_path('wysihtml5x') %>", // optional, css to style the editor's content
+      stylesheets:  "<%= stylesheet_path('wysihtml') %>", // optional, css to style the editor's content
       parserRules:  wysihtml5ParserRules, // defined in parser rules set
       //showToolbarAfterInit: false
    });
diff --git a/lib/wysihtml/rails.rb b/lib/wysihtml/rails.rb
new file mode 100644
index 0000000..d1c1b4a
--- /dev/null
+++ b/lib/wysihtml/rails.rb
@@ -0,0 +1,9 @@
+require "wysihtml/rails/version"
+
+module Wysihtml
+  module Rails
+    class Engine < ::Rails::Engine
+      isolate_namespace Wysihtml::Rails
+    end
+  end
+end
diff --git a/lib/wysihtml/rails/version.rb b/lib/wysihtml/rails/version.rb
new file mode 100644
index 0000000..e8ed30e
--- /dev/null
+++ b/lib/wysihtml/rails/version.rb
@@ -0,0 +1,5 @@
+module Wysihtml
+  module Rails
+    VERSION = "0.5.0.beta2"
+  end
+end
diff --git a/lib/wysihtml5x/rails.rb b/lib/wysihtml5x/rails.rb
deleted file mode 100644
index ae551a5..0000000
--- a/lib/wysihtml5x/rails.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require "wysihtml5x/rails/version"
-
-module Wysihtml5x
-  module Rails
-    class Engine < ::Rails::Engine
-      isolate_namespace Wysihtml5x::Rails
-    end
-  end
-end
diff --git a/lib/wysihtml5x/rails/version.rb b/lib/wysihtml5x/rails/version.rb
deleted file mode 100644
index 0ca7960..0000000
--- a/lib/wysihtml5x/rails/version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Wysihtml5x
-  module Rails
-    VERSION = "0.5.0.beta1"
-  end
-end
diff --git a/vendor/assets/javascripts/parser_rules/advanced_and_extended.js b/vendor/assets/javascripts/parser_rules/advanced_and_extended.js
new file mode 100644
index 0000000..43cf038
--- /dev/null
+++ b/vendor/assets/javascripts/parser_rules/advanced_and_extended.js
@@ -0,0 +1,684 @@
+/**
+ * Full HTML5 compatibility rule set
+ * Loosened and extended ruleset. Allows more freedom on user side
+ * These rules define which tags and CSS classes are supported and which tags should be specially treated.
+ */
+
+var wysihtml5ParserRulesDefaults = {
+    "blockLevelEl": {
+        "keep_styles": {
+            "textAlign": /^((left)|(right)|(center)|(justify))$/i,
+            "float": 1
+        },
+        "add_style": {
+            "align": "align_text"
+        },
+        "check_attributes": {
+            "id": "any"
+        }
+    },
+
+    "makeDiv": {
+        "rename_tag": "div",
+        "one_of_type": {
+            "alignment_object": 1
+        },
+        "remove_action": "unwrap",
+        "keep_styles": {
+            "textAlign": 1,
+            "float": 1
+        },
+        "add_style": {
+            "align": "align_text"
+        },
+        "check_attributes": {
+            "id": "any"
+        }
+    }
+};
+
+var wysihtml5ParserRules = {
+    /**
+     * CSS Class white-list
+     * Following CSS classes won't be removed when parsed by the wysihtml5 HTML parser
+     * If all classes should pass "any" as classes value. Ex: "classes": "any"
+     */
+    "classes": "any",
+
+    /* blacklist of classes is only available if classes is set to any */
+    "classes_blacklist": {
+        "Apple-interchange-newline": 1,
+        "MsoNormal": 1,
+        "MsoPlainText": 1
+    },
+    
+    "type_definitions": {
+        
+        "alignment_object": {
+            "classes": {
+                "wysiwyg-text-align-center": 1,
+                "wysiwyg-text-align-justify": 1,
+                "wysiwyg-text-align-left": 1,
+                "wysiwyg-text-align-right": 1,
+                "wysiwyg-float-left": 1,
+                "wysiwyg-float-right": 1
+            },
+            "styles": {
+                "float": ["left", "right"],
+                "text-align": ["left", "right", "center"]
+            }
+        },
+        
+        "valid_image_src": {
+            "attrs": {
+                "src": /^[^data\:]/i
+            }
+        },
+        
+        "text_color_object": {
+          "styles": {
+            "color": true,
+            "background-color": true
+          }
+        },
+        
+        "text_fontsize_object": {
+          "styles": {
+            "font-size": true
+          }
+        },
+        
+        "text_formatting_object": {
+            "classes": {
+                "wysiwyg-color-aqua": 1,
+                "wysiwyg-color-black": 1,
+                "wysiwyg-color-blue": 1,
+                "wysiwyg-color-fuchsia": 1,
+                "wysiwyg-color-gray": 1,
+                "wysiwyg-color-green": 1,
+                "wysiwyg-color-lime": 1,
+                "wysiwyg-color-maroon": 1,
+                "wysiwyg-color-navy": 1,
+                "wysiwyg-color-olive": 1,
+                "wysiwyg-color-purple": 1,
+                "wysiwyg-color-red": 1,
+                "wysiwyg-color-silver": 1,
+                "wysiwyg-color-teal": 1,
+                "wysiwyg-color-white": 1,
+                "wysiwyg-color-yellow": 1,
+                "wysiwyg-font-size-large": 1,
+                "wysiwyg-font-size-larger": 1,
+                "wysiwyg-font-size-medium": 1,
+                "wysiwyg-font-size-small": 1,
+                "wysiwyg-font-size-smaller": 1,
+                "wysiwyg-font-size-x-large": 1,
+                "wysiwyg-font-size-x-small": 1,
+                "wysiwyg-font-size-xx-large": 1,
+                "wysiwyg-font-size-xx-small": 1
+            }
+        }
+    },
+
+    "comments": 1, // if set allows comments to pass
+    
+    /**
+     * Tag list
+     *
+     * The following options are available:
+     *
+     *    - add_class:        converts and deletes the given HTML4 attribute (align, clear, ...) via the given method to a css class
+     *                        The following methods are implemented in wysihtml5.dom.parse:
+     *                          - align_text:  converts align attribute values (right/left/center/justify) to their corresponding css class "wysiwyg-text-align-*")
+     *                            <p align="center">foo</p> ... becomes ... <p> class="wysiwyg-text-align-center">foo</p>
+     *                          - clear_br:    converts clear attribute values left/right/all/both to their corresponding css class "wysiwyg-clear-*"
+     *                            <br clear="all"> ... becomes ... <br class="wysiwyg-clear-both">
+     *                          - align_img:    converts align attribute values (right/left) on <img> to their corresponding css class "wysiwyg-float-*"
+     *                          
+     *    - remove:             removes the element and its content
+     *
+     *    - unwrap              removes element but leaves content
+     *
+     *    - rename_tag:         renames the element to the given tag
+     *
+     *    - set_class:          adds the given class to the element (note: make sure that the class is in the "classes" white list above)
+     *
+     *    - set_attributes:     sets/overrides the given attributes
+     *
+     *    - check_attributes:   checks the given HTML attribute via the given method
+     *                            - url:            allows only valid urls (starting with http:// or https://)
+     *                            - src:            allows something like "/foobar.jpg", "http://google.com", ...
+     *                            - href:           allows something like "mailto:bert@foo.com", "http://google.com", "/foobar.jpg"
+     *                            - alt:            strips unwanted characters. if the attribute is not set, then it gets set (to ensure valid and compatible HTML)
+     *                            - numbers:        ensures that the attribute only contains numeric (integer) characters (no float values or units)
+     *                            - dimension:      for with/height attributes where floating point numbrs and percentages are allowed
+     *                            - any:            allows anything to pass 
+     */
+    "tags": {
+        "tr": {
+            "add_style": {
+                "align": "align_text"
+            },
+            "check_attributes": {
+                "id": "any"
+            }
+        },
+        "strike": {
+            "unwrap": 1
+        },
+        "form": {
+            "unwrap": 1
+        },
+        "rt": {
+            "rename_tag": "span"
+        },
+        "code": {},
+        "acronym": {
+            "rename_tag": "span"
+        },
+        "br": {
+            "add_class": {
+                "clear": "clear_br"
+            }
+        },
+        "details": {
+            "unwrap": 1
+        },
+        "h4": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "em": {},
+        "title": {
+            "remove": 1
+        },
+        "multicol": {
+            "unwrap": 1
+        },
+        "figure": {
+            "unwrap": 1
+        },
+        "xmp": {
+            "unwrap": 1
+        },
+        "small": {
+            "rename_tag": "span",
+            "set_class": "wysiwyg-font-size-smaller"
+        },
+        "area": {
+            "remove": 1
+        },
+        "time": {
+            "unwrap": 1
+        },
+        "dir": {
+            "rename_tag": "ul"
+        },
+        "bdi": {
+            "unwrap": 1
+        },
+        "command": {
+            "unwrap": 1
+        },
+        "ul": {
+            "check_attributes": {
+                "id": "any"
+            }
+        },
+        "progress": {
+            "rename_tag": "span"
+        },
+        "dfn": {
+            "unwrap": 1
+        },
+        "iframe": {
+            "check_attributes": {
+                "src": "any",
+                "width": "any",
+                "height": "any",
+                "frameborder": "any",
+                "style": "any",
+                "id": "any"
+            }
+        },
+        "figcaption": {
+            "unwrap": 1
+        },
+        "a": {
+            "check_attributes": {
+                "href": "href", // if you compiled master manually then change this from 'url' to 'href'
+                "rel": "any",
+                "target": "any",
+                "id": "any"
+            }
+        },
+        "img": {
+            "one_of_type": {
+                "valid_image_src": 1
+            },
+            "check_attributes": {
+                "width": "dimension",
+                "alt": "alt",
+                "src": "src", // if you compiled master manually then change this from 'url' to 'src'
+                "height": "dimension",
+                "id": "any"
+            },
+            "add_class": {
+                "align": "align_img"
+            }
+        },
+        "rb": {
+            "unwrap": 1
+        },
+        "footer": wysihtml5ParserRulesDefaults.makeDiv,
+        "noframes": {
+            "remove": 1
+        },
+        "abbr": {
+            "unwrap": 1
+        },
+        "u": {},
+        "bgsound": {
+            "remove": 1
+        },
+        "sup": {
+            "unwrap": 1
+        },
+        "address": {
+            "unwrap": 1
+        },
+        "basefont": {
+            "remove": 1
+        },
+        "nav": {
+            "unwrap": 1
+        },
+        "h1": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "head": {
+            "unwrap": 1
+        },
+        "tbody": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "dd": {
+            "unwrap": 1
+        },
+        "s": {
+            "unwrap": 1
+        },
+        "li": {},
+        "td": {
+            "check_attributes": {
+                "rowspan": "numbers",
+                "colspan": "numbers",
+                "valign": "any",
+                "align": "any",
+                "id": "any",
+                "class": "any"
+            },
+            "keep_styles": {
+                "backgroundColor": 1,
+                "width": 1,
+                "height": 1
+            },
+            "add_style": {
+                "align": "align_text"
+            }
+        },
+        "object": {
+            "remove": 1
+        },
+        
+        "div": {
+            "one_of_type": {
+                "alignment_object": 1
+            },
+            "remove_action": "unwrap",
+            "keep_styles": {
+                "textAlign": 1,
+                "float": 1
+            },
+            "add_style": {
+                "align": "align_text"
+            },
+            "check_attributes": {
+                "id": "any",
+                "contenteditable": "any"
+            }
+        },
+        
+        "option": {
+            "remove":1
+        },
+        "select": {
+            "remove":1
+        },
+        "i": {},
+        "track": {
+            "remove": 1
+        },
+        "wbr": {
+            "remove": 1
+        },
+        "fieldset": {
+            "unwrap": 1
+        },
+        "big": {
+            "rename_tag": "span",
+            "set_class": "wysiwyg-font-size-larger"
+        },
+        "button": {
+            "unwrap": 1
+        },
+        "noscript": {
+            "remove": 1
+        },
+        "svg": {
+            "remove": 1
+        },
+        "input": {
+            "remove": 1
+        },
+        "table": {
+            "keep_styles": {
+                "width": 1,
+                "textAlign": 1,
+                "float": 1
+            },
+            "check_attributes": {
+                "id": "any"
+            }
+        },
+        "keygen": {
+            "remove": 1
+        },
+        "h5": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "meta": {
+            "remove": 1
+        },
+        "map": {
+            "remove": 1
+        },
+        "isindex": {
+            "remove": 1
+        },
+        "mark": {
+            "unwrap": 1
+        },
+        "caption": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "tfoot": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "base": {
+            "remove": 1
+        },
+        "video": {
+            "remove": 1
+        },
+        "strong": {},
+        "canvas": {
+            "remove": 1
+        },
+        "output": {
+            "unwrap": 1
+        },
+        "marquee": {
+            "unwrap": 1
+        },
+        "b": {},
+        "q": {
+            "check_attributes": {
+                "cite": "url",
+                "id": "any"
+            }
+        },
+        "applet": {
+            "remove": 1
+        },
+        "span": {
+            "one_of_type": {
+                "text_formatting_object": 1,
+                "text_color_object": 1,
+                "text_fontsize_object": 1
+            },
+            "keep_styles": {
+                "color": 1,
+                "backgroundColor": 1,
+                "fontSize": 1
+            },
+            "remove_action": "unwrap",
+            "check_attributes": {
+                "id": "any"
+            }
+        },
+        "rp": {
+            "unwrap": 1
+        },
+        "spacer": {
+            "remove": 1
+        },
+        "source": {
+            "remove": 1
+        },
+        "aside": wysihtml5ParserRulesDefaults.makeDiv,
+        "frame": {
+            "remove": 1
+        },
+        "section": wysihtml5ParserRulesDefaults.makeDiv,
+        "body": {
+            "unwrap": 1
+        },
+        "ol": {},
+        "nobr": {
+            "unwrap": 1
+        },
+        "html": {
+            "unwrap": 1
+        },
+        "summary": {
+            "unwrap": 1
+        },
+        "var": {
+            "unwrap": 1
+        },
+        "del": {
+            "unwrap": 1
+        },
+        "blockquote": {
+            "keep_styles": {
+                "textAlign": 1,
+                "float": 1
+            },
+            "add_style": {
+                "align": "align_text"
+            },
+            "check_attributes": {
+                "cite": "url",
+                "id": "any"
+            }
+        },
+        "style": {
+            "check_attributes": {
+                "type": "any",
+                "src": "any",
+                "charset": "any"
+            }
+        },
+        "device": {
+            "remove": 1
+        },
+        "meter": {
+            "unwrap": 1
+        },
+        "h3": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "textarea": {
+            "unwrap": 1
+        },
+        "embed": {
+            "remove": 1
+        },
+        "hgroup": {
+            "unwrap": 1
+        },
+        "font": {
+            "rename_tag": "span",
+            "add_class": {
+                "size": "size_font"
+            }
+        },
+        "tt": {
+            "unwrap": 1
+        },
+        "noembed": {
+            "remove": 1
+        },
+        "thead": {
+            "add_style": {
+                "align": "align_text"
+            },
+            "check_attributes": {
+                "id": "any"
+            }
+        },
+        "blink": {
+            "unwrap": 1
+        },
+        "plaintext": {
+            "unwrap": 1
+        },
+        "xml": {
+            "remove": 1
+        },
+        "h6": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "param": {
+            "remove": 1
+        },
+        "th": {
+            "check_attributes": {
+                "rowspan": "numbers",
+                "colspan": "numbers",
+                "valign": "any",
+                "align": "any",
+                "id": "any"
+            },
+            "keep_styles": {
+                "backgroundColor": 1,
+                "width": 1,
+                "height": 1
+            },
+            "add_style": {
+                "align": "align_text"
+            }
+        },
+        "legend": {
+            "unwrap": 1
+        },
+        "hr": {},
+        "label": {
+            "unwrap": 1
+        },
+        "dl": {
+            "unwrap": 1
+        },
+        "kbd": {
+            "unwrap": 1
+        },
+        "listing": {
+            "unwrap": 1
+        },
+        "dt": {
+            "unwrap": 1
+        },
+        "nextid": {
+            "remove": 1
+        },
+        "pre": {},
+        "center": wysihtml5ParserRulesDefaults.makeDiv,
+        "audio": {
+            "remove": 1
+        },
+        "datalist": {
+            "unwrap": 1
+        },
+        "samp": {
+            "unwrap": 1
+        },
+        "col": {
+            "remove": 1
+        },
+        "article": wysihtml5ParserRulesDefaults.makeDiv,
+        "cite": {},
+        "link": {
+            "remove": 1
+        },
+        "script": {
+            "check_attributes": {
+                "type": "any",
+                "src": "any",
+                "charset": "any"
+            }
+        },
+        "bdo": {
+            "unwrap": 1
+        },
+        "menu": {
+            "rename_tag": "ul"
+        },
+        "colgroup": {
+            "remove": 1
+        },
+        "ruby": {
+            "unwrap": 1
+        },
+        "h2": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "ins": {
+            "unwrap": 1
+        },
+        "p": wysihtml5ParserRulesDefaults.blockLevelEl,
+        "sub": {
+            "unwrap": 1
+        },
+        "comment": {
+            "remove": 1
+        },
+        "frameset": {
+            "remove": 1
+        },
+        "optgroup": {
+            "unwrap": 1
+        },
+        "header": wysihtml5ParserRulesDefaults.makeDiv
+    }
+};
+
+
+(function() {
+    // Paste cleanup rules universal for all rules (also applied to content copied from editor)
+    var commonRules = wysihtml5.lang.object(wysihtml5ParserRules).clone(true);
+    commonRules.comments    = false;
+    commonRules.selectors   = { "a u": "unwrap"};
+    commonRules.tags.style  = { "remove": 1 };
+    commonRules.tags.script = { "remove": 1 };
+    commonRules.tags.head = { "remove": 1 };
+    
+    // Paste cleanup for unindentified source
+    var universalRules = wysihtml5.lang.object(commonRules).clone(true);
+    universalRules.tags.div.one_of_type.alignment_object = 1;
+    universalRules.tags.div.remove_action = "unwrap";
+    universalRules.tags.div.check_attributes.style = false;
+    universalRules.tags.div.keep_styles = {
+        "textAlign": /^((left)|(right)|(center)|(justify))$/i,
+        "float": 1
+    };
+    universalRules.tags.span.keep_styles = false;
+
+    // Paste cleanup for MS Office
+    // TODO: should be extended to stricter ruleset, as current set will probably not cover all Office bizarreness
+    var msOfficeRules = wysihtml5.lang.object(universalRules).clone(true);
+    msOfficeRules.classes = {};
+
+    window.wysihtml5ParserPasteRulesets = [
+        {
+            condition: /<font face="Times New Roman"|class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument|class="OutlineElement|id="?docs\-internal\-guid\-/i,
+            set: msOfficeRules
+        },{
+            condition: /<meta name="copied-from" content="wysihtml5">/i,
+            set: commonRules
+        },{
+            set: universalRules
+        }
+    ];
+
+})();
diff --git a/vendor/assets/javascripts/wysihtml5x-toolbar.js b/vendor/assets/javascripts/wysihtml-toolbar.js
similarity index 99%
rename from vendor/assets/javascripts/wysihtml5x-toolbar.js
rename to vendor/assets/javascripts/wysihtml-toolbar.js
index b9ea443..6dc9879 100644
--- a/vendor/assets/javascripts/wysihtml5x-toolbar.js
+++ b/vendor/assets/javascripts/wysihtml-toolbar.js
@@ -376,7 +376,7 @@ if ("document" in self) {
 }
 
 ;/**
- * @license wysihtml5x v0.5.0-beta1
+ * @license wysihtml5x v0.5.0-beta2
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -387,7 +387,7 @@ if ("document" in self) {
  *
  */
 var wysihtml5 = {
-  version: "0.5.0-beta1",
+  version: "0.5.0-beta2",
 
   // namespaces
   commands:   {},
@@ -13819,7 +13819,7 @@ wysihtml5.views.View = Base.extend(
           parent.parentNode.removeChild(parent);
         }
         setTimeout(function() {
-          wysihtml5.quirks.redraw(element);
+          wysihtml5.quirks.redraw(this.element);
         }, 0);
       }
     }
@@ -13827,7 +13827,7 @@ wysihtml5.views.View = Base.extend(
     if (this.config.handleTabKey && keyCode === wysihtml5.TAB_KEY) {
       // TAB key handling
       event.preventDefault();
-      handleTabKeyDown(this, element);
+      handleTabKeyDown(this, this.element);
     }
 
   };
diff --git a/vendor/assets/javascripts/wysihtml5x.js b/vendor/assets/javascripts/wysihtml.js
similarity index 99%
rename from vendor/assets/javascripts/wysihtml5x.js
rename to vendor/assets/javascripts/wysihtml.js
index b4af5a9..03d2efa 100644
--- a/vendor/assets/javascripts/wysihtml5x.js
+++ b/vendor/assets/javascripts/wysihtml.js
@@ -376,7 +376,7 @@ if ("document" in self) {
 }
 
 ;/**
- * @license wysihtml5x v0.5.0-beta1
+ * @license wysihtml5x v0.5.0-beta2
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -387,7 +387,7 @@ if ("document" in self) {
  *
  */
 var wysihtml5 = {
-  version: "0.5.0-beta1",
+  version: "0.5.0-beta2",
 
   // namespaces
   commands:   {},
@@ -13819,7 +13819,7 @@ wysihtml5.views.View = Base.extend(
           parent.parentNode.removeChild(parent);
         }
         setTimeout(function() {
-          wysihtml5.quirks.redraw(element);
+          wysihtml5.quirks.redraw(this.element);
         }, 0);
       }
     }
@@ -13827,7 +13827,7 @@ wysihtml5.views.View = Base.extend(
     if (this.config.handleTabKey && keyCode === wysihtml5.TAB_KEY) {
       // TAB key handling
       event.preventDefault();
-      handleTabKeyDown(this, element);
+      handleTabKeyDown(this, this.element);
     }
 
   };
diff --git a/vendor/assets/stylesheets/wysihtml5x.css b/vendor/assets/stylesheets/wysihtml.css
similarity index 100%
rename from vendor/assets/stylesheets/wysihtml5x.css
rename to vendor/assets/stylesheets/wysihtml.css
diff --git a/wysihtml-rails.gemspec b/wysihtml-rails.gemspec
new file mode 100644
index 0000000..c0da807
--- /dev/null
+++ b/wysihtml-rails.gemspec
@@ -0,0 +1,25 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'wysihtml/rails/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'wysihtml-rails'
+  spec.version       = Wysihtml::Rails::VERSION
+  spec.authors       = ['Tanel Jakobsoo']
+  spec.email         = ['tanel@fraktal.ee']
+  spec.description   = %q{A wysiwyg text editor for Rails assets pipeline}
+  spec.summary       = %q{Wysihtml (http://wysihtml.com) text editor for Rails assets pipeline.}
+  spec.homepage      = 'https://github.com/Voog/wysihtml-rails'
+  spec.license       = 'MIT'
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'railties', '>= 3.1.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake', '~> 0'
+end
diff --git a/wysihtml5x-rails.gemspec b/wysihtml5x-rails.gemspec
deleted file mode 100644
index 5cc3c43..0000000
--- a/wysihtml5x-rails.gemspec
+++ /dev/null
@@ -1,25 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'wysihtml5x/rails/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "wysihtml5x-rails"
-  spec.version       = Wysihtml5x::Rails::VERSION
-  spec.authors       = ["Tanel Jakobsoo"]
-  spec.email         = ["tanel@fraktal.ee"]
-  spec.description   = %q{A wysiwyg5x text editor for Rails assets pipeline}
-  spec.summary       = %q{Wysihtml5x (http://edicy.github.io/wysihtml5) text editor for Rails assets pipeline.}
-  spec.homepage      = "https://github.com/Edicy/wysihtml5x-rails"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "railties", ">= 3.1.0"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-end