fondant-rails 0.4.1 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2a39ead5479b83675473610ba5635bd724d08e0a
+  data.tar.gz: 973cc6c77bcb5e597d4b7a97491a6175200d59f6
+SHA512:
+  metadata.gz: 2911a15462910db37b90fec3e08785e9931765dd51ef21d31680e1af55214959ea15d239a6acfe1b819398f84201ed4ca3d6aae5cc885f157fd2b50e76541113
+  data.tar.gz: 3ecc5882927c38b77ae12292d5da659851abd8d039a943153b683e252a72ad980a164674a470a4c692fecc6c04466b91b1d5cc28ee1be40afff52f51d9e40b9e

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.4.1'
+    gem 'fondant-rails', '~> 0.5.0'
 
 ## Contributing
 

data/lib/fondant-rails/version.rb

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

data/vendor/assets/javascripts/fondant.coffee

@@ -1,4 +1,4 @@
-# ## Fondant v0.4.1
+# ## Fondant v0.5.0
 #
 # The icing on the cake for user input. A simple jQuery HTML5 WYSIWYG editor
 # using `contenteditable`.
@@ -32,15 +32,17 @@
 # * `prefix` - prefix for all css classes and ids added to elements
 #   generated by Fondant (default: `fondant`)
 #
-# * `toolbar` - If set to `true`, Fondant will generate a toolbar. Otherwise you are responsible for
-#   hooking up all your toolbar buttons to call `$('selector').fondant('bold')`, etc.
+# * `toolbar` - If set to `true`, Fondant will generate a toolbar. If set to a function, Fondant
+#   will use the return value of the function for the toolbar markup. If set to a string, Fondant
+#   will use the string contents for the toolbar markup. If set to `false`, Fondant will not insert
+#   a toolbar and you are responsible for building and wiring up your own.
 #   (default: `true`)
 #
 
 
 $ = jQuery
 
-$ ->
+if typeof $ isnt 'undefined'
 
   # ## Class Definition
   #
@@ -104,7 +106,13 @@ $ ->
     # Add the formatting toolbar and bind the editor functions
     #
     insertToolbar: ->
-      @$element.prepend(@templates.toolbar()) if @options.toolbar
+      if @options.toolbar
+        if typeof @options.toolbar is 'boolean'
+          @$element.prepend(@templates.toolbar())
+        else if typeof @options.toolbar is "string"
+          @$element.prepend(@options.toolbar)
+        else if typeof @options.toolbar is "function"
+          @$element.prepend(@options.toolbar.call(@templates))
 
     # ### bindToolbar()
     #
@@ -348,7 +356,7 @@ $ ->
     #
     # * `link( url )`
     # * `unlink()`
-    link:   (url) -> @applyFormat 'link', url
+    link:   (url) -> @applyFormat 'createLink', url
     unlink:       -> @applyFormat 'unlink'
 
     # ## HTML Templates
@@ -417,6 +425,7 @@ $ ->
         </ul>
         """
 
+  window.Fondant = Fondant
 
   # ## Plugin Setup
   #

data/vendor/assets/stylesheets/fondant.scss

@@ -1,4 +1,4 @@
-// Fondant v0.4.1
+// Fondant v0.5.0
 // see http://github.com/ovenbits-ingredients/fondant for more information
 //
 .fondant-toolbar {

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: fondant-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Phillip Ridlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,26 +58,25 @@ files:
 - vendor/assets/stylesheets/fondant.scss
 homepage: https://github.com/ovenbits-ingredients/fondant-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use fondant in Rails' asset pipeline
 test_files: []