tenon 1.0.63 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23b0d012cdae23e290d059730747281078281147
-  data.tar.gz: 0cf76efc8f5aa0517a0f1da732c079cb3ec8b947
+  metadata.gz: 6f3bb8fc3acef8312449faf8293c92c178306bf1
+  data.tar.gz: 5b0c621ac9c92ed87398defe1a3e43869bb30424
 SHA512:
-  metadata.gz: 20b2271b44896595b04211866bc87d1fad2e1e39835c1c3f214a9ac8e034a26028233ab0ed5c20c6a3f24c7ad9d4d53e33ead62d8a1578705bc0113bee4c16c7
-  data.tar.gz: 69455c50c097aa22075ab57cb127b73705d44ce1606e3ba7f780c3bedf6562cce14b24dbeee8fde8dd59aef48247de8ce9ab89db31a59911c56fe425e91b56d3
+  metadata.gz: fa06c54b7d95271469a7da5407cb26ac7ad0fb4b32e5b1546467f232af34c0376ccd667c7fe7bc2f1064bd7f0f3de8fa407c9d5d91366ec21c6710466301a3fb
+  data.tar.gz: ee36da52199fe2dccab5a1f00b8e04c412367c6b23b1ecab5bc95c1ab7f4e5c1a846739479e34105013cf6c88ea7b5cd2e5f68c55e53af62fb6ba9a572e81cb6

data/app/assets/javascripts/tenon/medium-on-tenon.js

@@ -97,7 +97,7 @@ if (typeof module === 'object') {
             allowMultiParagraphSelection: true,
             anchorInputPlaceholder: 'Paste or type a link',
             anchorPreviewHideDelay: 500,
-            buttons: ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'quote'],
+            buttons: ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'header3', 'header4', 'quote'],
             buttonLabels: false,
             checkLinkFormat: false,
             cleanPastedHTML: false,
@@ -110,9 +110,11 @@ if (typeof module === 'object') {
             disableEditing: false,
             elementsContainer: false,
             firstHeader: 'h3',
+            secondHeader: 'h4',
+            thirdHeader: 'h5',
+            fourthHeader: 'h6',
             forcePlainText: true,
             placeholder: 'Type your text',
-            secondHeader: 'h4',
             targetBlank: false,
             extensions: {}
         },
@@ -323,6 +325,8 @@ if (typeof module === 'object') {
                     'image': '<button class="medium-editor-action medium-editor-action-image" data-action="image" data-element="img">' + buttonLabels.image + '</button>',
                     'header1': '<button class="medium-editor-action medium-editor-action-header1" data-action="append-' + this.options.firstHeader + '" data-element="' + this.options.firstHeader + '">' + buttonLabels.header1 + '</button>',
                     'header2': '<button class="medium-editor-action medium-editor-action-header2" data-action="append-' + this.options.secondHeader + '" data-element="' + this.options.secondHeader + '">' + buttonLabels.header2 + '</button>',
+                    'header3': '<button class="medium-editor-action medium-editor-action-header3" data-action="append-' + this.options.thirdHeader + '" data-element="' + this.options.thirdHeader + '">' + buttonLabels.header3 + '</button>',
+                    'header4': '<button class="medium-editor-action medium-editor-action-header4" data-action="append-' + this.options.fourthHeader + '" data-element="' + this.options.fourthHeader + '">' + buttonLabels.header4 + '</button>',
                     'quote': '<button class="medium-editor-action medium-editor-action-quote" data-action="append-blockquote" data-element="blockquote">' + buttonLabels.quote + '</button>',
                     'orderedlist': '<button class="medium-editor-action medium-editor-action-orderedlist" data-action="insertorderedlist" data-element="ol">' + buttonLabels.orderedlist + '</button>',
                     'unorderedlist': '<button class="medium-editor-action medium-editor-action-unorderedlist" data-action="insertunorderedlist" data-element="ul">' + buttonLabels.unorderedlist + '</button>',
@@ -347,6 +351,8 @@ if (typeof module === 'object') {
                     'image': '<b>image</b>',
                     'header1': '<b>H1</b>',
                     'header2': '<b>H2</b>',
+                    'header3': '<b>H3</b>',
+                    'header4': '<b>H4</b>',
                     'quote': '<b>&ldquo;</b>',
                     'orderedlist': '<b>1.</b>',
                     'unorderedlist': '<b>&bull;</b>',
@@ -391,7 +397,8 @@ if (typeof module === 'object') {
           this.keepToolbarAlive = false;
           this.anchorForm = this.toolbar.querySelector('.medium-editor-toolbar-form-anchor');
           this.anchorInput = this.anchorForm.querySelector('input.medium-editor-toolbar-anchor-input');
-          this.anchorTarget = this.anchorForm.querySelector('input.medium-editor-toolbar-anchor-target');
+          this.anchorTarget = this.anchorForm.querySelector('input.medium-editor-toolbar-anchor-target-input');
+          this.anchorBtn = this.anchorForm.querySelector('input.medium-editor-toolbar-anchor-btn-input');
           this.toolbarActions = this.toolbar.querySelector('.medium-editor-toolbar-actions');
           this.anchorPreview = this.createAnchorPreview();
 
@@ -429,6 +436,7 @@ if (typeof module === 'object') {
                 }
 
                 if (btn) {
+
                     li = document.createElement('li');
                     if (isElement(btn)) {
                         li.appendChild(btn);
@@ -450,6 +458,9 @@ if (typeof module === 'object') {
               target_wrap = document.createElement('div'),
               target_label = document.createElement('label'),
               target = document.createElement('input'),
+              btn_wrap = document.createElement('div'),
+              btn_label = document.createElement('label'),
+              btn = document.createElement('input'),
               icon = document.createElement('i');
 
           cancel.setAttribute('href', '#');
@@ -465,15 +476,24 @@ if (typeof module === 'object') {
           asset_button.setAttribute('data-modal-title', 'Link to Asset');
           asset_button.setAttribute('data-modal-handler', 'Tenon.features.tenonContent.AssetLink');
 
-          target.className = 'medium-editor-toolbar-anchor-target';
+          target.className = 'medium-editor-toolbar-anchor-checkbox medium-editor-toolbar-anchor-target-input';
           target.setAttribute('type', 'checkbox')
           target.setAttribute('title', 'Open in New Window?')
           target.setAttribute('data-tooltip', 'true');
-          target_label.className = 'medium-editor-toolbar-anchor-target-label';
-          target_wrap.className = 'medium-editor-toolbar-anchor-target-wrap';
+          target_label.className = 'medium-editor-toolbar-anchor-checkbox-label medium-editor-toolbar-anchor-target-label';
+          target_wrap.className = 'medium-editor-toolbar-anchor-checkbox-wrap medium-editor-toolbar-anchor-target';
           target_wrap.insertBefore(target_label, target_wrap.firstChild);
           target_wrap.insertBefore(target, target_wrap.firstChild);
 
+          btn.className = 'medium-editor-toolbar-anchor-checkbox medium-editor-toolbar-anchor-btn-input';
+          btn.setAttribute('type', 'checkbox')
+          btn.setAttribute('title', 'Style as a button?')
+          btn.setAttribute('data-tooltip', 'true');
+          btn_label.className = 'medium-editor-toolbar-anchor-checkbox-label medium-editor-toolbar-anchor-btn-label';
+          btn_wrap.className = 'medium-editor-toolbar-anchor-checkbox-wrap medium-editor-toolbar-anchor-btn';
+          btn_wrap.insertBefore(btn_label, btn_wrap.firstChild);
+          btn_wrap.insertBefore(btn, btn_wrap.firstChild);
+
           input.className = 'medium-editor-toolbar-anchor-input';
           input.setAttribute('type', 'text');
           input.setAttribute('placeholder', this.options.anchorInputPlaceholder);
@@ -482,6 +502,7 @@ if (typeof module === 'object') {
           anchor.id = 'medium-editor-toolbar-form-anchor';
           if (!this.isIE) { anchor.appendChild(asset_button); }
           anchor.appendChild(input);
+          anchor.appendChild(btn_wrap);
           anchor.appendChild(target_wrap);
           anchor.appendChild(cancel);
 
@@ -849,7 +870,15 @@ if (typeof module === 'object') {
                   self.anchorTarget.checked = false;
                 }
 
-                self.createLink(this, target);
+                // set class for link and pass to createLink()
+                var btn = "";
+                if (self.anchorBtn.checked) {
+                  btn = "btn";
+                  // reset target state to false:
+                  self.anchorBtn.checked = false;
+                }
+
+                self.createLink(this, target, btn);
               }
           });
           this.anchorInput.addEventListener('click', function (e) {
@@ -1070,7 +1099,23 @@ if (typeof module === 'object') {
             }
         },
 
-        createLink: function (input, target) {
+        setBtnClass: function (href) {
+            var el = getSelectionStart(),
+                i;
+            if (el.tagName.toLowerCase() === 'a') {
+                el.className = 'btn';
+            } else {
+                el = el.getElementsByTagName('a');
+                for (i = 0; i < el.length; i += 1) {
+                  if ( el[i].getAttribute('href') === href) {
+                    el[i].className = 'btn';
+                  }
+                }
+            }
+            console.log(el);
+        },
+
+        createLink: function (input, target, btn) {
           restoreSelection(this.savedSelection);
           if (this.options.checkLinkFormat) {
             input.value = this.checkLinkFormat(input.value);
@@ -1082,6 +1127,10 @@ if (typeof module === 'object') {
             this.setTargetBlank(input.value);
           }
 
+          if (btn === "btn") {
+            this.setBtnClass(input.value);
+          }
+
           this.triggerChange();
 
           this.checkSelection();

data/app/assets/stylesheets/tenon/ui/medium-editor.css.scss

@@ -31,7 +31,7 @@
 .medium-editor-toolbar-form-anchor {
   input {
     height: 56px;
-    &.medium-editor-toolbar-anchor-target {
+    &.medium-editor-toolbar-anchor-checkbox {
       position: absolute;
       z-index: 1;
       top: 0;
@@ -45,19 +45,21 @@
       cursor: pointer;
       opacity: 0;
       &:checked + .medium-editor-toolbar-anchor-target-label:before {
-        // content: '\f08e'; // external-light
-        content: '\f14c'; // external-dark
+        content: '\f14c';
+      }
+      &:checked + .medium-editor-toolbar-anchor-btn-label:before {
+        content: '\f14a';
       }
     }
   }
-  .medium-editor-toolbar-anchor-target-wrap {
+  .medium-editor-toolbar-anchor-checkbox-wrap {
     position: relative;
     top: 2px;
     display: inline-block;
     margin: 0;
     padding: 0;
   }
-  label.medium-editor-toolbar-anchor-target-label {
+  label.medium-editor-toolbar-anchor-checkbox-label {
     display: inline-block;
     width: auto;
     margin: 0 6px;
@@ -67,8 +69,7 @@
       font-size: 18px;
       line-height: 30px;
       display: block;
-      content: '\f0c8'; // square-dark
-      // content: '\f096'; // square-light
+      content: '\f0c8';
       color: white;
     }
   }

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

@@ -141,10 +141,15 @@
     padding: 5px;
     outline: none;
     background: #fff;
-    h3, h4, p, ul, ol {
+    h1, h2, h3, h4, h5, h6, p, ul, ol {
       margin: 0 0 $tn-margin;
       padding-top: 0;
     }
+    .btn {
+      background-color: $tn-primary;
+      color: white;
+      margin: 0 10px;
+    }
   }
   a.add-image {
     span {

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.63'
+  VERSION = '1.0.64'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.63
+  version: 1.0.64
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors