tenon 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 894387aba75120755e60cf203f663147d8fe8096
-  data.tar.gz: 59d61b67d710353edd4024185febaafa3d97c271
+  metadata.gz: 3dfb548908695c38e60f7abe4b367fc01dfd23ad
+  data.tar.gz: 3b459fbfb37b249878e3eb640873d90526f8eb49
 SHA512:
-  metadata.gz: 4ff8910d4e089cfdaa33e66565f2885aa099a9db253d2677455a12459cdfeed8c344da4691024478f3eac8a21f7318d6a0c371b5d3bd13a6c20cd78a3635a3a6
-  data.tar.gz: 748cd5a0cbf9b5a0d76ca187b2eabc38b10811c49aba54c10147f999d2c4848d223b6b186b59a1d605227b5e4158220946f911f1585ee976b0fa9c6cb4d5c7a1
+  metadata.gz: 6ff4f71707443668d98d351e48ff8b67c87e43487f28ed6de5be21e0a74e1d5551297abcbe5a49eb26a46e0c15acc9ee17bc791cbc6967b2005615f65a6880b9
+  data.tar.gz: 428b4ddb9985664ef8802f824eca53c20c622dbc3a65c557985046e8b97894fe345f30eb53c80e31b76b68732ff62fed409e6efd48be7bc917db5bc1a72e7acc

data/app/assets/javascripts/tenon/features/tenon_content/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/medium_customizations.js

@@ -0,0 +1,65 @@
+MediumEditor.prototype.toolbarFormAnchor = function () {
+  var anchor = document.createElement('div'),
+    input = document.createElement('input'),
+    a = document.createElement('a'),
+    button = document.createElement('a');
+    icon = document.createElement('i');
+
+  a.setAttribute('href', '#');
+  a.innerHTML = '×';
+  a.className = 'medium-editor-cancel';
+
+  button.id = 'medium-editor-link-to-asset';
+  button.setAttribute('href', '/tenon/item_assets/new?hide_upload=true');
+  button.setAttribute('data-modal-remote', 'true');
+  button.setAttribute('data-tooltip', 'true');
+  button.setAttribute('title', 'Link to an Asset');
+  button.setAttribute('data-modal-title', 'Link to Asset');
+  button.setAttribute('data-modal-handler', 'Tenon.features.tenonContent.AssetLink');
+
+  icon.className = 'fa fa-file-pdf-o';
+
+  button.appendChild(icon);
+
+  input.setAttribute('type', 'text');
+  input.setAttribute('placeholder', this.options.anchorInputPlaceholder);
+
+  anchor.className = 'medium-editor-toolbar-form-anchor';
+  anchor.id = 'medium-editor-toolbar-form-anchor';
+  anchor.appendChild(input);
+  anchor.appendChild(button);
+  anchor.appendChild(a);
+
+  return anchor;
+};
+
+MediumEditor.prototype.bindAnchorForm = function () {
+    var linkCancel = this.anchorForm.querySelector('a.medium-editor-cancel'),
+        self = this;
+    this.anchorForm.addEventListener('click', function (e) {
+      if ( !$(e.target).is('#medium-editor-link-to-asset *, #medium-editor-link-to-asset') ) {
+        e.stopPropagation();
+      }
+    });
+    this.anchorInput.addEventListener('keyup', function (e) {
+        if (e.keyCode === 13) {
+            e.preventDefault();
+            self.createLink(this);
+        }
+    });
+    this.anchorInput.addEventListener('click', function (e) {
+        // make sure not to hide form when cliking into the input
+        e.stopPropagation();
+        self.keepToolbarAlive = true;
+    });
+    this.anchorInput.addEventListener('blur', function () {
+        // self.keepToolbarAlive = false;
+        self.checkSelection();
+    });
+    linkCancel.addEventListener('click', function (e) {
+        e.preventDefault();
+        self.showToolbarActions();
+        restoreSelection(self.savedSelection);
+    });
+    return this;
+};

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

@@ -21,6 +21,7 @@
 //= require jquery.twoLevelSort
 //= require jquery.ui.sortable
 //= require medium-editor
+//= require ./medium_customizations
 //= require select2
 //= require uri
 

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

@@ -16,14 +16,14 @@ $tn-z-content-popped: 1029;
 $tn-z-tc-sizer: 1029;
 
 // modals
-$tn-z-modal-backdrop: 1030;
-$tn-z-asset-cropping: 1040;
-$tn-z-modal: 1040;
-$tn-z-modal-dialog: 1050;
+$tn-z-modal-backdrop: 2030;
+$tn-z-asset-cropping: 2040;
+$tn-z-modal: 2040;
+$tn-z-modal-dialog: 2050;
 
 // spinners
-$tn-z-generic-loader: 1050;
-$tn-z-asset-cropping-spinner: 2000;
+$tn-z-generic-loader: 2050;
+$tn-z-asset-cropping-spinner: 3000;
 
 // header menu
-$tn-z-header-menu: 3000;
+$tn-z-header-menu: 4000;

data/app/views/tenon/item_assets/new.html.haml

@@ -1,16 +1,17 @@
 .modal-tab-pane.tab-content
-  #upload-asset
-    %h5 From Your Computer
-    #progress
-    = form_for Tenon::Asset.new, format: 'json', builder: Tenon::FormBuilder do |f|
-      = error_messages_for :asset
-      .fields.full
-        .form-group
-          .browse-button-holder.solo
-            .fileupload.btn.btn-comp.browse
-              %span#choose-files Browse
-              %input{ :type => 'file', :class => 'upload', multiple: defined?(multiple) && multiple, style: 'width: 100%;', name: 'asset[attachment]' }
-      .spacer
+  - unless params[:hide_upload]
+    #upload-asset
+      %h5 From Your Computer
+      #progress
+      = form_for Tenon::Asset.new, format: 'json', builder: Tenon::FormBuilder do |f|
+        = error_messages_for :asset
+        .fields.full
+          .form-group
+            .browse-button-holder.solo
+              .fileupload.btn.btn-comp.browse
+                %span#choose-files Browse
+                %input{ :type => 'file', :class => 'upload', multiple: defined?(multiple) && multiple, style: 'width: 100%;', name: 'asset[attachment]' }
+        .spacer
 
   #pick-asset
     %h5 From the Asset Library

data/lib/tenon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -196,16 +196,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
@@ -596,14 +596,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -952,6 +952,7 @@ files:
 - app/assets/javascripts/tenon/features/tenon_content.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/aesthetics.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/asset_attachment.js.coffee
+- app/assets/javascripts/tenon/features/tenon_content/asset_link.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/base.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/bottombar_toggler.js.coffee
 - app/assets/javascripts/tenon/features/tenon_content/caption_toggler.js.coffee
@@ -968,6 +969,7 @@ files:
 - app/assets/javascripts/tenon/features/tenon_content/sortable.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
 - app/assets/javascripts/tenon/templates/assets/asset_field.jst.eco
 - app/assets/javascripts/tenon/templates/assets/asset_progress.jst.eco
 - app/assets/javascripts/tenon/templates/assets/asset_row.jst.eco
@@ -1434,7 +1436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.