tenon 1.0.57 → 1.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa377e208a93cb3c4055726e4426d6c19071b95
-  data.tar.gz: 4a579c1c5d84967166901b55a7f4b99f64e6c7a2
+  metadata.gz: 5e1552d054d34f083ccfc50373dcabadf752fd73
+  data.tar.gz: c4ceadb0f3c8f00d2112dda9f1c8ff621d1fc914
 SHA512:
-  metadata.gz: e40afd867429f2e8022e558b10817730a56371cbb28fa678a86e07bca8c47f7ae474cabdbbbad876bd7868fd8f38a7637ce4c03baa3bc35164b1860bb9cfa9d7
-  data.tar.gz: 18ad631a0e525d60ee8397df3eacf4b5e9c936d85de9d59879a0f69b75d97332b1a49c1d8ce18eac0c9e0215af079df1495f3f86bda7b00ba77ae0492512fc03
+  metadata.gz: ae9c6153301dca657825b2e6dff6442cb481258660d95fb152cfaa79261224db2faf9366dab2d77bd62588d190c9bb5f7653572d9ba8fa3f8c4bf85a2be446f0
+  data.tar.gz: 7f1b2dfaf00b234a737616cee00781664c7a79e346f0849bf564a0503a8c847771420baa21a0e56329cf8eca80eaa2d61f0856f69b89154d9bdb4c01d4ac044e

data/app/assets/javascripts/tenon/features/cocoon_hooks.js.coffee

@@ -0,0 +1,11 @@
+class Tenon.features.CocoonHooks
+  constructor: ->
+    $(document).on('cocoon:after-insert', @afterInsert)
+
+  afterInsert: (e, insertedItem) =>
+    @$insertedItem = $(insertedItem)
+    @_checkTenonContent()
+
+  _checkTenonContent: ->
+    if @$insertedItem.find('.tn-tc')
+      new Tenon.features.tenonContent.Base

data/app/assets/javascripts/tenon/features/modal_windows.js.coffee

@@ -23,10 +23,15 @@ class Tenon.features.ModalWindows
       beforeSend: null
 
   _launchWithTarget: (e) =>
-    if @$link.data('modal-clone')
-      $el = $(@$link.data('modal-target') + ':first').clone()
+    if @$link.data('modal-closest')
+      $parentNode = @$link.closest(@$link.data('modal-closest'))
+      $el = $parentNode.find(@$link.data('modal-target'))
+    else if @$link.data('modal-parent')
+      $el = $(@$link.data('modal-parent')).find(@$link.data('modal-target'))
     else
       $el = $(@$link.data('modal-target'))
+    $el = $el.filter(':first').clone() if @$link.data('modal-clone')
+
     @_openInModal($el)
 
   _openInModal: (el) =>

data/app/assets/javascripts/tenon/features/sortable_nested_fields.js.coffee

@@ -1,9 +1,15 @@
 class Tenon.features.SortableNestedFields
   constructor: ->
     $lists = $('.nested-field-list.sortable')
-    $lists
-      .sortable(update: @_doUpdate)
-      .on('cocoon:after-insert', -> $(this).sortable('refresh'))
+    $.each $lists, (i, list) =>
+      $list = $(list)
+      $list
+        .sortable(
+          update: @_doUpdate
+          cancel: ':input,button,[contenteditable]'
+          handle: $list.data('sortable-handle')
+        )
+        .on('cocoon:after-insert', -> $(this).sortable('refresh'))
 
   _doUpdate: (event, ui) ->
     $list = $(ui.item).closest('ul')

data/app/assets/javascripts/tenon/features/tenon_content/aesthetics.js.coffee

@@ -3,7 +3,7 @@ class Tenon.features.tenonContent.Aesthetics
     @$wrap = @$container.closest('.tn-tc-wrap')
     @$container.imagesLoaded(@_applyAesthetics)
     $(window).on('resize', @_applyAesthetics)
-    $('.tenon-content').on('cocoon:after-insert', @_applyAesthetics)
+    $(document).on('cocoon:after-insert', '.tenon-content', @_applyAesthetics)
     @$container.on('tenon.asset_attached', '.asset-field', @_applyAesthetics)
     @$container.on('tenon.content.column_resized', 'div', @_applyAesthetics)
     @$wrap.on('tenon.content.popped', @_applyAesthetics)

data/app/assets/javascripts/tenon/features/tenon_content/bottombar_toggler.js.coffee

@@ -1,8 +1,8 @@
 class Tenon.features.tenonContent.BottombarToggler
   constructor: (@$container) ->
     @_toggleBottombars()
-    $('.tenon-content').on('cocoon:after-insert', @_toggleBottombars)
-    $('.tenon-content').on('cocoon:after-remove', @_toggleBottombars)
+    $(document).on('cocoon:after-insert', '.tenon-content', @_toggleBottombars)
+    $(document).on('cocoon:after-remove', '.tenon-content', @_toggleBottombars)
 
   _toggleBottombars: =>
     # Hide them all

data/app/assets/javascripts/tenon/features/tenon_content/editor.js.coffee

@@ -1,7 +1,7 @@
 class Tenon.features.tenonContent.Editor
   constructor: ->
-    $('.tenon-content').on('cocoon:after-insert', @_rowInserted)
-    $('.tenon-content').on('cocoon:after-remove', @_rowRemoved)
+    $(document).on('cocoon:after-insert', '.tenon-content', @_rowInserted)
+    $(document).on('cocoon:after-remove', '.tenon-content', @_rowRemoved)
     $(document).on('input keypress paste change', '.editable-text', @_contentUpdated)
     for div in $('.tn-tc')
       @_updateButtons($(div))

data/app/assets/javascripts/tenon/features/tenon_content/library.js.coffee

@@ -12,16 +12,28 @@ class Tenon.features.tenonContent.Library
   _closeModal: => @$template.modal('hide')
 
   _setContext: =>
-    if @$link.hasClass('above') || @$link.hasClass('below')
-      @_setToInsertRelative(@$link)
+    if @$link.hasClass('initial-row')
+      @_setToInsertInitialRow()
+    else if @$link.hasClass('above') || @$link.hasClass('below')
+      @_setToInsertRelative()
     else
-      @_setToInsertByData(@$link)
+      @_setToInsertByData()
 
-  _setToInsertByData: (@$link) =>
-    for data in ['association-insertion-node', 'association-insertion-method']
+  _setToInsertInitialRow: =>
+    node = @$link.closest('.tn-tc').find('.tenon-content')
+    $('.tenon-library a').data('association-insertion-node', node)
+    $('.tenon-library a').data('association-insertion-method', 'prepend')
+
+  _setToInsertByData: =>
+    datas = [
+      'association-insertion-node',
+      'association-insertion-method',
+      'association-insertion-traversal'
+    ]
+    for data in datas
       $('.tenon-library a').data(data, @$link.data(data))
 
-  _setToInsertRelative: (@$link) =>
+  _setToInsertRelative: =>
     method = if @$link.hasClass('below') then 'after' else 'before'
     $('.tenon-library a').data('association-insertion-node', @$link.closest('.tn-tc-row'))
     $('.tenon-library a').data('association-insertion-method', method)

data/app/assets/javascripts/tenon/tenon.js

@@ -35,6 +35,7 @@ var Tenon = {
     new Tenon.features.Flash();
     new Tenon.features.AssetCropping();
     new Tenon.features.AssetDetachment();
+    new Tenon.features.CocoonHooks();
     new Tenon.features.FocusFirstField();
     new Tenon.features.MainMenu();
     new Tenon.features.Pagination();

data/app/controllers/tenon/resources_controller.rb

@@ -8,6 +8,7 @@ module Tenon
     end
 
     def index
+      authorize!(:index, klass)
       params[:page] = 1 if params[:page].to_i == 0
       respond_to do |format|
         format.html

data/app/views/tenon/tenon_content/_fields.html.haml

@@ -15,7 +15,7 @@
       = fa_icon('eye')
       %span Edit in Preview Mode
 
-    = link_to '#', class: 'tn-tc-add-content btn btn-primary', 'data-modal-target' => ".#{field} .tenon-library", 'data-modal-clone' => 'true', 'data-modal-title' => 'Add Content', 'data-association-insertion-node' => "##{field}-tenon-content", 'data-association-insertion-method' => 'prepend', 'data-modal-handler' => 'Tenon.features.tenonContent.Library' do
+    = link_to '#', class: 'tn-tc-add-content btn btn-primary initial-row', data: { modal_target: ".tenon-library", modal_closest: '.tn-tc', modal_clone: 'true', modal_title: 'Add Content', modal_handler: 'Tenon.features.tenonContent.Library' } do
       = fa_icon('plus-circle')
       %span Add Content
 
@@ -26,7 +26,7 @@
         Use preview mode to see how your content will look on different devices.  You can still make edits when you're in preview mode, but the toolbars are hidden to give you a better picture of how your content will be laid out.
       = tenon_content_sizes
       = link_to 'Done', '#', class: 'tn-tc-pop-out-close btn btn-comp'
-    .tenon-content{id: "#{field}-tenon-content"}
+    .tenon-content
       = f.fields_for "#{field}_tenon_content_rows" do |row|
         - if row.object
           = render "tenon/tenon_content/row", f: row, row_partial: row.object.decorate.form_partial, field: field, title: row.object.row_type.titleize

data/app/views/tenon/tenon_content/_row.html.haml

@@ -4,7 +4,7 @@
     .actions
       %i.fa.fa-arrows.drag-anchor
 
-      = link_to '#', class: 'tn-tc-open-library above', 'data-modal-target' => ".#{field} .tenon-library", 'data-modal-title' => "Insert Content", 'data-modal-handler' => 'Tenon.features.tenonContent.Library', 'data-modal-clone' => 'true', 'data-tooltip' => '', title: 'Insert Content' do
+      = link_to '#', class: 'tn-tc-open-library above', data: { modal_target: ".tenon-library", modal_closest: '.tn-tc', modal_title: "Insert Content", modal_handler: 'Tenon.features.tenonContent.Library', modal_clone: 'true', tooltip: '' }, title: 'Insert Content' do
         = fa_icon('plus-circle')
 
       = link_to_remove_association(fa_icon('trash-o'), f, {'data-confirm' => 'Are you sure?', 'data-wrapper-class' => 'tn-tc-row'})
@@ -15,5 +15,5 @@
 
   .tn-tc-bottombar
     .actions
-      = link_to '#', class: 'tn-tc-open-library below', 'data-modal-target' => ".#{field} .tenon-library", 'data-modal-title' => "Insert Content", 'data-modal-handler' => 'Tenon.features.tenonContent.Library', 'data-modal-clone' => 'true', 'data-tooltip' => '', title: 'Insert Content' do
+      = link_to '#', class: 'tn-tc-open-library below', data: { modal_target: ".tenon-library", modal_closest: '.tn-tc', modal_title: "Insert Content", modal_handler: 'Tenon.features.tenonContent.Library', modal_clone: 'true', modal_closest: '.tn-tc', tooltip: ''}, title: 'Insert Content' do
         = fa_icon('plus-circle')

data/config/initializers/tenon.rb

@@ -49,6 +49,9 @@ Tenon.configure do |config|
   config.after_update_path = :edit
   config.after_create_path = :edit
 
+  # Change the default root path for Tenon's back-end
+  # config.routing.root = 'index#index'
+
   # Set up languages for front-end internationalization
   # Currently Tenon is anglo-centric so you don't need to
   # specify English.

data/config/routes.rb

@@ -50,6 +50,6 @@ Tenon::Engine.routes.draw do
     get 'approve', :on => :member
   end
 
-  root :to => 'index#index'
+  root :to => Tenon.config.routing.root
 end
 

data/lib/tenon/config/routing.rb

@@ -0,0 +1,25 @@
+# File: lib/tenon/videos.rb
+# Adds configuration options for videos
+# eg.
+#
+# Tenon.configure do |config|
+#   config.events.display = :calendar
+# end
+
+module Tenon
+  class Configuration
+    attr_accessor :routing
+
+    def routing
+      @routing ||= RoutingConfiguration.new
+    end
+
+    class RoutingConfiguration
+      attr_accessor :root
+
+      def initialize
+        @root = 'index#index'
+      end
+    end
+  end
+end

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.57'
+  VERSION = '1.0.59'
 end

data/lib/tenon.rb

@@ -1,6 +1,7 @@
 require 'tenon/engine'
 require 'tenon/config/breakpoints.rb'
 require 'tenon/config/events.rb'
+require 'tenon/config/routing.rb'
 require 'tenon/config/grid.rb'
 require 'tenon/can_be_foreign.rb'
 require 'tenon/can_have_comments.rb'
@@ -25,6 +26,7 @@ module Tenon
 
   class Configuration
     attr_accessor :mobile_layout, :languages, :seo_callout, :front_end,
-                  :after_create_path, :after_update_path, :client_color, :primary_color
+                  :after_create_path, :after_update_path, :client_color,
+                  :primary_color
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.57
+  version: 1.0.59
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -949,6 +949,7 @@ files:
 - app/assets/javascripts/tenon/features/asset_list_post_crop_handler.js.coffee
 - app/assets/javascripts/tenon/features/asset_uploader.js.coffee
 - app/assets/javascripts/tenon/features/box_toggles.js.coffee
+- app/assets/javascripts/tenon/features/cocoon_hooks.js.coffee
 - app/assets/javascripts/tenon/features/date_time_picker.js.coffee
 - app/assets/javascripts/tenon/features/file_select_widget.js.erb
 - app/assets/javascripts/tenon/features/flash.js.coffee
@@ -1382,6 +1383,7 @@ files:
 - lib/tenon/config/breakpoints.rb
 - lib/tenon/config/events.rb
 - lib/tenon/config/grid.rb
+- lib/tenon/config/routing.rb
 - lib/tenon/engine.rb
 - lib/tenon/factories/assets.rb
 - lib/tenon/factories/comments.rb
@@ -1515,7 +1517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.