wysihtml5n-rails 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWNmMjU4Mzc5NGJmOTgyODRiODQ3MjIzZmM3NzBjYWZjMWIzZDEwNg==
+    NWY5OGQxZmJlZmY0MDZiZWRlOTEzN2E0ZTQ2MjZjNjU1YTMwNTUwNA==
   data.tar.gz: !binary |-
-    YzFiNzg5M2VjMGI0MjViYTY4NTA1NmQyMTg4MmNlNGEwYjM3MDA4MQ==
+    NDcyYjg2NTA3NTgyMWJjNGI0MjkwZThiN2ViMTNjOWEyMjkzZTkyNA==
 SHA512:
   metadata.gz: !binary |-
-    YjE3OWQxNGMyNzkwYTA2ODllOTQ1ZTRiYjg0OTU3ZTM4YWNmOWI2ZjQ3MWVj
-    OTZiNWYwNGU4MzQ5M2ViZTc3YTk0NjU1NWM0OGExYWU1MzQ3MjQ0MTgxMTIz
-    M2Y5NDFiODcxMzBmODJiMTljODA4NDJkNDcxZGZjYWU3MjgyMTc=
+    MGJhNWE1OTNiOWRiYWYwNTgyYjAyZjU3ZTMzZmY0ZjUwM2UzOTNiMWM0MmFi
+    YjQxN2M0OGRjZjc1MmE4YzljMjAzOWVjMDNkMWRmMjg1NTg4ZTcwMjJjN2U0
+    NDJkNzMxZmZhMDFmOTAzNDFhMTljODZkZTRmMTQ1M2M3MjJjOTE=
   data.tar.gz: !binary |-
-    MWQ5NTA1YTYzZGQ1NTM4OWNiYTEzYzc3ZDI2NzI2MTgyYTkxNDZkMDg3NzE5
-    OGM0Y2I1MWMzM2JjMzI3MDQwZDQ2YTE0ODAzOTU2MDc1N2UwZTE4MThhODVi
-    MTIwOTAyNzFlNjA1MjNiMWE5MDUwNWRmMzlmYzc1MmY3N2E2MmU=
+    N2VlZWI3NGRmYjc0ZjgxY2EwMWUwZmU3M2MxYTgxZTQ4MzhjNTRiNzQ4Mzgz
+    NjFhY2Y0MWY5MmE4MmNjZWRiMDMwNzJhMDk2M2FkMTJjNjQ3OGJkMDVkZTM0
+    ZTljNzlkYTQ3OWY3OTAwMDM1YzQ5M2VmMjJhZmU0YzdhNzc2MTc=

data/README.md

@@ -46,6 +46,23 @@ Finally, initialize the editor:
 $('.wysiwyg').wysiHTML5N();
 ```
 
+You can pass options to editor
+
+```javascript
+# use only some editor tools
+$('.wysiwyg').wysiHTML5N({toolbar: ['h1', 'h2', 'h3', 'p', 'bold', 'italic']})
+```
+
+### Font Awesome 3 vs 4
+
+By default gem uses Font Awesome 3 (`<i class="icon-bold"></i>`).
+
+To initialize editor with Font Awesome 4 icon style (`<i class="fa fa-bold"></i>`) :
+
+```javascript
+$('.wysiwyg').wysiHTML5N({icon_style: 'font_awesome_4'})
+```
+
 ## Dependencies
 
 Wysihtml5n-rails depends on:
@@ -54,4 +71,4 @@ Wysihtml5n-rails depends on:
 * Rails 3.1+
 * SASS
 
-The Twitter Bootstrap CSS file that's bundled with Wysihtml5n-rails only contains styles for forms and buttons. If you're already using Twitter Bootstrap in your application there's no need to require it again.
+The Twitter Bootstrap CSS file that's bundled with Wysihtml5n-rails only contains styles for forms and buttons. If you're already using Twitter Bootstrap in your application there's no need to require it again.

data/lib/wysihtml5n/rails/version.rb

@@ -1,5 +1,5 @@
 module Wysihtml5n
   module Rails
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/spec_helper.rb

@@ -1,6 +1,8 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
+FileUtils.mkdir_p File.expand_path("../dummy/tmp/cache/assets",  __FILE__)
+
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require 'minitest/spec'
@@ -10,3 +12,4 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+

data/vendor/assets/javascripts/wysihtml5n/wysihtml5-enhanced.js

@@ -627,18 +627,40 @@
    */
   var WysiHTML5N = function(textarea, options){
 
+    // font awesome v3 and v4 icon styles
+    var font_awesom_icons = {
+      font_awesome_3: {
+        bold:         'icon-bold',
+        italic:       'icon-italic',
+        ol:           'icon-list-ol',
+        ul:           'icon-list-ul',
+        insertLink:   'icon-link',
+        insertImage:  'icon-picture',
+      },
+      font_awesome_4: {
+        bold:         'fa fa-bold',
+        italic:       'fa fa-italic',
+        ol:           'fa fa-list-ol',
+        ul:           'fa fa-list-ul',
+        insertLink:   'fa fa-link',
+        insertImage:  'fa fa-image',
+      }
+    }
+
+    var toolbar_icon = font_awesom_icons[options['icon_style']]
+
     // define editor toolbar HTML components
     var toolbar = {
       h1:           '<li data-wysihtml5-command="formatBlock" data-wysihtml5-command-value="h1" title="Insert headline 1" class="command btn">H1</li>',
       h2:           '<li data-wysihtml5-command="formatBlock" data-wysihtml5-command-value="h2" title="Insert headline 2" class="command btn">H2</li>',
       h3:           '<li data-wysihtml5-command="formatBlock" data-wysihtml5-command-value="h3" title="Insert headline 3" class="command btn">H3</li>',
       p:            '<li data-wysihtml5-command="formatBlock" data-wysihtml5-command-value="p" title="Insert paragraph" class="command btn">P</li>',
-      bold:         '<li data-wysihtml5-command="bold" title="Make text bold (CTRL + B)" class="command btn"><i class="icon-bold"></i></li>',
-      italic:       '<li data-wysihtml5-command="italic" title="Make text italic (CTRL + I)" class="command btn"><i class="icon-italic"></i></li>',
-      ol:           '<li data-wysihtml5-command="insertOrderedList" title="Insert an ordered list" class="command btn"><i class="icon-list-ol"></i></li>',
-      ul:           '<li data-wysihtml5-command="insertUnorderedList" title="Insert an unordered list" class="command btn"><i class="icon-list-ul"></i></li>',
-      insertLink:   '<li data-wysihtml5-command="createLink" title="Insert a link" class="command btn"><i class="icon-link"></i></li>',
-      insertImage:  '<li data-wysihtml5-command="insertImage" title="Insert an image" class="command btn"><i class="icon-picture"></i></li>',
+      bold:         '<li data-wysihtml5-command="bold" title="Make text bold (CTRL + B)" class="command btn"><i class="' + toolbar_icon['bold'] + '"></i></li>',
+      italic:       '<li data-wysihtml5-command="italic" title="Make text italic (CTRL + I)" class="command btn"><i class="' + toolbar_icon['italic'] + '"></i></li>',
+      ol:           '<li data-wysihtml5-command="insertOrderedList" title="Insert an ordered list" class="command btn"><i class="' + toolbar_icon['ol'] + '"></i></li>',
+      ul:           '<li data-wysihtml5-command="insertUnorderedList" title="Insert an unordered list" class="command btn"><i class="' + toolbar_icon['ul'] + '"></i></li>',
+      insertLink:   '<li data-wysihtml5-command="createLink" title="Insert a link" class="command btn"><i class="' + toolbar_icon['insertLink'] + '"></i></li>',
+      insertImage:  '<li data-wysihtml5-command="insertImage" title="Insert an image" class="command btn"><i class="' + toolbar_icon['insertImage'] + '"></i></li>',
       changeView:   '<li data-wysihtml5-action="change_view" title="Show HTML" class="action btn">&lt;/&gt;</li>',
       modals: {
         insertLink:'<div class="modal" data-wysihtml5-dialog="createLink" style="display: none;">' +
@@ -769,8 +791,9 @@
 
   $.fn.wysiHTML5N.defaults = {
     toolbar: [
-      'h1', 'h2', 'h3', 'p', 'bold', 'italic', 'unordered', 'ordered', 'insertLink', 'insertImage', 'changeView'
+      'h1', 'h2', 'h3', 'p', 'bold', 'italic', 'ul', 'ol', 'insertLink', 'insertImage', 'changeView'
     ],
+    icon_style: 'font_awesome_3',
     stylesheets: [],
     parserRules: parserRules,
     imageEditor: {
@@ -780,4 +803,4 @@
     }
   }
 
-}(window.jQuery));
+}(window.jQuery));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wysihtml5n-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Zohar Arad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails