Skip to content

Commit

Permalink
Renamed gem from "wysihtml5x-rails" to "wysihtml-rails" and released …
Browse files Browse the repository at this point in the history
…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).
  • Loading branch information
tanelj committed Dec 11, 2014
1 parent d255a90 commit 75ea564
Show file tree
Hide file tree
Showing 12 changed files with 743 additions and 59 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -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
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -27,21 +27,21 @@ bundle
Or install it yourself as:

```sh
$ gem install wysihtml5x-rails
$ gem install wysihtml-rails
```

## Usage

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`:
Expand All @@ -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:
Expand All @@ -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
});
Expand Down
9 changes: 9 additions & 0 deletions lib/wysihtml/rails.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
require "wysihtml/rails/version"

module Wysihtml
module Rails
class Engine < ::Rails::Engine
isolate_namespace Wysihtml::Rails
end
end
end
5 changes: 5 additions & 0 deletions lib/wysihtml/rails/version.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module Wysihtml
module Rails
VERSION = "0.5.0.beta2"
end
end
9 changes: 0 additions & 9 deletions lib/wysihtml5x/rails.rb

This file was deleted.

5 changes: 0 additions & 5 deletions lib/wysihtml5x/rails/version.rb

This file was deleted.

Loading

0 comments on commit 75ea564

Please sign in to comment.