tenon 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26fe2e2693358e70f326dc57a7dbd7dfdd3cb226
-  data.tar.gz: 2327627cafbf3bb52a11d5e6b15ec4f22389e41c
+  metadata.gz: c3848f32e34e0f1e0460ade450a9efd9aa35d13a
+  data.tar.gz: 2f2ee2e3c2d31c33116a4bde4cea1be713c708fd
 SHA512:
-  metadata.gz: e29b905edcca21eea4fc5c67e44ad2130440817ebaebea716c2e9d34d70173e41f7f8939a8315c60bc16cd7963e5882a24b31b203ccfd203a2f0bb6a505fb22b
-  data.tar.gz: 745254829fe6c1fac1fbc26774889813a421b8506caaf7404dced70001d897cf262ff07849b6af43ff4b6b26765d95ef4558bc3795f71c1afde019f6d100623d
+  metadata.gz: f33bc073e606b9e340bd17c756717690a45ab36fe9f71e0e3023a1f203108be2cceb2057cc39b9e30b3f7dfcaab906a6f5e31499ac080fc45905933f92c281cc
+  data.tar.gz: 44be645d288dc1d361b32017133844d056526f2f6670bb666b193196eff81e9db0d9e6f49fecac45c45a5c675552f7c48ea1bbbe2c1228a77c21972cbe45eeed

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

@@ -9,7 +9,7 @@ class Tenon.features.RecordListUpdater
     $el = $(e.currentTarget)
     @clearQuery = $el.attr('data-clear-record-list-params')
     if $el.prop("tagName").toLowerCase() == 'form'
-      @_updateWithQuery(@_processFormData($el), 'Search')
+      @_updateWithQuery(@_processFormData($el), 'Search', $el)
     else
       @_updateWithQuery(URI($el.attr('href')).query(true), $el.textContent)
 
@@ -20,8 +20,8 @@ class Tenon.features.RecordListUpdater
         formData[@.name] = "0"
     formData
 
-  _updateWithQuery: (query, title) =>
-    query = if @clearQuery then query else @_mergedQuery(query)
+  _updateWithQuery: (query, title, form = null) =>
+    query = if @clearQuery then query else @_mergedQuery(query, form)
     state = if $.isEmptyObject(query) then "?" else "?#{query.toString()}"
     history.pushState({recordListUpdate: true}, title, state)
     Tenon.refreshed = false
@@ -31,9 +31,19 @@ class Tenon.features.RecordListUpdater
   # the link or form is adding.  This allows us to, for example, submit
   # an advanced search form and then change the sort order with a link.
   # Add data-clear-record-list-params to prevent this merge.
-  _mergedQuery: (newQueryObj) =>
+  _mergedQuery: (newQueryObj, form = null) =>
     oldQueryObj = URI(location.href).query(true)
-    $.param($.extend(oldQueryObj, newQueryObj))
+    mergedQuery = $.extend(oldQueryObj, newQueryObj)
+    mergedQuery = @_removeEmptyMultiSelects(mergedQuery, form) if form
+    $.param(mergedQuery)
+
+  # multi-selects are handled as arrays, which causes problems with merging if
+  # you have unselected items
+  _removeEmptyMultiSelects: (query, form) =>
+    form.find("select[multiple='multiple']").each ->
+      if (@.selectedOptions.length == 0)
+        delete query[@.name]
+    query
 
   popUpdate: (e) =>
     # Chrome triggers window.onpopstate on page load, so elsewhere

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

@@ -6,6 +6,7 @@ class Tenon.features.tenonContent.Base
     new Tenon.features.tenonContent.CaptionToggler($container)
     new Tenon.features.tenonContent.ColumnSizing($container)
     new Tenon.features.tenonContent.ColumnSwap($container)
+    new Tenon.features.tenonContent.StretchToFill($container)
     new Tenon.features.tenonContent.Editor($container)
     new Tenon.features.tenonContent.ImageControls($container)
     new Tenon.features.tenonContent.LibraryFilter($container)

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

@@ -0,0 +1,50 @@
+class Tenon.features.tenonContent.StretchToFill
+  constructor: (@$container) ->
+    $(document).on('click', '.medium-editor-action.stretch-to-fill', @stretchImage)
+
+  stretchImage: (e) =>
+    e.preventDefault()
+    @$button = $(e.currentTarget)
+    @$piece = @_getPiece()
+    @$image = @_getImage()
+    @_setState()
+
+  _setState: () =>
+    if @$image.hasClass('stretch')
+      @state = false
+    else
+      @state = true
+    @_saveState()
+
+  _saveState: () =>
+    @_setFormFieldState()
+    @_setImageState()
+    @_setButtonActiveState()
+
+  _setFormFieldState: () =>
+    @$piece.find('input[name$="[stretch_to_fill]"]').val(@state)
+
+  _setImageState: () =>
+    if @state == true
+      @$image.addClass('stretch')
+    else
+      @$image.removeClass('stretch')
+
+  _setButtonActiveState: () =>
+    if @state == true
+      @$button.addClass('medium-editor-button-active')
+      @$image.find('.stretch-to-fill').addClass('medium-editor-button-active')
+    else
+      @$button.removeClass('medium-editor-button-active')
+      @$image.find('.stretch-to-fill').removeClass('medium-editor-button-active')
+
+  _getImage: () =>
+    @$button
+      .closest('.image-controls')
+      .data('image')
+
+  _getPiece: () =>
+    @$button
+      .closest('.image-controls')
+      .data('image')
+      .closest('.tn-tc-piece')

data/app/assets/stylesheets/tenon/typography.css.scss

@@ -27,6 +27,11 @@ a {
 }
 
 // Headers
+h1, h2, h3, h4, h5, h6, p {
+   opacity:0.99;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
 
 h1 {
   font-size: 28px;

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

@@ -191,8 +191,11 @@
     overflow: hidden;
     img {
       display: block;
-      width: 100%;
+      max-width: 100%;
+      margin: 0 auto;
+      width: auto;
     }
+    &.stretch img { width: 100%; }
   }
   textarea.caption, div.tn-tc-caption {
     margin: 0;

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

@@ -1,4 +1,4 @@
-.tn-tc-image
+.tn-tc-image{class: piece.stretch_to_fill? ? 'stretch' : ''}
   - if piece.link_url.blank?
     = image_tag(piece.image.url(:_medium))
   - else

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

@@ -1,7 +1,8 @@
 = f.hidden_field :image_id, class: 'asset-id-field'
 = f.hidden_field :position
 = f.hidden_field :size
-.image
+= f.hidden_field :stretch_to_fill
+.image{class: f.object.stretch_to_fill? ? 'stretch' : ''}
   - if f.object.image
     = image_tag(f.object.image.url(:_medium))
   - else
@@ -22,7 +23,6 @@
       %li
         %button{title: 'Crop', class: 'asset-crop medium-editor-action medium-editor-button-first', data: {'tooltip' => true, 'post-crop-handler' => 'Tenon.features.tenonContent.PostCropHandler', 'asset-id' => f.object.image_id}}
           %i.fa.fa-crop
-
       %li
         %button{title: 'Grow', class: 'grow-image medium-editor-action', data: {'column-resize-operation' => 'increase', 'tooltip' => true}}
           %i.fa.fa-plus
@@ -34,12 +34,13 @@
           %i.fa.fa-comment
       %li
         %button{title: 'Swap Sides', class: 'swap-sides medium-editor-action', data: {tooltip: true}}
-          %i.fa.fa-arrows-h
-
+          %i.fa.fa-exchange
+      %li
+        %button{title: 'Stretch to Fill', class: "stretch-to-fill medium-editor-action #{f.object.stretch_to_fill? ? 'medium-editor-button-active' : ''}", data: {tooltip: true}}
+          %i.fa.fa-arrows-alt
       %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/db/migrate/20140619135927_add_stretch_boolean_to_tenon_tenon_content_pieces.rb

@@ -0,0 +1,6 @@
+class AddStretchBooleanToTenonTenonContentPieces < ActiveRecord::Migration
+  def change
+    add_column :tenon_tenon_content_pieces, :stretch_to_fill, :boolean, default: false
+    remove_column :tenon_tenon_content_pieces, :dimenstions
+  end
+end

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.19'
+  VERSION = '1.0.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -975,6 +975,7 @@ files:
 - app/assets/javascripts/tenon/features/tenon_content/post_crop_handler.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/sidebar_navigation.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/sortable.js.coffee
+- app/assets/javascripts/tenon/features/tenon_content/stretch_to_fill.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/wrapped_sizing.js.coffee
 - app/assets/javascripts/tenon/features/video_feeds.js.coffee
 - app/assets/javascripts/tenon/medium_customizations.js
@@ -1287,6 +1288,7 @@ files:
 - db/migrate/20140516135347_add_index_to_item_versions.rb
 - db/migrate/20140520150508_add_publish_at_and_remove_published_from_tenon_posts.rb
 - db/migrate/20140520161213_remove_published_feld_from_tenon_pages.rb
+- db/migrate/20140619135927_add_stretch_boolean_to_tenon_tenon_content_pieces.rb
 - db/seeds.rb
 - lib/generators/tenon/i18n_migrations/i18n_migrations_generator.rb
 - lib/generators/tenon/i18n_migrations/templates/migration.rb
@@ -1452,7 +1454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.