scrivito_editors 1.10.0 → 1.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ad50c907915e6d0adb52a2a5b385bf2a79eb68
-  data.tar.gz: 7ede71197cea0200101ea5e8672a50acafd8e5ea
+  metadata.gz: 11c79b5a6725986a1b71d9ffa0e43e49600c699f
+  data.tar.gz: d6029ce733ed0b6608667aa8eb0417591aadd0ee
 SHA512:
-  metadata.gz: 0c0d744ee963b631c4b7c015d8dd8c10d117466b120c370d510e026f1a1b04903252c8d152e5c8e441eb4568dca9b0eb0db7ae22d8dfed1ba7a488960c8852d3
-  data.tar.gz: 424b38185c3fee078fa83590a2166f5e38066671de87959dc98f37ad9243428ecafe21fbaa2955c355ad312c1f8acafebebcd6717da4b67475d833c9f5f403f0
+  metadata.gz: 2057de1a15aea733100af026ab0043c228a04ca9e1a227e310559b3c1a782e1c8451d372a2d0055036bc59f67f4d60ff75495c4b20fa563254705f84809811a2
+  data.tar.gz: 8cf0536e14483ba4704da98f9923e1f77e4dba2be51f1c36902b4af9e491e47584656b09fd367892cbd0ac6bb6db6364d0690bfe1956eabaea847cb91f745914

data/app/assets/javascripts/scrivito_editors/medium_editor.js

@@ -5,20 +5,33 @@
     name: 'scrivito_anchor',
     proxy: null,
     contentDefault: '<i class="scrivito_customer_icon sci_link"></i>',
+    init: function() {
+      var ref;
+      MediumEditor.extensions.anchor.prototype.init.apply(this, arguments);
+      return this.targetCheckbox = (ref = this.getEditorOption('anchor')) != null ? ref.targetCheckbox : void 0;
+    },
     handleClick: function(event) {
-      var firstTextElement, linkElement, linkValue, selectedParent, selectionRange;
+      var linkElement, selectedParent, selectionRange;
+      event.preventDefault();
+      event.stopPropagation();
       if (!this.isDisplayed()) {
         selectionRange = MediumEditor.selection.getSelectionRange(this.document);
         selectedParent = MediumEditor.selection.getSelectedParentElement(selectionRange);
-        firstTextElement = MediumEditor.util.getFirstTextNode(selectedParent);
-        linkElement = MediumEditor.util.getClosestTag(firstTextElement, 'a');
-        linkValue = $(linkElement).attr('href');
-        this.showForm(linkValue);
+        linkElement = MediumEditor.util.getClosestTag(selectedParent, 'a');
+        this.showForm({
+          value: $(linkElement).attr('href') || null,
+          target: $(linkElement).attr('target') || null
+        });
       }
       return false;
     },
     getTemplate: function() {
-      return "<i class='medium-editor-toolbar-browse scrivito_customer_icon sci_collection'></i>" + ("<input type='text' class='medium-editor-toolbar-input' placeholder='" + this.placeholderText + "'>") + "<i class='medium-editor-toolbar-save scrivito_customer_icon sci_check'></i>" + "<i class='medium-editor-toolbar-close scrivito_customer_icon sci_cross'></i>";
+      var targetCheckboxTemplate;
+      targetCheckboxTemplate = "";
+      if (this.targetCheckbox) {
+        targetCheckboxTemplate = "<div class='medium-editor-toolbar-form-row medium-editor-toolbar-anchor-target-toggle'>\n  <label>\n    <input type='checkbox' class='medium-editor-toolbar-anchor-target'>\n    <i class='scrivito_customer_icon sci_inv_check'></i>\n    <i class='scrivito_customer_icon sci_rounded_square'></i>\n    " + this.targetCheckboxText + "\n  </label>\n</div>";
+      }
+      return ("<i class='medium-editor-toolbar-browse scrivito_customer_icon sci_collection'></i>\n<input type='text' class='medium-editor-toolbar-input' placeholder='" + this.placeholderText + "'>\n<i class='medium-editor-toolbar-save scrivito_customer_icon sci_check'></i>\n<i class='medium-editor-toolbar-close scrivito_customer_icon sci_cross'></i>\n" + targetCheckboxTemplate).replace(/\n\s*/g, "");
     },
     attachFormEvents: function(form) {
       var input;
@@ -79,10 +92,11 @@
   };
 
   customOptions = function() {
-    if (typeof scrivito.editors.medium_editor.options === 'function') {
+    var ref, ref1, ref2, ref3;
+    if (typeof (typeof scrivito !== "undefined" && scrivito !== null ? (ref = scrivito.editors) != null ? (ref1 = ref.medium_editor) != null ? ref1.options : void 0 : void 0 : void 0) === 'function') {
       return scrivito.editors.medium_editor.options();
     } else {
-      return scrivito.editors.medium_editor.options;
+      return (typeof scrivito !== "undefined" && scrivito !== null ? (ref2 = scrivito.editors) != null ? (ref3 = ref2.medium_editor) != null ? ref3.options : void 0 : void 0 : void 0) || {};
     }
   };
 

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

@@ -629,11 +629,10 @@ MediumEditor.extensions = {};
         splitEndNodeIfNeeded: function (currentNode, newNode, matchEndIndex, currentTextIndex) {
             var textIndexOfEndOfFarthestNode,
                 endSplitPoint;
-            textIndexOfEndOfFarthestNode = currentTextIndex + (newNode || currentNode).nodeValue.length +
-                    (newNode ? currentNode.nodeValue.length : 0) -
-                    1;
-            endSplitPoint = (newNode || currentNode).nodeValue.length -
-                    (textIndexOfEndOfFarthestNode + 1 - matchEndIndex);
+            textIndexOfEndOfFarthestNode = currentTextIndex + currentNode.nodeValue.length +
+                    (newNode ? newNode.nodeValue.length : 0) - 1;
+            endSplitPoint = matchEndIndex - currentTextIndex -
+                    (newNode ? currentNode.nodeValue.length : 0);
             if (textIndexOfEndOfFarthestNode >= matchEndIndex &&
                     currentTextIndex !== textIndexOfEndOfFarthestNode &&
                     endSplitPoint !== 0) {
@@ -1020,6 +1019,11 @@ MediumEditor.extensions = {};
             }
         },
 
+        /*
+         * this function adds one or several classes on an a element.
+         * if el parameter is not an a, it will look for a children of el.
+         * if no a children are found, it will look for the a parent.
+         */
         addClassToAnchors: function (el, buttonClass) {
             var classes = buttonClass.split(' '),
                 i,
@@ -1029,7 +1033,13 @@ MediumEditor.extensions = {};
                     el.classList.add(classes[j]);
                 }
             } else {
-                el = el.getElementsByTagName('a');
+                var aChildren = el.getElementsByTagName('a');
+                if (aChildren.length === 0) {
+                    var parentAnchor = Util.getClosestTag(el, 'a');
+                    el = parentAnchor ? [parentAnchor] : [];
+                } else {
+                    el = aChildren;
+                }
                 for (i = 0; i < el.length; i += 1) {
                     for (j = 0; j < classes.length; j += 1) {
                         el[i].classList.add(classes[j]);
@@ -2485,15 +2495,17 @@ MediumEditor.extensions = {};
                 win = this.base.options.contentWindow,
                 doc = this.base.options.ownerDocument;
 
-            targets = MediumEditor.util.isElement(targets) || [win, doc].indexOf(targets) > -1 ? [targets] : targets;
+            if (targets !== null) {
+                targets = MediumEditor.util.isElement(targets) || [win, doc].indexOf(targets) > -1 ? [targets] : targets;
 
-            Array.prototype.forEach.call(targets, function (target) {
-                index = this.indexOfListener(target, event, listener, useCapture);
-                if (index !== -1) {
-                    e = this.events.splice(index, 1)[0];
-                    e[0].removeEventListener(e[1], e[2], e[3]);
-                }
-            }.bind(this));
+                Array.prototype.forEach.call(targets, function (target) {
+                    index = this.indexOfListener(target, event, listener, useCapture);
+                    if (index !== -1) {
+                        e = this.events.splice(index, 1)[0];
+                        e[0].removeEventListener(e[1], e[2], e[3]);
+                    }
+                }.bind(this));
+            }
         },
 
         indexOfListener: function (target, event, listener, useCapture) {
@@ -3350,6 +3362,14 @@ MediumEditor.extensions = {};
             contentDefault: '<b>image</b>',
             contentFA: '<i class="fa fa-picture-o"></i>'
         },
+        'html': {
+            name: 'html',
+            action: 'html',
+            aria: 'evaluate html',
+            tagNames: ['iframe', 'object'],
+            contentDefault: '<b>html</b>',
+            contentFA: '<i class="fa fa-code"></i>'
+        },
         'orderedlist': {
             name: 'orderedlist',
             action: 'insertorderedlist',
@@ -3511,6 +3531,7 @@ MediumEditor.extensions = {};
     };
 
 })();
+
 (function () {
     'use strict';
 
@@ -3890,22 +3911,35 @@ MediumEditor.extensions = {};
             // Matches common external protocols "mailto:" "tel:" "maps:"
             // Matches relative hash link, begins with "#"
             var urlSchemeRegex = /^([a-z]+:)?\/\/|^(mailto|tel|maps):|^\#/i,
+                hasScheme = urlSchemeRegex.test(value),
+                scheme = '',
                 // telRegex is a regex for checking if the string is a telephone number
                 telRegex = /^\+?\s?\(?(?:\d\s?\-?\)?){3,20}$/,
-                split = value.split('?'),
-                path = split[0],
-                query = split[1];
+                urlParts = value.match(/^(.*?)(?:\?(.*?))?(?:#(.*))?$/),
+                path = urlParts[1],
+                query = urlParts[2],
+                fragment = urlParts[3];
 
             if (telRegex.test(value)) {
                 return 'tel:' + value;
-            } else {
-                // Check for URL scheme and default to http:// if none found
-                return (urlSchemeRegex.test(value) ? '' : 'http://') +
-                    // Ensure path is encoded
-                    this.ensureEncodedUri(path) +
-                    // Ensure query is encoded
-                    (query === undefined ? '' : '?' + this.ensureEncodedQuery(query));
             }
+
+            if (!hasScheme) {
+                var host = path.split('/')[0];
+                // if the host part of the path looks like a hostname
+                if (host.match(/.+(\.|:).+/) || host === 'localhost') {
+                    scheme = 'http://';
+                }
+            }
+
+            return scheme +
+                // Ensure path is encoded
+                this.ensureEncodedUri(path) +
+                // Ensure query is encoded
+                (query === undefined ? '' : '?' + this.ensureEncodedQuery(query)) +
+                // Include fragment unencoded as encodeUriComponent is too
+                // heavy handed for the many characters allowed in a fragment
+                (fragment === undefined ? '' : '#' + fragment);
         },
 
         doFormCancel: function () {
@@ -4067,7 +4101,9 @@ MediumEditor.extensions = {};
         },
 
         hidePreview: function () {
-            this.anchorPreview.classList.remove('medium-editor-anchor-preview-active');
+            if (this.anchorPreview) {
+                this.anchorPreview.classList.remove('medium-editor-anchor-preview-active');
+            }
             this.activeAnchor = null;
         },
 
@@ -4305,7 +4341,8 @@ MediumEditor.extensions = {};
     var WHITESPACE_CHARS,
         KNOWN_TLDS_FRAGMENT,
         LINK_REGEXP_TEXT,
-        KNOWN_TLDS_REGEXP;
+        KNOWN_TLDS_REGEXP,
+        LINK_REGEXP;
 
     WHITESPACE_CHARS = [' ', '\t', '\n', '\r', '\u00A0', '\u2000', '\u2001', '\u2002', '\u2003',
                                     '\u2028', '\u2029'];
@@ -4327,6 +4364,8 @@ MediumEditor.extensions = {};
 
     KNOWN_TLDS_REGEXP = new RegExp('^(' + KNOWN_TLDS_FRAGMENT + ')$', 'i');
 
+    LINK_REGEXP = new RegExp(LINK_REGEXP_TEXT, 'gi');
+
     function nodeIsNotInsideAnchorTag(node) {
         return !MediumEditor.util.getClosestTag(node, 'a');
     }
@@ -4508,12 +4547,11 @@ MediumEditor.extensions = {};
         },
 
         findLinkableText: function (contenteditable) {
-            var linkRegExp = new RegExp(LINK_REGEXP_TEXT, 'gi'),
-                textContent = contenteditable.textContent,
+            var textContent = contenteditable.textContent,
                 match = null,
                 matches = [];
 
-            while ((match = linkRegExp.exec(textContent)) !== null) {
+            while ((match = LINK_REGEXP.exec(textContent)) !== null) {
                 var matchOk = true,
                     matchEnd = match.index + match[0].length;
                 // If the regexp detected something as a link that has text immediately preceding/following it, bail out.
@@ -7111,6 +7149,11 @@ MediumEditor.extensions = {};
             return this.options.ownerDocument.execCommand('insertImage', false, src);
         }
 
+        if (action === 'html') {
+            var html = this.options.contentWindow.getSelection().toString().trim();
+            return MediumEditor.util.insertHTMLCommand(this.options.ownerDocument, html);
+        }
+
         /* Issue: https://github.com/yabwe/medium-editor/issues/595
          * If the action is to justify the text */
         if (justifyAction.exec(action)) {
@@ -7826,7 +7869,7 @@ MediumEditor.parseVersionString = function (release) {
 
 MediumEditor.version = MediumEditor.parseVersionString.call(this, ({
     // grunt-bump looks for this:
-    'version': '5.22.1'
+    'version': '5.23.0'
 }).version);
 
     return MediumEditor;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
@@ -50,28 +50,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0.rc1
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0.rc1
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -184,10 +184,6 @@ files:
 - app/assets/fonts/editing_icons-webfont.woff
 - app/assets/javascripts/scrivito_editors.js
 - app/assets/javascripts/scrivito_editors/binary_editor.js
-- app/assets/javascripts/scrivito_editors/controller_api/controller_content_proxy.js
-- app/assets/javascripts/scrivito_editors/controller_api/html_editor.js
-- app/assets/javascripts/scrivito_editors/controller_api/reference_editor.js
-- app/assets/javascripts/scrivito_editors/controller_api/string_editor.js
 - app/assets/javascripts/scrivito_editors/date_editor.js
 - app/assets/javascripts/scrivito_editors/default_editor.js
 - app/assets/javascripts/scrivito_editors/dependencies/jquery_ui.js.erb

data/app/assets/javascripts/scrivito_editors/controller_api/controller_content_proxy.js

@@ -1,54 +0,0 @@
-'use strict';
-
-var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
-
-scrivito.editors.ControllerContentProxy = (function () {
-  function ControllerContentProxy(domNode, controller) {
-    _classCallCheck(this, ControllerContentProxy);
-
-    this.domNode = domNode;
-    this.controller = controller;
-  }
-
-  _createClass(ControllerContentProxy, [{
-    key: 'content',
-    value: function content() {
-      return this.controller.content;
-    }
-  }, {
-    key: 'idFromPath',
-    value: function idFromPath(path) {
-      if (path.match(/^objid:/)) {
-        return path.replace(/^objid:/, '');
-      }
-    }
-  }, {
-    key: 'jQueryElement',
-    value: function jQueryElement() {
-      return $(this.domNode);
-    }
-  }, {
-    key: 'pathForId',
-    value: function pathForId(id) {
-      return 'objid:' + id;
-    }
-  }, {
-    key: 'save',
-    value: function save(content) {
-      this.controller.content = content;
-      var promise = { done: function done(callback) {
-          callback();return promise;
-        } };
-      return promise;
-    }
-  }, {
-    key: 'trigger',
-    value: function trigger(event) {
-      // ignore
-    }
-  }]);
-
-  return ControllerContentProxy;
-})();

data/app/assets/javascripts/scrivito_editors/controller_api/html_editor.js

@@ -1,50 +0,0 @@
-"use strict";
-
-var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-scrivito.editors.HtmlEditor = (function () {
-  _createClass(HtmlEditor, null, [{
-    key: "canEdit",
-    value: function canEdit(_ref) {
-      var type = _ref.type;
-
-      return type == "html";
-    }
-  }]);
-
-  function HtmlEditor(_ref2) {
-    var controller = _ref2.controller;
-
-    _classCallCheck(this, HtmlEditor);
-
-    this.controller = controller;
-  }
-
-  _createClass(HtmlEditor, [{
-    key: "editorWillBeActivated",
-    value: function editorWillBeActivated() {
-      this.controller.setDomMode('Replace');
-    }
-  }, {
-    key: "editorWillBeDeactivated",
-    value: function editorWillBeDeactivated() {
-      // empty
-    }
-  }, {
-    key: "editorDomWasMounted",
-    value: function editorDomWasMounted(domNode) {
-      scrivito.editors._applyPlaceholderToElement(domNode);
-      $(domNode).html(this.controller.content);
-      var editorProxy = new scrivito.editors.ControllerContentProxy(domNode, this.controller);
-      scrivito.editors.medium_editor._activateWithProxy(editorProxy);
-    }
-  }]);
-
-  return HtmlEditor;
-})();
-
-if (scrivito.registerEditor) {
-  scrivito.registerEditor(scrivito.editors.HtmlEditor);
-}

data/app/assets/javascripts/scrivito_editors/controller_api/reference_editor.js

@@ -1,66 +0,0 @@
-"use strict";
-
-var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-scrivito.editors.ReferenceEditor = (function () {
-  _createClass(ReferenceEditor, null, [{
-    key: "canEdit",
-    value: function canEdit(_ref) {
-      var type = _ref.type;
-
-      return type == "reference";
-    }
-  }]);
-
-  function ReferenceEditor(_ref2) {
-    var controller = _ref2.controller;
-
-    _classCallCheck(this, ReferenceEditor);
-
-    this.controller = controller;
-  }
-
-  _createClass(ReferenceEditor, [{
-    key: "editorWillBeActivated",
-    value: function editorWillBeActivated() {
-      // empty
-    }
-  }, {
-    key: "editorWillBeDeactivated",
-    value: function editorWillBeDeactivated() {
-      // empty
-    }
-  }, {
-    key: "onClick",
-    value: function onClick(_ref3) {
-      var _this = this;
-
-      var event = _ref3.event;
-
-      scrivito.content_browser.open({
-        selection: this._currentSelection(),
-        selection_mode: 'single'
-      }).done(function (ids) {
-        return _this._saveContentBrowserSelection(ids);
-      });
-    }
-  }, {
-    key: "_currentSelection",
-    value: function _currentSelection() {
-      return this.controller.content ? [this.controller.content.id] : [];
-    }
-  }, {
-    key: "_saveContentBrowserSelection",
-    value: function _saveContentBrowserSelection(ids) {
-      this.controller.content = ids[0] || null;
-    }
-  }]);
-
-  return ReferenceEditor;
-})();
-
-if (scrivito.registerEditor) {
-  scrivito.registerEditor(scrivito.editors.ReferenceEditor);
-}

data/app/assets/javascripts/scrivito_editors/controller_api/string_editor.js

@@ -1,54 +0,0 @@
-"use strict";
-
-var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-scrivito.editors.StringEditor = (function () {
-  _createClass(StringEditor, null, [{
-    key: "canEdit",
-    value: function canEdit(_ref) {
-      var type = _ref.type;
-      var tag = _ref.tag;
-
-      return type == "string";
-    }
-  }]);
-
-  function StringEditor(_ref2) {
-    var attributeInfo = _ref2.attributeInfo;
-    var controller = _ref2.controller;
-
-    _classCallCheck(this, StringEditor);
-
-    this.attributeInfo = attributeInfo;
-    this.controller = controller;
-  }
-
-  _createClass(StringEditor, [{
-    key: "editorWillBeActivated",
-    value: function editorWillBeActivated() {
-      this.controller.setDomMode('Replace');
-    }
-  }, {
-    key: "editorWillBeDeactivated",
-    value: function editorWillBeDeactivated() {}
-  }, {
-    key: "editorDomWasMounted",
-    value: function editorDomWasMounted(domNode) {
-      scrivito.editors._applyPlaceholderToElement(domNode);
-      $(domNode).text(this.controller.content);
-      var editorProxy = new scrivito.editors.ControllerContentProxy(domNode, this.controller);
-      scrivito.editors.string_editor._activateWithProxy(editorProxy);
-    }
-  }, {
-    key: "onClick",
-    value: function onClick() {}
-  }]);
-
-  return StringEditor;
-})();
-
-if (scrivito.registerEditor) {
-  scrivito.registerEditor(scrivito.editors.StringEditor);
-}