tenon 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa5eb843bd34b0d3e4ddb4f47fa186294da91ba0
-  data.tar.gz: cadd3f3e32a7120f4a55904be88aeec73535dc89
+  metadata.gz: 03c0d57c50698d4b12180c41bad775a3064da1fa
+  data.tar.gz: 68998a00932c907c04525014ca5aaa7924535dda
 SHA512:
-  metadata.gz: 65fbc8d82223e1ecffaf92eb284e1cbdbcc4814ca6a87c49298b63247e1ace23f7961e68154a0cbb46e3a6062553d8816664276c25d84cf10d90f148e9fff490
-  data.tar.gz: a3b7dfd383995b186832996a9864aa645473e3d67e459e467e19401b7c1394b4dfd6243667d7f76b5340a15d5437dc6722da474cfa849b280618579ca4ce36fe
+  metadata.gz: 119b03f83c8471243ea0c122671c6882e3611e2d84b28eec57a5605fc9257493a44bb704d1592c806365d34c95baeecf7bf4f31f5bcee709a8a1baaa008e300c
+  data.tar.gz: 01d0e2dcd4a37ccc50b30e58aa86c9c85387f5804f41b1dd3ad6b5233456f16d9b92fb2f04508ec369d1dea77e5938d9e18f1ff50de72370a2ca3bba2865b273

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

@@ -13,8 +13,7 @@ class Tenon.features.AssetCropping
   _loadCrop: (e) =>
     e.preventDefault()
     @$link = $(e.currentTarget)
-    url = Routes.tenon_crop_asset_path(@$link.data('asset-id'))
-    $.get(url, {format: 'html'}, @_startCrop, 'html')
+    $.get(@$link.attr('href'), {format: 'html'}, @_startCrop, 'html')
 
   _cancelCrop: (e) ->
     e.preventDefault()
@@ -47,4 +46,4 @@ class Tenon.features.AssetCropping
     $('#asset_crop_x').val(coords.x)
     $('#asset_crop_y').val(coords.y)
     $('#asset_crop_w').val(coords.w)
-    $('#asset_crop_h').val(coords.h)
+    $('#asset_crop_h').val(coords.h)

data/app/assets/javascripts/tenon/templates/assets/asset_field.jst.eco

@@ -3,15 +3,15 @@
   <div class="record-details">
     <div class="record-title big">
       <strong>
-        <a href="<%= Routes.tenon_edit_asset_path(@asset.id) %>"><%= @asset.display_name %></a>
+        <a href="<%= @asset.edit_path %>"><%= @asset.display_name %></a>
       </strong>
       <div class="explanation">
         <%= @asset.human_size %>
       </div>
     </div>
     <div class="record-actions">
-      <a data-tooltip="Edit" href="<%= Routes.tenon_edit_asset_path(@asset.id) %>" title="Edit"><i class="fa fa-pencil"></i></a>
-      <a data-confirm="Are you sure? There is no undo for this!" data-method="delete" data-tooltip="Delete" href="<%= Routes.tenon_asset_path(@asset.id) %>" rel="nofollow" title="Delete"><i class="fa fa-trash-o"></i></a>
+      <a data-tooltip="Edit" href="<%= @asset.edit_path %>" title="Edit"><i class="fa fa-pencil"></i></a>
+      <a data-confirm="Are you sure? There is no undo for this!" data-method="delete" data-tooltip="Delete" href="<%= @asset.path %>" rel="nofollow" title="Delete"><i class="fa fa-trash-o"></i></a>
     </div>
   </div>
 </li>

data/app/assets/javascripts/tenon/templates/assets/asset_row.jst.eco

@@ -2,7 +2,7 @@
   <div class="thumbnail"><%- @asset.icon %></div>
   <div class="record-details">
     <div class="record-title">
-      <a href="<%= Routes.tenon_edit_asset_path(@asset.id) %>" data-modal-remote="true" data-modal-title="Edit Asset"><%= @asset.display_name %></a>
+      <a href="<%= @asset.edit_path %>" data-modal-remote="true" data-modal-title="Edit Asset"><%= @asset.display_name %></a>
     </div>
 
     <div class="record-fields">

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

@@ -21,7 +21,6 @@
 //= require jquery.radioSlider
 //= require jquery.twoLevelSort
 //= require jquery.ui.sortable
-//= require js-routes
 //= require select2
 //= require uri
 
@@ -33,7 +32,6 @@
 //= require underscore.string
 //= require underscore.inflection
 
-
 // -- Tenon things, don't mess with the order
 //= require ./tenon
 //= require ./tenon_dispatcher
@@ -43,7 +41,6 @@
 //= require tenon_addons
 //= require_self
 
-
 $(function() {
   Tenon.init();
 });

data/app/views/tenon/assets/_asset.json.jbuilder

@@ -1,7 +1,7 @@
 json.extract!(asset,
   :id, :display_name, :icon, :tile, :to_param, :human_size,
-  :attachment_content_type, :edit_link, :delete_link,
-  :crop_link, :download_link
+  :attachment_content_type, :edit_link, :delete_link, :edit_path,
+  :path, :crop_link, :download_link
 )
 json.style_urls asset.style_urls
-json.json_style_urls asset.style_urls.to_json
+json.json_style_urls asset.style_urls.to_json

data/lib/tenon/engine.rb

@@ -19,7 +19,6 @@ require 'jbuilder'
 require 'jquery-fileupload-rails'
 require 'jquery-rails'
 require 'jquery-ui-rails'
-require 'js-routes'
 require 'later_dude'
 require 'launchy'
 require 'lodash-rails'

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -514,20 +514,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.0.5
-- !ruby/object:Gem::Dependency
-  name: js-routes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: later_dude
   requirement: !ruby/object:Gem::Requirement