5.5.1

yabwe · Jul 23, 2015 · 63d7a06 · 63d7a06
1 parent 1de2659
commit 63d7a06
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+5.5.1 / 2015-07-23
+==================
+* Fix appearance of anchor form when checkboxes are present
+* Fix breaking issue with standardizeSelectionStart option
+
+
 5.5.0 / 2015-07-21
 ==================
 * Add setContent method into core API, which triggers editableInput

diff --git a/dist/css/medium-editor.css b/dist/css/medium-editor.css
@@ -165,22 +165,25 @@
   .medium-editor-toolbar-form input,
   .medium-editor-toolbar-form a {
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
+  .medium-editor-toolbar-form .medium-editor-toolbar-form-row {
+    line-height: 14px;
+    margin-left: 5px;
+    padding-bottom: 5px; }
   .medium-editor-toolbar-form .medium-editor-toolbar-input,
   .medium-editor-toolbar-form label {
     border: none;
     box-sizing: border-box;
     font-size: 14px;
     margin: 0;
     padding: 6px;
-    width: 316px; }
+    width: 316px;
+    display: inline-block; }
     .medium-editor-toolbar-form .medium-editor-toolbar-input:focus,
     .medium-editor-toolbar-form label:focus {
       appearance: none;
       border: none;
       box-shadow: none;
       outline: 0; }
-  .medium-editor-toolbar-form label {
-    display: block; }
   .medium-editor-toolbar-form a {
     display: inline-block;
     font-size: 24px;

diff --git a/dist/css/medium-editor.min.css b/dist/css/medium-editor.min.css
diff --git a/dist/js/medium-editor.js b/dist/js/medium-editor.js
@@ -3120,21 +3120,25 @@ var AnchorForm;
                 // fixme: ideally, this targetCheckboxText would be a formLabel too,
                 // figure out how to deprecate? also consider `fa-` icon default implcations.
                 template.push(
+                    '<div class="medium-editor-toolbar-form-row">',
                     '<input type="checkbox" class="medium-editor-toolbar-anchor-target">',
                     '<label>',
                     this.targetCheckboxText,
-                    '</label>'
+                    '</label>',
+                    '</div>'
                 );
             }
 
             if (this.customClassOption) {
                 // fixme: expose this `Button` text as a formLabel property, too
                 // and provide similar access to a `fa-` icon default.
                 template.push(
+                    '<div class="medium-editor-toolbar-form-row">',
                     '<input type="checkbox" class="medium-editor-toolbar-anchor-button">',
                     '<label>',
                     this.customClassOptionText,
-                    '</label>'
+                    '</label>',
+                    '</div>'
                 );
             }
 
@@ -3454,7 +3458,7 @@ var AnchorPreview;
 
             // Detect empty href attributes
             // The browser will make href="" or href="#top"
-            // into absolute urls when accessed as event.targed.href, so check the html
+            // into absolute urls when accessed as event.target.href, so check the html
             if (!/href=["']\S+["']/.test(target.outerHTML) || /href=["']#\S+["']/.test(target.outerHTML)) {
                 return true;
             }
@@ -4866,7 +4870,7 @@ var Toolbar;
                         offset = offset + 1;
                     }
                     selectionRange = Selection.select(this.document, adjacentNode, offset,
-                        selectionRange.endContainer, selectionRange.offset);
+                        selectionRange.endContainer, selectionRange.endOffset);
                 }
             }
         },
@@ -6220,7 +6224,7 @@ MediumEditor.parseVersionString = function (release) {
 
 MediumEditor.version = MediumEditor.parseVersionString.call(this, ({
     // grunt-bump looks for this:
-    'version': '5.5.0'
+    'version': '5.5.1'
 }).version);
 
     return MediumEditor;

diff --git a/dist/js/medium-editor.min.js b/dist/js/medium-editor.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medium-editor",
-  "version": "5.5.0",
+  "version": "5.5.1",
   "author": "Davi Ferreira <[email protected]>",
   "contributors": [
     {

diff --git a/src/js/version.js b/src/js/version.js
@@ -17,5 +17,5 @@ MediumEditor.parseVersionString = function (release) {
 
 MediumEditor.version = MediumEditor.parseVersionString.call(this, ({
     // grunt-bump looks for this:
-    'version': '5.5.0'
+    'version': '5.5.1'
 }).version);