tenon 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dfb548908695c38e60f7abe4b367fc01dfd23ad
-  data.tar.gz: 3b459fbfb37b249878e3eb640873d90526f8eb49
+  metadata.gz: 369fe222b4d39f614783304c9fd028c9904725cf
+  data.tar.gz: 9f19f960370d70a89fee8416e981c1174e90b11d
 SHA512:
-  metadata.gz: 6ff4f71707443668d98d351e48ff8b67c87e43487f28ed6de5be21e0a74e1d5551297abcbe5a49eb26a46e0c15acc9ee17bc791cbc6967b2005615f65a6880b9
-  data.tar.gz: 428b4ddb9985664ef8802f824eca53c20c622dbc3a65c557985046e8b97894fe345f30eb53c80e31b76b68732ff62fed409e6efd48be7bc917db5bc1a72e7acc
+  metadata.gz: 706543fb1b96546c2e7a1c3ad728cce2fa166e997830e8c1f9b559dd053ca9af7c56e97f6f2431707e2471003278b9ed4761bd2a7bf03736a42e5820fe1557af
+  data.tar.gz: 92683d22c2b17aa0daeff1482eb11d9e0d714d63740c972861d32563a7b7b84af22ada7a3d3fb1a52396700a6295681d79138f763c59970538ab476be14e25f7

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

@@ -1,5 +1,5 @@
-class Tenon.features.tenonContent.AssetLink extends Tenon.features.tenonContent.AssetAttachment
+class Tenon.features.tenonContent.ImageAssetLink extends Tenon.features.tenonContent.AssetAttachment
   _setFields: ($li) =>
     $input = @$browseButton.closest('div').find('input')
     $input[0].value = $li.data('style-urls')['original']
-    Tenon.mediumEditor.createLink($input[0])
+    Tenon.activeImageControlsLinkForm.saveForm()

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

@@ -11,4 +11,5 @@ class Tenon.features.tenonContent.Base
     new Tenon.features.tenonContent.LibraryFilter($container)
     new Tenon.features.tenonContent.PopOut($container)
     new Tenon.features.tenonContent.Sortable($container)
-    new Tenon.features.tenonContent.WrappedSizing($container)
+    new Tenon.features.tenonContent.WrappedSizing($container)
+    new Tenon.features.tenonContent.ImageLinks($container)

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

@@ -0,0 +1,5 @@
+class Tenon.features.tenonContent.AssetLink extends Tenon.features.tenonContent.AssetAttachment
+  _setFields: ($li) =>
+    $input = @$browseButton.closest('div').find('input')
+    $input[0].value = $li.data('style-urls')['original']
+    Tenon.mediumEditor.createLink($input[0])

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

@@ -8,26 +8,33 @@ class Tenon.features.tenonContent.ImageControls
     @_buildControls(e)
     e.stopImmediatePropagation()
 
+  showControls: (x, y) =>
+    x ||= @previousX
+    y ||= @previousY
+    @$controls.appendTo('body').css
+      left: @_leftOffset(x)
+      top: y + 'px'
+      display: 'block'
+
+    @previousX = x
+    @previousY = y
+
   hideControls: =>
     $('body > .image-controls').hide()
     $('.tooltip').remove()
 
   _removeControls: =>
     $('body > .image-controls').remove()
+    delete Tenon.activeImageControls
 
   _buildControls: (e) =>
     @_removeControls()
+    Tenon.activeImageControls = this
     $img = $(e.currentTarget)
     @$image = $img.closest('.image')
     @$controls = @$image.find('.image-controls').clone()
     @_tagControls()
-    @_showControls(e.pageX, e.pageY)
-
-  _showControls: (left, top) =>
-    @$controls.appendTo('body').css
-      left: @_leftOffset(left)
-      top: top + 'px'
-      display: 'block'
+    @showControls(e.pageX, e.pageY)
 
   _tagControls: =>
     # Add some data for use in operations

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

@@ -0,0 +1,52 @@
+class Tenon.features.tenonContent.ImageLinks
+  constructor: (@$container) ->
+    $(document).on('click', '.column-image .add-link, .wrapped-image .add-link', @buildLinkForm)
+
+  buildLinkForm: (e) =>
+    @$button = $(e.currentTarget)
+    @$image = @_getImage(e)
+    @$form = @$image.find('.link-form')
+    @$visibleForm = @$form.clone()
+    @_showLinkForm()
+    @_bindLinkForm()
+    Tenon.activeImageControlsLinkForm = this
+
+  saveForm: =>
+    @$form.replaceWith(@$visibleForm)
+    @_setButtonActiveState()
+    Tenon.activeImageControls.showControls()
+
+  _showLinkForm: (e) =>
+    Tenon.activeImageControls.hideControls()
+    @$visibleForm.appendTo('body').css
+      left: @_leftOffset(Tenon.activeImageControls.previousX)
+      top: Tenon.activeImageControls.previousY - 75
+      display: 'block'
+
+  _getImage: (e) =>
+    $(e.currentTarget)
+      .closest('.image-controls')
+      .data('image')
+
+  _leftOffset: (left) =>
+    if $(window).width() < 641
+      (($(window).width() - @$visibleForm.width()) / 2) + 'px'
+    else
+      left - (@$visibleForm.width() / 2) + 'px'
+
+  _bindLinkForm: =>
+    @$visibleForm.on('keyup', 'input', @_formFilled)
+    @$visibleForm.on('click', '.medium-editor-cancel', @_cancel)
+
+  _formFilled: (e) =>
+    @saveForm() if e.keyCode == 13
+
+  _cancel: (e) => @$visibleForm.remove()
+
+  _setButtonActiveState: (e) =>
+    if @$visibleForm.find('input').val() != ''
+      @$button.addClass('medium-editor-button-active')
+      @$image.find('.add-link').addClass('medium-editor-button-active')
+    else
+      @$button.removeClass('medium-editor-button-active')
+      @$image.find('.add-link').removeClass('medium-editor-button-active')

data/app/assets/stylesheets/tenon/ui/tenon-content.css.scss

@@ -241,6 +241,10 @@
     outline: none;
     background: lighten($tn-primary, 10%);
   }
+
+  .link-form {
+    z-index: $tn-z-medium-editor-controls;
+  }
 }
 
 [contenteditable=true]:empty:not(:focus):before {

data/app/assets/stylesheets/tenon/z-indexes.css.scss

@@ -15,6 +15,12 @@ $tn-z-content-popped-backdrop: 1020;
 $tn-z-content-popped: 1029;
 $tn-z-tc-sizer: 1029;
 
+// medium
+// MEDIUM DOES NOT ACTUALLY USE THIS VARIABLE
+// THIS IS JUST HERE SO YOU CAN INDEX THINGS RELATIVE TO MEDIUM
+$tn-z-medium-editor-controls: 2000;
+
+
 // modals
 $tn-z-modal-backdrop: 2030;
 $tn-z-asset-cropping: 2040;

data/app/helpers/tenon/asset_helper.rb

@@ -6,7 +6,15 @@ module Tenon
       else
         i = image_tag(default_asset_thumbnail(asset))
       end
-      link_to(i, [:edit, asset], default_options)
+      asset_icon_link(asset, i)
+    end
+
+    def asset_icon_link(asset, icon)
+      if asset.is_image?
+        link_to(icon, [:crop, asset], crop_options(asset))
+      else
+        link_to(icon, asset.attachment.url, target: '_')
+      end
     end
 
     def default_asset_thumbnail(asset)
@@ -19,6 +27,16 @@ module Tenon
 
     private
 
+    def crop_options(asset)
+      {
+        class: 'asset-crop',
+        data: {
+          'asset-id' => asset.id,
+          'post-crop-handler' => 'Tenon.features.AssetListPostCropHandler'
+        }
+      }
+    end
+
     def default_options
       {
         'data-modal-remote' => true,

data/app/views/tenon/tenon_content/piece_types/display/_image.html.haml

@@ -1,5 +1,8 @@
 .tn-tc-image
-  = image_tag(piece.image.url(:_medium))
+  - if piece.link_url.blank?
+    = image_tag(piece.image.url(:_medium))
+  - else
+    = link_to image_tag(piece.image.url(:_medium)), piece.link_url, target: '_'
 - if piece.show_caption
   .tn-tc-caption
     = piece.caption

data/app/views/tenon/tenon_content/piece_types/form/_image.html.haml

@@ -11,6 +11,12 @@
   = f.super_text_area :caption, class: 'caption', placeholder: 'Enter caption here...', style: ("display: none;" unless f.object.show_caption)
   = f.hidden_field :show_caption
 
+  .medium-editor-toolbar-form-anchor.link-form{style: 'position: absolute; z-index: 2000;'}
+    = f.super_text_field :link_url, placeholder: 'Paste or type a link', style: 'display; inline; width: 316px;';
+    = link_to new_item_asset_path(hide_upload: true), 'title' => 'Link to an Asset', 'data-modal-remote' => 'true', 'data-modal-handler' => 'Tenon.features.tenonContent.ImageAssetLink', 'data-modal-title' => 'Link to Asset', 'data-tooltip' => true do
+      %i.fa.fa-file-pdf-o
+    = link_to '×'.html_safe, '#', class: 'medium-editor-cancel'
+
   .medium-editor-toolbar.medium-toolbar-arrow-under.medium-editor-toolbar-active.image-controls{style: "display: none; margin-top: -65px;"}
     %ul.medium-editor-toolbar-actions.clearfix
       %li
@@ -30,6 +36,10 @@
         %button{title: 'Swap Sides', class: 'swap-sides medium-editor-action', data: {tooltip: true}}
           %i.fa.fa-arrows-h
 
+      %li
+        %button.add-link.medium-editor-action{title: 'Add Link', class: ('medium-editor-button-active' unless f.object.link_url.blank?), data: {tooltip: true}}
+          %i.fa.fa-link
+
       %li
         %button{href: new_item_asset_path, title: 'Replace Image', class: 'replace-image medium-editor-action  medium-editor-button-last', data: {'modal-remote' => 'true', 'modal-title' => "Select Image", 'modal-handler' => 'Tenon.features.tenonContent.AssetAttachment', 'tooltip' => true}}
           %i.fa.fa-picture-o

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -960,7 +960,9 @@ files:
 - app/assets/javascripts/tenon/features/tenon_content/column_swap.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/editor.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/embedded_content_modal_handler.js.coffee
+- app/assets/javascripts/tenon/features/tenon_content/image_asset_link.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/image_controls.js.coffee
+- app/assets/javascripts/tenon/features/tenon_content/image_links.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/library.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/library_filter.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/pop_out.js.coffee