fondant-rails 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a39ead5479b83675473610ba5635bd724d08e0a
-  data.tar.gz: 973cc6c77bcb5e597d4b7a97491a6175200d59f6
+  metadata.gz: ea8f67fa775fe28e3580606bb997dc6119e77a3c
+  data.tar.gz: 15a8d98d368a0581a19fab8eb76086374caf56df
 SHA512:
-  metadata.gz: 2911a15462910db37b90fec3e08785e9931765dd51ef21d31680e1af55214959ea15d239a6acfe1b819398f84201ed4ca3d6aae5cc885f157fd2b50e76541113
-  data.tar.gz: 3ecc5882927c38b77ae12292d5da659851abd8d039a943153b683e252a72ad980a164674a470a4c692fecc6c04466b91b1d5cc28ee1be40afff52f51d9e40b9e
+  metadata.gz: bc2bb3d8b65ca95b2ae078f895a120f8eae061cffa8fbfcfc52fa317231f340e6613fd432e52be7f61e9b456192cab8a304c1aa574563e7e97cbf74eee08d194
+  data.tar.gz: c2b6c5dc93d52e0b21e6cc561a7b83b4c9b394cdc94ebc1343496f3d0fda27d34d1d2479126ebe12d03075c278ff30a6a1a29bdcc4518d20666e02bd269733c9

data/README.md

@@ -6,7 +6,7 @@ Use [fondant](https://github.com/ovenbits-ingredients/fondant) in Rails' asset p
 
 Add this line to your application's Gemfile:
 
-    gem 'fondant-rails', '~> 0.5.0'
+    gem 'fondant-rails', '~> 0.6.0'
 
 ## Contributing
 

data/lib/fondant-rails/version.rb

@@ -1,5 +1,5 @@
 module Fondant
   module Rails
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/vendor/assets/javascripts/fondant.coffee

@@ -1,4 +1,4 @@
-# ## Fondant v0.5.0
+# ## Fondant v0.6.0
 #
 # The icing on the cake for user input. A simple jQuery HTML5 WYSIWYG editor
 # using `contenteditable`.
@@ -38,6 +38,12 @@
 #   a toolbar and you are responsible for building and wiring up your own.
 #   (default: `true`)
 #
+# * `buttons` - An array of commands to include as buttons. Links & custom html cannot be
+#   automatically addes as a toolbar button because there needs to be some form of input between
+#   the button click and the application. Everything else is available to use.
+#   (default: [ 'bold', 'italic', 'p', 'h1', 'h2', 'h3', 'h4', 'blockquote', 'ol', 'ul', 'indent',
+#   'outdent', 'remove', 'unlink', 'undo', 'redo' ]`)
+#
 
 
 $ = jQuery
@@ -50,6 +56,7 @@ if typeof $ isnt 'undefined'
   # is called.
   #
   class Fondant
+    version: "0.6.0"
 
     # ## Methods
 
@@ -120,7 +127,7 @@ if typeof $ isnt 'undefined'
     #
     bindToolbar: ->
       for action in @actions
-        $button = $("[data-action='#{ @type }-#{ action }']")
+        $button = $("##{ @type }-#{ @id } [data-action='#{ @type }-#{ action }']")
         $button.on 'click.fondant', { action: action, editor: this }, (event) ->
           event.preventDefault()
           event.data.editor[event.data.action]()
@@ -131,7 +138,7 @@ if typeof $ isnt 'undefined'
     # this is not needed since the DOM elements will be destroyed
     #
     unbindToolbar: ->
-      $("[data-action^='#{ @type }-']").off('.fondant') unless @options.toolbar
+      $("##{ @type }-#{ @id } [data-action^='#{ @type }-']").off('.fondant') unless @options.toolbar
 
     # ### removeToolbar()
     #
@@ -397,33 +404,13 @@ if typeof $ isnt 'undefined'
       # ### templates.toolbar()
       #
       toolbar: ->
-        group = @toolbarClass() + '-button-group'
         button = @toolbarClass() + '-button'
-        """
-        <ul class="#{ @toolbarClass() }">
-          <li class="#{ group }-label">Text Styles</li>
-          <ul class="#{ group }">
-            <li class="#{ button } #{ button }-bold"><a href="#" data-action="#{ @fondant.type }-bold">B</a></li>
-            <li class="#{ button } #{ button }-italic"><a href="#" data-action="#{ @fondant.type }-italic">I</a></li>
-          </ul>
-          <li class="#{ group }-label">Block Styles</li>
-          <ul class="#{ group }">
-            <li class="#{ button } #{ button }-p"><a href="#" data-action="#{ @fondant.type }-p">P</a></li>
-            <li class="#{ button } #{ button }-h1"><a href="#" data-action="#{ @fondant.type }-h1">H1</a></li>
-            <li class="#{ button } #{ button }-h2"><a href="#" data-action="#{ @fondant.type }-h2">H2</a></li>
-            <li class="#{ button } #{ button }-h3"><a href="#" data-action="#{ @fondant.type }-h3">H3</a></li>
-            <li class="#{ button } #{ button }-h4"><a href="#" data-action="#{ @fondant.type }-h4">H4</a></li>
-            <li class="#{ button } #{ button }-blockquote"><a href="#" data-action="#{ @fondant.type }-blockquote">Quote</a></li>
-          </ul>
-          <li class="#{ group }-label">Lists</li>
-          <ul class="#{ group }">
-            <li class="#{ button } #{ button }-ol"><a href="#" data-action="#{ @fondant.type }-ol">Numbers</a></li>
-            <li class="#{ button } #{ button }-ul"><a href="#" data-action="#{ @fondant.type }-ul">Bullets</a></li>
-            <li class="#{ button } #{ button }-indent"><a href="#" data-action="#{ @fondant.type }-indent">Increase Indent</a></li>
-            <li class="#{ button } #{ button }-outdent"><a href="#" data-action="#{ @fondant.type }-outdent">Decrease Indent</a></li>
-          </ul>
-        </ul>
-        """
+        html = """<ul class="#{ @toolbarClass() }">"""
+        for action in @fondant.options.buttons
+          html += """<li class="#{ button } #{ button }-#{ action }">"""
+          html += """<a href="#" data-action="#{ @fondant.type }-#{ action }">#{ action }</a>"""
+          html += """</li>"""
+        html
 
   window.Fondant = Fondant
 
@@ -465,4 +452,10 @@ if typeof $ isnt 'undefined'
   $.fn.fondant.defaults =
     prefix: 'fondant'
     toolbar: true
+    buttons: [
+      'bold', 'italic',
+      'p', 'h1', 'h2', 'h3', 'h4', 'blockquote',
+      'ol', 'ul', 'indent', 'outdent',
+      'remove', 'unlink', 'undo', 'redo'
+    ]
 

data/vendor/assets/stylesheets/fondant.scss

@@ -1,4 +1,4 @@
-// Fondant v0.5.0
+// Fondant v0.6.0
 // see http://github.com/ovenbits-ingredients/fondant for more information
 //
 .fondant-toolbar {
@@ -8,30 +8,21 @@
   padding: 0;
 
   li {
-    display: none;
-  }
-
-  ul {
-    display: inline;
-    margin: 0;
-    padding: 0;
-
-    li {
-      display: inline-block;
+    display: inline-block;
+    margin-right: 3px;
 
-      a {
-        background: #eee;
-        border: 1px solid #ddd;
-        border-radius: 0.3rem;
-        color: #777;
-        padding: 0.2rem 0.4rem;
-        &:hover {
-          background: #e0e0e0;
-          text-decoration: none;
-        }
+    a {
+      background: #eee;
+      border: 1px solid #ddd;
+      border-radius: 0.3rem;
+      color: #777;
+      padding: 0.2rem 0.4rem;
+      &:hover {
+        background: #e0e0e0;
+        text-decoration: none;
       }
-
     }
   }
+
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fondant-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Phillip Ridlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties