scrivito_editors 1.11.0 → 1.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec6c847c437f2ae3f592b781f75637acdd1e3f11
-  data.tar.gz: 0fb978f3d3b9ec0c711245f05be66bc35f3241be
+  metadata.gz: a6f914ddf4d421537887c7714410ba84e7592704
+  data.tar.gz: ed4423c82f6d1ec8afbfbf8a971ad348f242464a
 SHA512:
-  metadata.gz: bfc726a6f71620f370850d5a300cfac7698f06689b94db101bb2dee404d39af85bf0d3cda00b7cc317d2ff695ba51a11da537ac5755b15f3fee725bc8ca62398
-  data.tar.gz: 3a69c87c061bb3c0a5e63d9409c1ca6f6e9d933d07610df30bc56f6344fca661ad17eefb1bba16db25c082b74f782e58b063997a0c42caeffbf85fd255a2f7e2
+  metadata.gz: fdd02d54714ef3c1a8f7ab6cbe4eea2afe0126d91b9f1bf8fb7b2f03ea8166a4ecbf4cf07db882a45188e80e0375a7ae58634d95ab6cd2a0ad31c532d2046a0c
+  data.tar.gz: 50230072a867d490d05f7e9d668d555458c98d40b23a0335a1fd953357c078363fb2a01753e75f26f8f434055fb00e30e727acaef70c2d650c24fccd8bd307f6

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

@@ -44,7 +44,7 @@
           selection = (id = _this.proxy.idFromPath(input.val())) ? [id] : [];
           cmsField = $(_this.base.origElements);
           scrivito.content_browser.open({
-            filter: cmsField.data('scrivitoEditorsFilter'),
+            filters: cmsField.data('scrivitoEditorsFilter'),
             filter_context: cmsField.data('scrivitoEditorsFilterContext'),
             selection: selection,
             selection_mode: 'single'
@@ -78,6 +78,9 @@
 
   defaultOptions = function() {
     return {
+      anchor: {
+        targetCheckbox: true
+      },
       anchorPreview: false,
       extensions: {
         scrivito_anchor: new ScrivitoAnchor,

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

@@ -1,5 +1,5 @@
 (function() {
-  var DOUBLE_CLICK_MS, activate, cleanUp, cmsFieldAndPastedContent, finishEditing, getCurrentContent, isNewlineAllowed, onBlur, onFocus, onInput, onKey, prepareForEditing, save;
+  var DOUBLE_CLICK_MS, activate, cleanUp, cmsFieldAndPastedContent, finishEditing, fixSelectionForFirefox, getCurrentContent, isNewlineAllowed, onBlur, onClick, onFocus, onInput, onKey, prepareForEditing, save;
 
   onKey = function(event, proxy) {
     var cmsField, key;
@@ -26,11 +26,16 @@
     return prepareForEditing(proxy.jQueryElement());
   };
 
+  onClick = function(proxy) {
+    return fixSelectionForFirefox(proxy.jQueryElement());
+  };
+
   onBlur = function(proxy) {
     save(proxy).done(function() {
       return proxy.trigger('scrivito_editors:blur');
     });
-    return finishEditing(proxy);
+    finishEditing(proxy);
+    return prepareForEditing(proxy.jQueryElement());
   };
 
   save = function(proxy) {
@@ -42,17 +47,8 @@
   };
 
   getCurrentContent = function(cmsField) {
-    var clone, content;
     cleanUp(cmsField);
-    clone = cmsFieldAndPastedContent(cmsField).clone();
-    clone.find('div:not(:has(br)),p:not(:first)').before('\n');
-    clone.find('br').replaceWith('\n');
-    content = clone.text();
-    clone.remove();
-    if (!isNewlineAllowed(cmsField)) {
-      content = content.replace(/\n$/, '');
-    }
-    return content;
+    return cmsField[0].innerText.replace(/\r\n/g, '\n').replace(/\n+$/, '');
   };
 
   cleanUp = function(cmsField) {
@@ -92,7 +88,7 @@
     if (isNewlineAllowed(cmsField) && !cmsField.data('scrivito_editors_prepared_for_editing')) {
       cmsField.data('scrivito_editors_prepared_for_editing', true);
       html = cmsField.html();
-      htmlNl2Br = html.replace(/\n/g, '<br />');
+      htmlNl2Br = html.replace(/\r?\n/g, '<br />');
       if (html !== htmlNl2Br) {
         return cmsField.html(htmlNl2Br);
       }
@@ -108,12 +104,25 @@
 
   DOUBLE_CLICK_MS = 300;
 
+  fixSelectionForFirefox = function(cmsField) {
+    var sel;
+    sel = document.getSelection();
+    if (!sel.anchorNode || !sel.focusNode) {
+      return;
+    }
+    if (!cmsField.find(sel.anchorNode).addBack(sel.anchorNode).length || !cmsField.find(sel.focusNode).addBack(sel.focusNode).length) {
+      return sel.selectAllChildren(cmsField[0]);
+    }
+  };
+
   activate = function(proxy) {
     var cmsField;
     cmsField = proxy.jQueryElement();
     scrivito.editors.applyPlaceholder(cmsField);
     cmsField.attr('contenteditable', true).blur(function() {
       return onBlur(proxy);
+    }).click(function() {
+      return onClick(proxy);
     }).focus(function() {
       return onFocus(proxy);
     }).keypress(function(event) {

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

@@ -544,6 +544,9 @@ MediumEditor.extensions = {};
             Util.moveTextRangeIntoElement(textNodes[0], textNodes[textNodes.length - 1], anchor);
             anchor.setAttribute('href', href);
             if (target) {
+                if (target === '_blank') {
+                    anchor.setAttribute('rel', 'noopener noreferrer');
+                }
                 anchor.setAttribute('target', target);
             }
             return anchor;
@@ -989,12 +992,14 @@ MediumEditor.extensions = {};
             var i, url = anchorUrl || false;
             if (el.nodeName.toLowerCase() === 'a') {
                 el.target = '_blank';
+                el.rel = 'noopener noreferrer';
             } else {
                 el = el.getElementsByTagName('a');
 
                 for (i = 0; i < el.length; i += 1) {
                     if (false === url || url === el[i].attributes.href.value) {
                         el[i].target = '_blank';
+                        el[i].rel = 'noopener noreferrer';
                     }
                 }
             }
@@ -1008,12 +1013,14 @@ MediumEditor.extensions = {};
             var i;
             if (el.nodeName.toLowerCase() === 'a') {
                 el.removeAttribute('target');
+                el.removeAttribute('rel');
             } else {
                 el = el.getElementsByTagName('a');
 
                 for (i = 0; i < el.length; i += 1) {
                     if (anchorUrl === el[i].attributes.href.value) {
                         el[i].removeAttribute('target');
+                        el[i].removeAttribute('rel');
                     }
                 }
             }
@@ -3764,8 +3771,8 @@ MediumEditor.extensions = {};
                 // 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>',
+                    '<input type="checkbox" class="medium-editor-toolbar-anchor-target" id="medium-editor-toolbar-anchor-target-field-' + this.getEditorId() + '">',
+                    '<label for="medium-editor-toolbar-anchor-target-field-' + this.getEditorId() + '">',
                     this.targetCheckboxText,
                     '</label>',
                     '</div>'
@@ -5430,8 +5437,10 @@ MediumEditor.extensions = {};
                 // on empty line, rects is empty so we grab information from the first container of the range
                 if (rects.length) {
                     top += rects[0].top;
-                } else {
+                } else if (range.startContainer.getBoundingClientRect !== undefined) {
                     top += range.startContainer.getBoundingClientRect().top;
+                } else {
+                    top += range.getBoundingClientRect().top;
                 }
             }
 
@@ -7869,7 +7878,7 @@ MediumEditor.parseVersionString = function (release) {
 
 MediumEditor.version = MediumEditor.parseVersionString.call(this, ({
     // grunt-bump looks for this:
-    'version': '5.23.0'
+    'version': '5.23.2'
 }).version);
 
     return MediumEditor;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-10-17 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.11.0
+        version: 1.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0.rc1
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0.rc1
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -330,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.8'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Scrivito Editors