biola_wcms_components 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c82326b380970c1a80631ce72419d408227e99dc
-  data.tar.gz: 894787fdf7fa002d9ec9cf3e73550fae3c689296
+  metadata.gz: fd07286ef38a9251dce1dccc510abd28694994b6
+  data.tar.gz: 802427f5cfde791f02c9d1173d42b85a7ff76c10
 SHA512:
-  metadata.gz: 8de87002a96563e9b0b5f3248725ef8e64e22bc19636035cba9b1c71fe5128af65c990ca7edfdd05f50967b19e0c519e26e9fce2b495f11e219a328e86cd7cb9
-  data.tar.gz: fee00a03b99e5f506332f88af9d6caf1112276fbd9794a2efbfed15588c934e9660f879450f0f08225062dd4aa33bc0e5bee28ef2d6ba0ecf38a3fdf742d12c0
+  metadata.gz: 835ecf1613b5e2c8fcfb840b10fa4e26e78e86510c573809663a8be2c535da159b1f0e6265d3d7a5c4bd3985a3cc46c81e93f2933dceb4a36e4c0629eda4779f
+  data.tar.gz: 7a7dbb25f52078c1b4bb10859f20740ce02432ad4f6087c91ee5cb7c36da0bbb8f189b84b3e8d73cc99ad45a3982c1ae0a78db7b82fca9ed517332a4821c4b3c

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### Master (unreleased)
 
+### 0.24.0
+
+* Adding generic code_editor component.
+
 ### 0.23.0
 
 * Removing options to customize redactor toolbar. Not it shows all buttons by default and lets you add anything but script and style tags.

data/app/assets/javascripts/components/forms/{css_editor.js.coffee → code_editor.js.coffee}

@@ -1,11 +1,12 @@
 $(document).ready ->
-  $('.ace_css_editor').each ->
+  $('.ace_code_editor').each ->
     editor_area = document.createElement('div')
     this.appendChild(editor_area)
+    mode = "ace/mode/" + this.dataset.mode
 
     # Initialize Ace Editor
     editor = ace.edit(editor_area)
-    editor.getSession().setMode("ace/mode/css")
+    editor.getSession().setMode(mode)
     editor.getSession().setTabSize(2)
     editor.getSession().setUseWrapMode(true);
     editor.setPrintMarginColumn(800)

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

@@ -0,0 +1,22 @@
+/ Example
+/   = wcms_component 'forms/code_editor',
+/     form: f,
+/     mode: 'html',
+/     attribute: :design_javascript,
+/     value: @page_edition.design_javascript
+/
+
+ruby:
+  form ||= nil
+  attribute ||= nil
+  html_class ||= 'form-control'
+  value ||= nil
+  mode ||= 'html'
+  #embedded_image_url ||= wcms_components_embedded_images_url
+
+/ TODO: do we need this? It was being used in the json_editor, but I don't think we
+/ are using it anymore.
+/ = wcms_component("shared/embedded_image_uploader", embedded_image_url: embedded_image_url)
+
+.ace_code_editor data-mode=mode
+  = wcms_component("forms/text_area", {form: form, attribute: attribute, html_class: html_class, value: value})

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

@@ -1,16 +1,3 @@
-/ Example
-/   = wcms_component 'forms/css_editor',
-/     form: f,
-/     attribute: :design_css,
-/     value: @page_edition.design_css
-/
-
-ruby:
-  form ||= nil
-  attribute ||= nil
-  html_class ||= 'form-control'
-  value ||= nil
-  embedded_image_url ||= wcms_components_embedded_images_url
-
-.ace_css_editor
-  = wcms_component("forms/text_area", {form: form, attribute: attribute, html_class: html_class, value: value})
+/ Depricated, use forms/code_editor instead
+- local_assigns[:mode] = 'css'
+= wcms_component("forms/code_editor", local_assigns)

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

@@ -1,16 +1,3 @@
-/ Example
-/   = wcms_component 'forms/javascript_editor',
-/     form: f,
-/     attribute: :design_javascript,
-/     value: @page_edition.design_javascript
-/
-
-ruby:
-  form ||= nil
-  attribute ||= nil
-  html_class ||= 'form-control'
-  value ||= nil
-  embedded_image_url ||= wcms_components_embedded_images_url
-
-.ace_javascript_editor
-  = wcms_component("forms/text_area", {form: form, attribute: attribute, html_class: html_class, value: value})
+/ Depricated, use forms/code_editor instead
+- local_assigns[:mode] = 'javascript'
+= wcms_component("forms/code_editor", local_assigns)

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

@@ -1,12 +1,3 @@
-ruby:
-  form ||= nil
-  attribute ||= nil
-  html_class ||= 'form-control json_editor'
-  value ||= nil
-  embedded_image_url ||= wcms_components_embedded_images_url
-
-
-= wcms_component("shared/embedded_image_uploader", embedded_image_url: embedded_image_url)
-
-.ace_json_editor
-  = wcms_component("forms/text_area", {form: form, attribute: attribute, html_class: html_class, value: value})
+/ Depricated, use forms/code_editor instead
+- local_assigns[:mode] = 'json'
+= wcms_component("forms/code_editor", local_assigns)

data/lib/biola_wcms_components/version.rb

@@ -1,3 +1,3 @@
 module BiolaWcmsComponents
-  VERSION = "0.23.0"
+  VERSION = "0.24.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biola_wcms_components
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Ryan Hall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-rails-ap
@@ -209,10 +209,8 @@ files:
 - Rakefile
 - app/assets/images/.gitkeep
 - app/assets/javascripts/biola-wcms-components.js.coffee
-- app/assets/javascripts/components/forms/css_editor.js.coffee
+- app/assets/javascripts/components/forms/code_editor.js.coffee
 - app/assets/javascripts/components/forms/gallery_photo.js.coffee
-- app/assets/javascripts/components/forms/javascript_editor.js.coffee
-- app/assets/javascripts/components/forms/json_editor.js.coffee
 - app/assets/javascripts/components/forms/multiselect.js.coffee
 - app/assets/javascripts/components/forms/person_lookup.js.coffee
 - app/assets/javascripts/components/forms/presentation_data_editor.js.coffee
@@ -250,6 +248,7 @@ files:
 - app/views/wcms_components/changes/_changes.html.slim
 - app/views/wcms_components/changes/index.html.slim
 - app/views/wcms_components/changes/object_index.html.slim
+- app/views/wcms_components/forms/_code_editor.html.slim
 - app/views/wcms_components/forms/_css_editor.html.slim
 - app/views/wcms_components/forms/_data_template_picker.html.slim
 - app/views/wcms_components/forms/_date.html.slim
@@ -311,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Reusable UX components for use in or WCMS projects

data/app/assets/javascripts/components/forms/javascript_editor.js.coffee

@@ -1,20 +0,0 @@
-$(document).ready ->
-  $('.ace_javascript_editor').each ->
-    editor_area = document.createElement('div')
-    this.appendChild(editor_area)
-
-    # Initialize Ace Editor
-    editor = ace.edit(editor_area)
-    editor.getSession().setMode("ace/mode/javascript")
-    editor.getSession().setTabSize(2)
-    editor.getSession().setUseWrapMode(true);
-    editor.setPrintMarginColumn(800)
-    editor.setOptions({
-      minLines: 8,
-      maxLines: Infinity
-    });
-
-    textarea = $(this).children('textarea').hide()
-    editor.getSession().setValue textarea.val()
-    editor.getSession().on "change", ->
-      textarea.val editor.getSession().getValue()

data/app/assets/javascripts/components/forms/json_editor.js.coffee

@@ -1,20 +0,0 @@
-$(document).ready ->
-  $('.ace_json_editor').each ->
-    editor_area = document.createElement('div')
-    this.appendChild(editor_area)
-
-    # Initialize Ace Editor
-    editor = ace.edit(editor_area)
-    editor.getSession().setMode("ace/mode/json")
-    editor.getSession().setTabSize(2)
-    editor.getSession().setUseWrapMode(true);
-    editor.setPrintMarginColumn(800)
-    editor.setOptions({
-      minLines: 8,
-      maxLines: Infinity
-    });
-
-    textarea = $(this).children('textarea').hide()
-    editor.getSession().setValue textarea.val()
-    editor.getSession().on "change", ->
-      textarea.val editor.getSession().getValue()