smithycms 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b43750cac7e92b7dbfd3cbe13c92d19d9c735652
-  data.tar.gz: 235216f9d7c80ec7a0051e78c363854bdb44f799
+  metadata.gz: aea960c4dd6ccffea1ef830f8ec67efa090ce55f
+  data.tar.gz: 02137e77177da7aa0947d0d31bcbd524674b8afe
 SHA512:
-  metadata.gz: 3a2e4b70ac8acfc05831b6a7152e5374df8ced8a101f5cf7705bda9b23dd3854194e75677d2ad3b355debfee5f584d08cb0aba3b79f314cecd976e13e6aae652
-  data.tar.gz: 9549ad81b5b11e95be39e9c098e7baad82da3388c312027ccd36632857504a50972ea9fd819c720eb8bebbd7dfe2eb0678874570f30552b1fecf68dd91064286
+  metadata.gz: 864d0aa52c3f6795ca2b0c1d3a78b6ca2935aef5f26b9c9030d2968fb9fb6eb25503a719f9b2d0b779eb352d448772dfbbc50a1faef28ff1136b8e379e197b72
+  data.tar.gz: b96c07e8717659637c7d0ab07876f33ca728e8e57b4aea5a1387ef8ff5b098b54fd083aa9f62f340e4a1066544e9ecf1c1cad76a8788392ade1da11d5b70dbf3

data/app/assets/javascripts/smithy/application.js

@@ -18,4 +18,5 @@
 //= require ace-1.1.3/snippets/markdown
 //= require zeroclipboard-2.2.0/ZeroClipboard.min.js
 //= require refile
+//= require smithy/smithy_editor
 //= require_tree .

data/app/assets/javascripts/smithy/editor.coffee

@@ -32,7 +32,9 @@ window.ace_edit = (id, template_type, name) ->
   return editor
 
 create_ace_toolbar = (editor, assets_modal_url, pages_modal_url) ->
-  $toolbar = $("<ul class='nav ace-editor-toolbar'></ul>").insertBefore($(editor.container))
+  $container = $(editor.container)
+  $container.closest('.form-wrapper').find('.ace-editor-toolbar').remove()
+  $toolbar = $("<ul class='nav ace-editor-toolbar'></ul>").insertBefore($container)
   heading_dropdown = $("
     <li class='dropdown'>
       <a class='dropdown-toggle' data-toggle='dropdown' href='javascript:void(0)' role='button' aria-haspopup='true' aria-expanded='false'><i class='fa fa-header'></i><span class='caret'></span></a>
@@ -50,8 +52,8 @@ create_ace_toolbar = (editor, assets_modal_url, pages_modal_url) ->
     $("<a href='javascript:void(0);' data-command='bold'><i class='fa fa-bold'></i></a>"),
     $("<a href='javascript:void(0);' data-command='italic'><i class='fa fa-italic'></i></a>"),
     heading_dropdown,
-    $("<a href='javascript:void(0);'><i class='fa fa-link'></i></a>").click(-> open_link_selector(pages_modal_url, editor))
-    $("<a href='javascript:void(0);'>Image</a>").click(-> open_asset_selector(assets_modal_url, editor))
+    $("<a href='javascript:void(0);'><i class='fa fa-link'></i></a>").on('click', -> open_link_selector(pages_modal_url, editor))
+    $("<a href='javascript:void(0);'>Image</a>").on('click', -> open_asset_selector(assets_modal_url, editor))
   ]
   for $action in actions
     $toolbar.append($action)
@@ -59,7 +61,7 @@ create_ace_toolbar = (editor, assets_modal_url, pages_modal_url) ->
     $toolbar.find('ul').append($action)
   $toolbar.find('a').each ->
     if $(this).attr('data-command')
-      $(this).click(-> edit_selection(editor, $(this).attr('data-command')))
+      $(this).on('click', -> edit_selection(editor, $(this).attr('data-command')))
   $toolbar.find('> a, ul > a').wrap("<li></li>")
 
 open_asset_selector = (url, editor) ->
@@ -149,6 +151,4 @@ edit_selection = (editor, command) ->
   editor.focus()
 
 $ ->
-  $('.ace_editor').each ->
-    return unless $(this).data('id') && $(this).data('type') && $(this).data('name')
-    ace_edit($(this).data('id'), $(this).data('type'), $(this).data('name'))
+  $('.ace_editor').smithy_editor()

data/app/assets/javascripts/smithy/nested_forms.js

@@ -35,6 +35,9 @@ $(function() {
     content     = content.replace(regexp, new_id)
 
     $(this).parent().append(content);
+    $(content).find('[data-init]').each(function() {
+      eval($(this).data('init'));
+    });
     return false;
   });
 
@@ -46,7 +49,7 @@ $(function() {
   });
 
   // replace the remover checkboxes with a link
-  $('form .destroy > label').hide();
+  $('form .destroy label').hide();
   $('form .destroy').each(function(i) {
     link = $('<a href="javascript:void(0);" class="btn btn-danger btn-mini">Delete</a>').addClass("remove_nested_fields");
     $(this).append($(link));

data/app/assets/javascripts/smithy/smithy_editor.coffee

@@ -0,0 +1,7 @@
+do($ = window.jQuery, window) ->
+  $.fn.extend smithy_editor: (option) ->
+    @each ->
+      $this = $(this)
+      [id, type, name] = [$this.data('id'), $this.data('type'), $this.data('name')]
+      return unless id && type && name
+      ace_edit id, type, name

data/app/inputs/markdown_input.rb

@@ -4,7 +4,7 @@ class MarkdownInput < FormtasticBootstrap::Inputs::TextInput
     self.options[:hint] = markdown_hint if self.options[:hint].blank?
     bootstrap_wrapping do
       builder.text_area(method, form_control_input_html_options) +
-      builder.template.content_tag(:div, nil, id: editor_id, class: 'ace_editor', data: { id: id, type: :markdown, name: dom_id, assets_url: builder.template.selector_modal_assets_path, pages_url: builder.template.selector_modal_pages_path }) +
+      builder.template.content_tag(:div, nil, id: editor_id, class: 'ace_editor', data: { id: id, type: :markdown, name: dom_id, init: "$('##{editor_id}').smithy_editor()".html_safe, assets_url: builder.template.selector_modal_assets_path, pages_url: builder.template.selector_modal_pages_path }) +
       builder.template.content_tag(:div, nil, id: 'content-guide')
     end
   end

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smithycms
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Tim Glen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -680,6 +680,7 @@ files:
 - app/assets/javascripts/smithy/page_contents.js
 - app/assets/javascripts/smithy/pages.js
 - app/assets/javascripts/smithy/settings.js
+- app/assets/javascripts/smithy/smithy_editor.coffee
 - app/assets/stylesheets/smithy/application.scss
 - app/assets/stylesheets/smithy/assets.scss
 - app/assets/stylesheets/smithy/bootstrap_and_overrides.scss