Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Voog/wysihtml-rails
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.5.1
Choose a base ref
...
head repository: Voog/wysihtml-rails
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 6 commits
  • 35 files changed
  • 1 contributor

Commits on Nov 10, 2015

  1. v0.5.2

    Oliver Pulges committed Nov 10, 2015
    Copy the full SHA
    03f69c2 View commit details

Commits on Dec 9, 2015

  1. Update to v0.5.3

    Oliver Pulges committed Dec 9, 2015
    Copy the full SHA
    4630e86 View commit details

Commits on Dec 18, 2015

  1. Update to v0.5.4

    Oliver Pulges committed Dec 18, 2015
    Copy the full SHA
    16153a6 View commit details

Commits on Jan 6, 2016

  1. Update to v0.5.5

    Oliver Pulges committed Jan 6, 2016
    Copy the full SHA
    1cd9495 View commit details

Commits on May 13, 2016

  1. Update to v0.6.0.beta

    Oliver Pulges committed May 13, 2016
    Copy the full SHA
    edb1e50 View commit details

Commits on Sep 1, 2016

  1. v0.6.0.beta2

    Oliver Pulges committed Sep 1, 2016
    Copy the full SHA
    ba2fa34 View commit details
Showing with 13,186 additions and 30,759 deletions.
  1. +9 −6 README.md
  2. +1 −1 lib/wysihtml/rails/version.rb
  3. +0 −18,542 vendor/assets/javascripts/wysihtml-toolbar.js
  4. +10,496 −12,174 vendor/assets/javascripts/wysihtml.js
  5. +24 −0 vendor/assets/javascripts/wysihtml/all_commands.js
  6. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/alignCenterStyle.js
  7. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/alignJustifyStyle.js
  8. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/alignLeftStyle.js
  9. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/alignRightStyle.js
  10. +48 −0 vendor/assets/javascripts/wysihtml/extra_commands/bgColorStyle.js
  11. +16 −0 vendor/assets/javascripts/wysihtml/extra_commands/bold.js
  12. +52 −0 vendor/assets/javascripts/wysihtml/extra_commands/command_formatCode.js
  13. +108 −0 vendor/assets/javascripts/wysihtml/extra_commands/command_insertImage.js
  14. +13 −0 vendor/assets/javascripts/wysihtml/extra_commands/fontSize.js
  15. +35 −0 vendor/assets/javascripts/wysihtml/extra_commands/fontSizeStyle.js
  16. +13 −0 vendor/assets/javascripts/wysihtml/extra_commands/foreColor.js
  17. +52 −0 vendor/assets/javascripts/wysihtml/extra_commands/foreColorStyle.js
  18. +16 −0 vendor/assets/javascripts/wysihtml/extra_commands/insertBlockQuote.js
  19. +27 −0 vendor/assets/javascripts/wysihtml/extra_commands/insertHorizontalRule.js
  20. +11 −0 vendor/assets/javascripts/wysihtml/extra_commands/insertOrderedList.js
  21. +11 −0 vendor/assets/javascripts/wysihtml/extra_commands/insertUnorderedList.js
  22. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/italic.js
  23. +18 −0 vendor/assets/javascripts/wysihtml/extra_commands/justifyCenter.js
  24. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/justifyFull.js
  25. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/justifyLeft.js
  26. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/justifyRight.js
  27. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/subscript.js
  28. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/superscript.js
  29. +17 −0 vendor/assets/javascripts/wysihtml/extra_commands/underline.js
  30. +4 −4 vendor/assets/javascripts/{ → wysihtml}/parser_rules/advanced.js
  31. +25 −25 vendor/assets/javascripts/{ → wysihtml}/parser_rules/advanced_and_extended.js
  32. +5 −5 vendor/assets/javascripts/{ → wysihtml}/parser_rules/advanced_unwrap.js
  33. +2 −2 vendor/assets/javascripts/{ → wysihtml}/parser_rules/simple.js
  34. +1,163 −0 vendor/assets/javascripts/wysihtml/table_editing.js
  35. +850 −0 vendor/assets/javascripts/wysihtml/toolbar.js
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -38,16 +38,19 @@ Require it in your JS manifest's file `application.js`:
//= require wysihtml
```

or if you need wysihtml with built-in toolbar:
or if you also need toolbar, table editing features or all commands:

```js
//= require wysihtml-toolbar
//= require wysihtml
//= require wysihtml/toolbar
//= require wysihtml/all_commands
//= require wysihtml/table_editing
```

Additionally include predefined `simple`, `advanced` or `advanced_unwrap` parsing rules in your `application.js`:

```js
//= require parser_rules/advanced_unwrap
//= require wysihtml/parser_rules/advanced_unwrap
```

Additionally include predefined `wysihtml` stiles in your `application.css.scss` file:
@@ -60,10 +63,10 @@ The simple initialise:

```html
<script>
var editor = new wysihtml5.Editor("wysihtml5-textarea", { // id of textarea element
toolbar: "wysihtml5-toolbar", // id of toolbar element
var editor = new wysihtml.Editor("wysihtml-textarea", { // id of textarea element
toolbar: "wysihtml-toolbar", // id of toolbar element
stylesheets: "<%= stylesheet_path('wysihtml') %>", // optional, css to style the editor's content
parserRules: wysihtml5ParserRules, // defined in parser rules set
parserRules: wysihtmlParserRules, // defined in parser rules set
//showToolbarAfterInit: false
});
</script>
2 changes: 1 addition & 1 deletion lib/wysihtml/rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Wysihtml
module Rails
VERSION = "0.5.1"
VERSION = "0.6.0.beta2"
end
end
Loading