tenon 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 369fe222b4d39f614783304c9fd028c9904725cf
-  data.tar.gz: 9f19f960370d70a89fee8416e981c1174e90b11d
+  metadata.gz: 48fb6179ca0d169c509bdb474451aafb9867f4e2
+  data.tar.gz: 347a5e77d1fa93343900a072d17c9fd0a016d76c
 SHA512:
-  metadata.gz: 706543fb1b96546c2e7a1c3ad728cce2fa166e997830e8c1f9b559dd053ca9af7c56e97f6f2431707e2471003278b9ed4761bd2a7bf03736a42e5820fe1557af
-  data.tar.gz: 92683d22c2b17aa0daeff1482eb11d9e0d714d63740c972861d32563a7b7b84af22ada7a3d3fb1a52396700a6295681d79138f763c59970538ab476be14e25f7
+  metadata.gz: 5cb957ff891e6bd3ea7b36402383b038bc01faa9a6c3e218170e3d65145c9f89863bfdb375fa9146137f62518b73fcb2257098bbf91d6210fa93cf3d71e24ea7
+  data.tar.gz: 48597375b5d3286153249e116e15c8ba863c873979789564772e22fa74f5bcd04736b7c9c66b947d73b654683c0dab7a12978568736a90f883e605eb8364e5e3

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

@@ -24,7 +24,7 @@ class Tenon.features.tenonContent.ImageControls
     $('.tooltip').remove()
 
   _removeControls: =>
-    $('body > .image-controls').remove()
+    $('body > .image-controls, body > .link-form').remove()
     delete Tenon.activeImageControls
 
   _buildControls: (e) =>

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

@@ -1,6 +1,6 @@
 class Tenon.features.tenonContent.ImageLinks
   constructor: (@$container) ->
-    $(document).on('click', '.column-image .add-link, .wrapped-image .add-link', @buildLinkForm)
+    $(document).on('click', '.image-controls .add-link', @buildLinkForm)
 
   buildLinkForm: (e) =>
     @$button = $(e.currentTarget)
@@ -41,7 +41,9 @@ class Tenon.features.tenonContent.ImageLinks
   _formFilled: (e) =>
     @saveForm() if e.keyCode == 13
 
-  _cancel: (e) => @$visibleForm.remove()
+  _cancel: (e) =>
+    e.preventDefault()
+    @$visibleForm.remove()
 
   _setButtonActiveState: (e) =>
     if @$visibleForm.find('input').val() != ''

data/lib/tenon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - factor[e] design initiative