biola_wcms_components 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5424902484c065aa03fe39d2363344f0a8d05258
-  data.tar.gz: 4a137308bc3a79c1ca7c16320f4bf0cd81c30025
+  metadata.gz: 31e37c8293b1910400c4c1e4daee6161404a67cc
+  data.tar.gz: d617616b942e10b9731f1fd2257e4edaf6cea8fd
 SHA512:
-  metadata.gz: 81b4dc6a24ecc65faaebe81afd3e19694b0bdfafcf07bf35b139eda219612aebd92f0f1dee82cce273003845d275d9c9c02b627897964514432247e2447f2726
-  data.tar.gz: 5302a97c5a4bcc4465267dcbe6de7a5b198d27ce8cd7784a7a2913c464d1a1e89dca76f2b9d08bf4cb0128712f03257b084839308165974e56ecbe33a743f14e
+  metadata.gz: eb68ef14a59d7658093071782b1f9961feea9a6b165c32e0515ebbb63f218f727d41a813b714b0f2f69b9328a248a62d949789e6de48e71c34a4f4e2a8b353bf
+  data.tar.gz: 88e5349dfe2ea7371a43470e1bfc5366b4efea4a9cec71cdcb9b89d47eb92ec4a19a8419cf8cb5404073f5cdb2e8654a6f224650f3d56bddc416a6cdb991beab

data/app/assets/javascripts/configuration/setup_redactor.js.coffee

@@ -2,7 +2,7 @@ setupRedactor = (obj) ->
   # Default Options
   options =
     minHeight: 200
-    allowedTags: ['p', 'br']
+    allowedTags: ['p', 'br', 'span']
     buttons: []
     plugins: []
     toolbarFixed: false
@@ -14,6 +14,9 @@ setupRedactor = (obj) ->
   # Add any custom data attributes to the default options
   if obj.data('linkable')  # in case you want to support links without explicitly giving a link button.
     options.allowedTags = $.merge(options.allowedTags, ['a'])
+  if obj.data('allow-divs')
+    options.allowedTags = $.merge(options.allowedTags, ['div'])
+    options.replaceDivs = false
   if data = obj.data('buttons')
     buttons = data.split(' ')
     options.buttons = $.merge(options.buttons, buttons)

data/app/views/wcms_components/forms/_redactor_editor.html.slim

@@ -13,6 +13,7 @@ ruby:
   add_class ||= ""   # string of additional classes that get appended to class
   input_class ||= "form-control redactor #{add_class}"
   value ||= nil     # only used if form is nil
+  allow_divs ||= nil
 
   # Configure buttons
   buttons ||= BiolaWcmsComponents.config.default_redactor_buttons
@@ -33,6 +34,6 @@ ruby:
 = wcms_component "shared/embedded_image_uploader"
 
 - if form
-  = form.text_area attribute, class: input_class, 'data-buttons' => buttons, 'data-formatting' => formatting
+  = form.text_area attribute, class: input_class, 'data-buttons' => buttons, 'data-formatting' => formatting, 'data-allow-divs' => allow_divs
 - else
-  = text_area_tag attribute, value, class: input_class, 'data-buttons' => buttons, 'data-formatting' => formatting
+  = text_area_tag attribute, value, class: input_class, 'data-buttons' => buttons, 'data-formatting' => formatting, 'data-allow-divs' => allow_divs

data/lib/biola_wcms_components/version.rb

@@ -1,3 +1,3 @@
 module BiolaWcmsComponents
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biola_wcms_components
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Ryan Hall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-rails-ap