medium-editor-rails 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ed3d1649f4b21ed2ac23f47a5741106dee459d
-  data.tar.gz: e445c754424ca6d986ec525810233b1f010406d3
+  metadata.gz: 2797d94a0b663d77df028d929090e6693d9a0931
+  data.tar.gz: bce123c63f3984235f94f8edec1fabf1ebc53b00
 SHA512:
-  metadata.gz: ffb12c796fbfb1720486e39b1f3eeea4b784d159ea2c1fe2421db9a474006a88b82899dd1f4d430ca47da200dbf230a21e0e91a2d08e829e3de492a87ff1837d
-  data.tar.gz: 4632fae0f41e107a21d15ce407e7a3397be860998120abacf4a6762cbb0238574c47e81ffab4773ca155bd46a678ab818b11f006cba0c5f1a9e70d97cb8c152b
+  metadata.gz: bff23ff9bc5e9ffd3ad863e6332c078facd03a6e34db99c2566e4177a187467d2655e440f6a15a9a4fbbb7a8e3a0e4deaa8a120aad155a2499af4e2268948600
+  data.tar.gz: a27b421862232708df549a2585eec2f20a22a3ec94e75c4b535ca94366b5e3352c7fa1ce39a60d04e83e96045e994241d8ea7ab5697d624a5f3f8e37f280f0da

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 
 #### [Current]
+ * [e6d136d](../../commit/e6d136d) - __(Ahmet Sezgin Duran)__ Update Medium Editor files
+ * [7ee9c60](../../commit/7ee9c60) - __(Ahmet Sezgin Duran)__ Merge tag '1.1.3' into develop
+
+1.1.3
+
+#### 1.1.3
+ * [8cc5af9](../../commit/8cc5af9) - __(Ahmet Sezgin Duran)__ Bump versions 1.1.3 and 2.1.3
  * [9a54e41](../../commit/9a54e41) - __(Ahmet Sezgin Duran)__ Update Medium Editor files
  * [67de6b2](../../commit/67de6b2) - __(Ahmet Sezgin Duran)__ Merge tag '1.1.2' into develop
 

data/README.md

@@ -8,7 +8,7 @@ This gem integrates [Medium Editor](https://github.com/daviferreira/medium-edito
 
 ## Version
 
-The latest version of Medium Editor bundled by this gem is [2.1.3](https://github.com/daviferreira/medium-editor/releases)
+The latest version of Medium Editor bundled by this gem is [2.2.0](https://github.com/daviferreira/medium-editor/releases)
 
 ## Installation
 

data/lib/medium-editor-rails/version.rb

@@ -1,6 +1,6 @@
 module MediumEditorRails
   module Rails
-    VERSION = '1.1.3'
-    MEDIUM_EDITOR_VERSION = '2.1.3'
+    VERSION = '1.2.0'
+    MEDIUM_EDITOR_VERSION = '2.2.0'
   end
 end

data/vendor/assets/javascripts/medium-editor.js

@@ -32,6 +32,13 @@ if (typeof module === 'object') {
     // https://github.com/jashkenas/underscore
     var now = Date.now || function () {
         return new Date().getTime();
+    }, keyCode = {
+        BACKSPACE: 8,
+        TAB: 9,
+        ENTER: 13,
+        ESCAPE: 27,
+        SPACE: 32,
+        DELETE: 46
     };
 
     // https://github.com/jashkenas/underscore
@@ -98,7 +105,7 @@ if (typeof module === 'object') {
     function findAdjacentTextNodeWithContent(rootNode, targetNode, ownerDocument) {
         var pastTarget = false,
             nextNode,
-            nodeIterator = ownerDocument.createNodeIterator(rootNode, NodeFilter.SHOW_TEXT);
+            nodeIterator = ownerDocument.createNodeIterator(rootNode, NodeFilter.SHOW_TEXT, null, false);
 
         // Use a native NodeIterator to iterate over all the text nodes that are descendants
         // of the rootNode.  Once past the targetNode, choose the first non-empty text node
@@ -107,7 +114,7 @@ if (typeof module === 'object') {
             if (nextNode === targetNode) {
                 pastTarget = true;
             } else if (pastTarget) {
-                if (nextNode.nodeType === 3 && nextNode.nodeValue && nextNode.nodeValue.length > 0) {
+                if (nextNode.nodeType === 3 && nextNode.nodeValue && nextNode.nodeValue.trim().length > 0) {
                     break;
                 }
             }
@@ -219,7 +226,9 @@ if (typeof module === 'object') {
         var selection, range, el, fragment, node, lastNode;
 
         if (doc.queryCommandSupported('insertHTML')) {
-            return doc.execCommand('insertHTML', false, html);
+            try {
+                return doc.execCommand('insertHTML', false, html);
+            } catch (ignore) {}
         }
 
         selection = window.getSelection();
@@ -267,6 +276,7 @@ if (typeof module === 'object') {
             disableAnchorForm: false,
             disablePlaceholders: false,
             elementsContainer: false,
+            imageDragging: true,
             standardizeSelectionStart: false,
             contentWindow: window,
             ownerDocument: document,
@@ -316,6 +326,7 @@ if (typeof module === 'object') {
             this.initThrottledMethods()
                 .initElements()
                 .bindSelect()
+                .bindDragDrop()
                 .bindPaste()
                 .setPlaceholders()
                 .bindElementActions()
@@ -597,7 +608,7 @@ if (typeof module === 'object') {
             this.on(this.elements[index], 'keypress', function (e) {
                 var node,
                     tagName;
-                if (e.which === 32) {
+                if (e.which === keyCode.SPACE) {
                     node = getSelectionStart.call(self);
                     tagName = node.tagName.toLowerCase();
                     if (tagName === 'a') {
@@ -614,7 +625,7 @@ if (typeof module === 'object') {
                 if (node && node.getAttribute('data-medium-element') && node.children.length === 0 && !(self.options.disableReturn || node.getAttribute('data-disable-return'))) {
                     self.options.ownerDocument.execCommand('formatBlock', false, 'p');
                 }
-                if (e.which === 13) {
+                if (e.which === keyCode.ENTER) {
                     node = getSelectionStart.call(self);
                     tagName = node.tagName.toLowerCase();
                     editorElement = self.getSelectionElement();
@@ -657,7 +668,7 @@ if (typeof module === 'object') {
         bindReturn: function (index) {
             var self = this;
             this.on(this.elements[index], 'keypress', function (e) {
-                if (e.which === 13) {
+                if (e.which === keyCode.ENTER) {
                     if (self.options.disableReturn || this.getAttribute('data-disable-return')) {
                         e.preventDefault();
                     } else if (self.options.disableDoubleReturn || this.getAttribute('data-disable-double-return')) {
@@ -675,7 +686,7 @@ if (typeof module === 'object') {
             var self = this;
             this.on(this.elements[index], 'keydown', function (e) {
 
-                if (e.which === 9) {
+                if (e.which === keyCode.TAB) {
                     // Override tab only for pre nodes
                     var tag = getSelectionStart.call(self).tagName.toLowerCase();
                     if (tag === 'pre') {
@@ -694,7 +705,7 @@ if (typeof module === 'object') {
                             self.options.ownerDocument.execCommand('indent', e);
                         }
                     }
-                } else if (e.which === 8 || e.which === 46 || e.which === 13) {
+                } else if (e.which === keyCode.BACKSPACE || e.which === keyCode.DELETE || e.which === keyCode.ENTER) {
 
                     // Bind keys which can create or destroy a block element: backspace, delete, return
                     self.onBlockModifier(e);
@@ -705,26 +716,24 @@ if (typeof module === 'object') {
         },
 
         onBlockModifier: function (e) {
-
             var range, sel, p, node = getSelectionStart.call(this),
                 tagName = node.tagName.toLowerCase(),
                 isEmpty = /^(\s+|<br\/?>)?$/i,
                 isHeader = /h\d/i;
 
-            // backspace or return
-            if ((e.which === 8 || e.which === 13)
+            if ((e.which === keyCode.BACKSPACE || e.which === keyCode.ENTER)
                     && node.previousElementSibling
                     // in a header
                     && isHeader.test(tagName)
                     // at the very end of the block
                     && getCaretOffsets(node).left === 0) {
-                if (e.which === 8 && isEmpty.test(node.previousElementSibling.innerHTML)) {
+                if (e.which === keyCode.BACKSPACE && isEmpty.test(node.previousElementSibling.innerHTML)) {
                     // backspacing the begining of a header into an empty previous element will
                     // change the tagName of the current node to prevent one
                     // instead delete previous node and cancel the event.
                     node.previousElementSibling.parentNode.removeChild(node.previousElementSibling);
                     e.preventDefault();
-                } else if (e.which === 13) {
+                } else if (e.which === keyCode.ENTER) {
                     // hitting return in the begining of a header will create empty header elements before the current one
                     // instead, make "<p><br></p>" element, which are what happens if you hit return in an empty paragraph
                     p = this.options.ownerDocument.createElement('p');
@@ -732,9 +741,7 @@ if (typeof module === 'object') {
                     node.previousElementSibling.parentNode.insertBefore(p, node);
                     e.preventDefault();
                 }
-
-            // delete
-            } else if (e.which === 46
+            } else if (e.which === keyCode.DELETE
                         && node.nextElementSibling
                         && node.previousElementSibling
                         // not in a header
@@ -762,7 +769,6 @@ if (typeof module === 'object') {
 
                 e.preventDefault();
             }
-
         },
 
         buttonTemplate: function (btnType) {
@@ -1026,6 +1032,65 @@ if (typeof module === 'object') {
             return this;
         },
 
+
+        bindDragDrop: function () {
+            var self = this, i, className, onDrag, onDrop, element;
+
+            if (!self.options.imageDragging) {
+                return;
+            }
+
+            className = 'medium-editor-dragover';
+
+            onDrag = function (e) {
+                e.preventDefault();
+                e.dataTransfer.dropEffect = "copy";
+
+                if (e.type === "dragover") {
+                    this.classList.add(className);
+                } else {
+                    this.classList.remove(className);
+                }
+            };
+
+            onDrop = function (e) {
+                var files;
+                e.preventDefault();
+                e.stopPropagation();
+                files = Array.prototype.slice.call(e.dataTransfer.files, 0);
+                files.some(function (file) {
+                    if (file.type.match("image")) {
+                        var fileReader, id;
+                        fileReader = new FileReader();
+                        fileReader.readAsDataURL(file);
+
+                        id = 'medium-img-' + (+new Date());
+                        insertHTMLCommand(self.options.ownerDocument, '<img class="medium-image-loading" id="' + id + '" />');
+
+                        fileReader.onload = function () {
+                            var img = document.getElementById(id);
+                            if (img) {
+                                img.removeAttribute('id');
+                                img.removeAttribute('class');
+                                img.src = fileReader.result;
+                            }
+                        };
+                    }
+                });
+                this.classList.remove(className);
+            };
+
+            for (i = 0; i < this.elements.length; i += 1) {
+                element = this.elements[i];
+
+
+                this.on(element, 'dragover', onDrag);
+                this.on(element, 'dragleave', onDrag);
+                this.on(element, 'drop', onDrop);
+            }
+            return this;
+        },
+
         stopSelectionUpdates: function () {
             this.preventSelectionUpdates = true;
         },
@@ -1141,15 +1206,7 @@ if (typeof module === 'object') {
             }
         },
 
-        findMatchingSelectionParent: function (testElementFunction) {
-            var selection = this.options.contentWindow.getSelection(), range, current;
-
-            if (selection.rangeCount === 0) {
-                return false;
-            }
-
-            range = selection.getRangeAt(0);
-            current = range.commonAncestorContainer;
+        traverseUp: function (current, testElementFunction) {
 
             do {
                 if (current.nodeType === 1) {
@@ -1166,6 +1223,21 @@ if (typeof module === 'object') {
             } while (current);
 
             return false;
+
+        },
+
+        findMatchingSelectionParent: function (testElementFunction) {
+            var selection = this.options.contentWindow.getSelection(), range, current;
+
+            if (selection.rangeCount === 0) {
+                return false;
+            }
+
+            range = selection.getRangeAt(0);
+            current = range.commonAncestorContainer;
+
+            return this.traverseUp(current, testElementFunction);
+
         },
 
         getSelectionElement: function () {
@@ -1383,7 +1455,7 @@ if (typeof module === 'object') {
         getSelectedParentElement: function () {
             var selectedParentElement = null,
                 range = this.selectionRange;
-            if (this.rangeSelectsSingleNode(range)) {
+            if (this.rangeSelectsSingleNode(range) && range.startContainer.childNodes[range.startOffset].nodeType !== 3) {
                 selectedParentElement = range.startContainer.childNodes[range.startOffset];
             } else if (range.startContainer.nodeType === 3) {
                 selectedParentElement = range.startContainer.parentNode;
@@ -1542,7 +1614,7 @@ if (typeof module === 'object') {
                 var button = null,
                     target;
 
-                if (e.keyCode === 13) {
+                if (e.keyCode === keyCode.ENTER) {
                     e.preventDefault();
                     if (self.options.anchorTarget && self.anchorTarget.checked) {
                         target = "_blank";
@@ -1555,7 +1627,7 @@ if (typeof module === 'object') {
                     }
 
                     self.createLink(this, target, button);
-                } else if (e.keyCode === 27) {
+                } else if (e.keyCode === keyCode.ESCAPE) {
                     e.preventDefault();
                     self.showToolbarActions();
                     restoreSelection.call(self, self.savedSelection);
@@ -1625,7 +1697,7 @@ if (typeof module === 'object') {
                 halfOffsetWidth,
                 defaultLeft;
 
-            self.anchorPreview.querySelector('i').textContent = anchorEl.href;
+            self.anchorPreview.querySelector('i').textContent = anchorEl.attributes.href.value;
             halfOffsetWidth = self.anchorPreview.offsetWidth / 2;
             defaultLeft = self.options.diffLeft - halfOffsetWidth;
 
@@ -1724,7 +1796,7 @@ if (typeof module === 'object') {
                 // We may actually be displaying the anchor preview, which should be controlled by options.delay
                 this.delay(function () {
                     if (self.activeAnchor) {
-                        self.showAnchorForm(self.activeAnchor.href);
+                        self.showAnchorForm(self.activeAnchor.attributes.href.value);
                     }
                     self.keepToolbarAlive = false;
                 });
@@ -1822,7 +1894,23 @@ if (typeof module === 'object') {
         createLink: function (input, target, buttonClass) {
             var i, event;
 
-            if (input.value.trim().length === 0) {
+            this.createLinkInternal(input.value, target, buttonClass);
+
+            if (this.options.targetBlank || target === "_blank" || buttonClass) {
+                event = this.options.ownerDocument.createEvent("HTMLEvents");
+                event.initEvent("input", true, true, this.options.contentWindow);
+                for (i = 0; i < this.elements.length; i += 1) {
+                    this.elements[i].dispatchEvent(event);
+                }
+            }
+
+            this.checkSelection();
+            this.showToolbarActions();
+            input.value = '';
+        },
+
+        createLinkInternal: function (url, target, buttonClass) {
+            if (!url || url.trim().length === 0) {
                 this.hideToolbarActions();
                 return;
             }
@@ -1830,10 +1918,10 @@ if (typeof module === 'object') {
             restoreSelection.call(this, this.savedSelection);
 
             if (this.options.checkLinkFormat) {
-                input.value = this.checkLinkFormat(input.value);
+                url = this.checkLinkFormat(url);
             }
 
-            this.options.ownerDocument.execCommand('createLink', false, input.value);
+            this.options.ownerDocument.execCommand('createLink', false, url);
 
             if (this.options.targetBlank || target === "_blank") {
                 this.setTargetBlank();
@@ -1842,18 +1930,6 @@ if (typeof module === 'object') {
             if (buttonClass) {
                 this.setButtonClass(buttonClass);
             }
-
-            if (this.options.targetBlank || target === "_blank" || buttonClass) {
-                event = this.options.ownerDocument.createEvent("HTMLEvents");
-                event.initEvent("input", true, true, this.options.contentWindow);
-                for (i = 0; i < this.elements.length; i += 1) {
-                    this.elements[i].dispatchEvent(event);
-                }
-            }
-
-            this.checkSelection();
-            this.showToolbarActions();
-            input.value = '';
         },
 
         positionToolbarIfShown: function () {
@@ -1951,11 +2027,7 @@ if (typeof module === 'object') {
                         paragraphs = e.clipboardData.getData(dataFormatPlain).split(/[\r\n]/g);
                         for (p = 0; p < paragraphs.length; p += 1) {
                             if (paragraphs[p] !== '') {
-                                if (navigator.userAgent.match(/firefox/i) && p === 0) {
-                                    html += self.htmlEntities(paragraphs[p]);
-                                } else {
-                                    html += '<p>' + self.htmlEntities(paragraphs[p]) + '</p>';
-                                }
+                                html += '<p>' + self.htmlEntities(paragraphs[p]) + '</p>';
                             }
                         }
                         insertHTMLCommand(self.options.ownerDocument, html);
@@ -2092,7 +2164,7 @@ if (typeof module === 'object') {
                 }
 
             }
-            this.options.ownerDocument.execCommand('insertHTML', false, fragmentBody.innerHTML.replace(/&nbsp;/g, ' '));
+            insertHTMLCommand(this.options.ownerDocument, fragmentBody.innerHTML.replace(/&nbsp;/g, ' '));
         },
         isCommonBlock: function (el) {
             return (el && (el.tagName.toLowerCase() === 'p' || el.tagName.toLowerCase() === 'div'));
@@ -2138,7 +2210,10 @@ if (typeof module === 'object') {
             var i,
                 el,
                 new_el,
-                spans = container_el.querySelectorAll('.replace-with');
+                spans = container_el.querySelectorAll('.replace-with'),
+                isCEF = function (el) {
+                    return (el && el.nodeName !== '#text' && el.getAttribute('contenteditable') === 'false');
+                };
 
             for (i = 0; i < spans.length; i += 1) {
 
@@ -2164,6 +2239,11 @@ if (typeof module === 'object') {
 
                 el = spans[i];
 
+                // bail if span is in contenteditable = false
+                if (this.traverseUp(el, isCEF)) {
+                    return false;
+                }
+
                 // remove empty spans, replace others with their contents
                 if (/^\s*$/.test()) {
                     el.parentNode.removeChild(el);

data/vendor/assets/stylesheets/medium-editor/medium-editor.css

@@ -124,8 +124,7 @@
 
 .stalker-toolbar {
   -webkit-animation: pop-upwards 160ms forwards linear;
-  -ms-animation: pop-upwards 160ms forwards linear;
-  animation: pop-upwards 160ms forwards linear;
+          animation: pop-upwards 160ms forwards linear;
   -webkit-transition: top 0.075s ease-out, left 0.075s ease-out;
           transition: top 0.075s ease-out, left 0.075s ease-out; }
 
@@ -150,8 +149,7 @@
       outline: 0;
       border: none;
       box-shadow: none;
-      -webkit-appearance: none;
-      -moz-appearance: none; }
+      appearance: none; }
   .medium-editor-toolbar-form label {
     display: block; }
   .medium-editor-toolbar-form a {
@@ -170,3 +168,35 @@
     content: attr(data-placeholder) !important;
     font-style: italic;
     white-space: pre; }
+
+.medium-editor-dragover {
+  background: #ddd; }
+
+.medium-image-loading {
+  width: 40px;
+  height: 40px;
+  background-color: #333;
+  display: inline-block;
+  border-radius: 100%;
+  -webkit-animation: medium-image-loading-animation 1s infinite ease-in-out;
+          animation: medium-image-loading-animation 1s infinite ease-in-out; }
+
+@-webkit-keyframes medium-image-loading-animation {
+  0% {
+    -webkit-transform: scale(0);
+            transform: scale(0); }
+
+  100% {
+    -webkit-transform: scale(1);
+            transform: scale(1);
+    opacity: 0; } }
+
+@keyframes medium-image-loading-animation {
+  0% {
+    -webkit-transform: scale(0);
+            transform: scale(0); }
+
+  100% {
+    -webkit-transform: scale(1);
+            transform: scale(1);
+    opacity: 0; } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: medium-editor-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Ahmet Sezgin Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties