scrivito_editors 1.15.0 → 1.17.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19dcf4bce3ab292aa553dfc4ca22ff6d0b11d61bf62290f13b803528714faf57
-  data.tar.gz: e96e95d48e58847413bb3c86696b40b24729f5d887a72a3203579f1710b562ad
+  metadata.gz: a690eed8a769af8209bb8698194012365f4cc4db0422edd9449f4282b8f72151
+  data.tar.gz: 3fb4f11e84799d09656236679f515266375d5dd0a2dce8e645d8269cbdd30460
 SHA512:
-  metadata.gz: 9bf580c25a50fc6bec987d5c33e74fa64ee53849eaf12d4b175bc98bdb9562aa520c2c169a557d59800d760913f0315395bd63cc29b9c6d7498f9aa1e035eadf
-  data.tar.gz: 51400b1401af4559984b368cc9ab34045ac73dd0929e8b797dd8e32345f0a643d99305ba95d7f0b77f936fb5da9a271a36f7c1499c4d821f715e4725b35851b3
+  metadata.gz: 52a198b84dbfe120929f72c693db30a1901d9ffcf534e424816d5ca6555923a25069d546c5be19312f253c8bb4d30d7089fd782107e152d017000adf467a067d
+  data.tar.gz: 0cd34437bbe1ecbc5d6d4c88b30e6512e2f1f5ce8622c7e58912bdea5a3f5ad9faa576a87960eb4781a6db79eb64e0227080fe69c4486a1d0ed791b0f60a31d6

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2018 Infopark AG (http://www.infopark.com)
+Copyright (c) 2009 - 2020 Infopark Group GmbH (http://www.infopark.com)
 
 This software can be used and modified under the LGPL-3.0. Please refer to
 http://www.gnu.org/licenses/lgpl-3.0.html for the license text.

data/README.md

@@ -12,7 +12,7 @@ Please refer to the
 [latest installation and usage instructions](https://scrivito.com/editors).
 
 ## License
-Copyright (c) 2009 - 2018 Infopark AG (http://www.infopark.com)
+Copyright (c) 2009 - 2020 Infopark Group GmbH (http://www.infopark.com)
 
 This software can be used and modified under the LGPL-3.0. Please refer to
 http://www.gnu.org/licenses/lgpl-3.0.html for the license text.

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

@@ -10,54 +10,62 @@
       MediumEditor.extensions.anchor.prototype.init.apply(this, arguments);
       return this.targetCheckbox = (ref = this.getEditorOption('anchor')) != null ? ref.targetCheckbox : void 0;
     },
+    showForm: function(opts) {
+      MediumEditor.extensions.anchor.prototype.showForm.call(this, opts);
+      return this.updateRelUi(opts);
+    },
     handleClick: function(event) {
-      var linkElement, selectedParent, selectionRange;
+      var href, linkElement, rel, selectedParent, selectionRange, target;
       event.preventDefault();
       event.stopPropagation();
+      $('.scrivito_medium_link_collapse').removeClass('show');
       if (!this.isDisplayed()) {
         selectionRange = MediumEditor.selection.getSelectionRange(this.document);
         selectedParent = MediumEditor.selection.getSelectedParentElement(selectionRange);
         linkElement = MediumEditor.util.getClosestTag(selectedParent, 'a');
+        href = target = rel = null;
+        if (linkElement) {
+          linkElement = $(linkElement);
+          href = linkElement.attr('href') || null;
+          target = linkElement.attr('target') || null;
+          rel = linkElement.attr('rel') || null;
+        }
         this.showForm({
-          value: $(linkElement).attr('href') || null,
-          target: $(linkElement).attr('target') || null
+          value: href,
+          target: target,
+          rel: rel
         });
       }
       return false;
     },
     getTemplate: function() {
-      var targetCheckboxTemplate;
+      var classTargetCheckboxNA, targetCheckboxTemplate;
       targetCheckboxTemplate = "";
+      classTargetCheckboxNA = "scrivito_target_checkbox_not_available";
       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>";
+        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_icon scrivito_link_icon scrivito_icon_new_window scrivito_active_open_in_new_tab ' title='Open link in new tab'></i>\n    <i class='scrivito_icon scrivito_link_icon scrivito_icon_new_window' title='Open link in new tab'></i>\n  </label>\n</div>";
+        classTargetCheckboxNA = "";
       }
-      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, "");
+      return ("<i class='medium-editor-toolbar-browse scrivito_customer_icon sci_collection' title='Open Content Browser'></i>\n<input type='text' class='medium-editor-toolbar-input " + classTargetCheckboxNA + "' placeholder='" + this.placeholderText + "'>\n<div class='medium-editor-toolbar-form-wrapper'>\n  " + targetCheckboxTemplate + "\n  <i class='scrivito_icon scrivito_icon_gear' data-scrivito-medium-editor=\"rel_button\" title='SEO settings'></i>\n  <span class='medium-editor-toolbar-save'>Save</span>\n  <i class='medium-editor-toolbar-close scrivito_customer_icon sci_cross' style='display: none'></i>\n</div>\n<div class='scrivito_medium_link_collapse'>\n  <div class='scrivito_medium_link_collapse_body'>\n    <div class='scrivito_medium_detail_label'>Rel attribute value</div>\n    <div class='scrivito_medium_notice_body'>\n      Search engines use a link's rel attribute to determine how to handle the linked document or resource.\n    </div>\n    <ul class='scrivito_enum_attribute scrivito_multi'>\n      <li data-scrivito-rel=\"noindex\">noindex</li>\n      <li data-scrivito-rel=\"nofollow\">nofollow</li>\n      <li data-scrivito-rel=\"noarchive\">noarchive</li>\n      <li data-scrivito-rel=\"nosnippet\">nosnippet</li>\n      <li data-scrivito-rel=\"noopener\">noopener</li>\n      <li data-scrivito-rel=\"noreferrer\">noreferrer</li>\n      <li data-scrivito-rel=\"notranslate\">notranslate</li>\n    </ul>\n  </div>\n</div>").replace(/\n\s*/g, "");
     },
     attachFormEvents: function(form) {
       var input;
       MediumEditor.extensions.anchor.prototype.attachFormEvents.call(this, form);
       form = $(form);
       input = form.find('.medium-editor-toolbar-input');
+      form.find('[data-scrivito-rel]').on('click', (function(_this) {
+        return function(event) {
+          return _this.onRelSelectionButtonClick(event);
+        };
+      })(this));
+      form.find('.scrivito_icon_gear').on('click', (function(_this) {
+        return function() {
+          return _this.onToggleRelPanelButtonClick(form);
+        };
+      })(this));
       return form.find('.medium-editor-toolbar-browse').on('click', (function(_this) {
         return function() {
-          var cmsField, id, selection;
-          selection = (id = _this.proxy.idFromPath(input.val())) ? [id] : [];
-          cmsField = $(_this.base.origElements);
-          scrivito.content_browser.open({
-            filters: cmsField.data('scrivitoEditorsFilter'),
-            filter_context: cmsField.data('scrivitoEditorsFilterContext'),
-            selection: selection,
-            selection_mode: 'single'
-          }).always(function() {
-            return input.focus();
-          }).done(function(selection) {
-            if (selection.length) {
-              return input.val(_this.proxy.pathForId(selection[0]));
-            } else {
-              return input.val('');
-            }
-          });
-          return false;
+          return _this.onContentBrowserButtonClick(input);
         };
       })(this));
     },
@@ -65,10 +73,93 @@
       this.base.restoreSelection();
       if (opts.value) {
         this.execAction(this.action, opts);
+        this.updateRelAttribute(opts);
       } else {
         this.execAction('unlink');
       }
       return this.base.checkSelection();
+    },
+    getFormOpts: function() {
+      var opts;
+      opts = MediumEditor.extensions.anchor.prototype.getFormOpts.call(this);
+      opts.rel = this.selectedRelValues();
+      return opts;
+    },
+    relButtons: function() {
+      return $(this.getForm()).find('.scrivito_enum_attribute.scrivito_multi [data-scrivito-rel]');
+    },
+    selectedRelValues: function() {
+      return this.relButtons().filter('.scrivito_enum_attribute_active').toArray().map(function(button) {
+        return button.attributes['data-scrivito-rel'].value;
+      }).join(' ');
+    },
+    updateRelIndicator: function() {
+      var selectedClass, toggleRelPanelButton;
+      toggleRelPanelButton = $(this.getForm().querySelector('.scrivito_icon_gear'));
+      selectedClass = 'scrivito_active_rel_selected';
+      if (this.relButtons().hasClass('scrivito_enum_attribute_active')) {
+        return toggleRelPanelButton.addClass(selectedClass);
+      } else {
+        return toggleRelPanelButton.removeClass(selectedClass);
+      }
+    },
+    updateRelAttribute: function(opts) {
+      var elem, linkElement, selectedParent, selectionRange;
+      selectionRange = MediumEditor.selection.getSelectionRange(this.document);
+      selectedParent = MediumEditor.selection.getSelectedParentElement(selectionRange);
+      linkElement = $(MediumEditor.util.getClosestTag(selectedParent, 'a'));
+      if (opts.rel) {
+        linkElement.attr('rel', opts.rel);
+      } else {
+        linkElement.removeAttr('rel');
+      }
+      elem = this.getEditorElements()[0];
+      return this.base.trigger('editableInput', {}, elem);
+    },
+    updateRelUi: function(opts) {
+      var ref, rel;
+      rel = (ref = opts.rel) != null ? ref.split(/\s+/) : void 0;
+      this.relButtons().each(function(_, button) {
+        if (rel && rel.indexOf(button.getAttribute('data-scrivito-rel')) !== -1) {
+          return button.className = 'scrivito_enum_attribute_active';
+        } else {
+          return button.className = '';
+        }
+      });
+      return this.updateRelIndicator();
+    },
+    onToggleRelPanelButtonClick: function(form) {
+      return $(form.find('.scrivito_medium_link_collapse')).toggleClass('show');
+    },
+    onRelSelectionButtonClick: function(event) {
+      var relButton;
+      relButton = $(event.target);
+      relButton.toggleClass('scrivito_enum_attribute_active');
+      return this.updateRelIndicator();
+    },
+    onContentBrowserButtonClick: function(input) {
+      var cmsField, id, selection;
+      selection = (id = this.proxy.idFromPath(input.val())) ? [id] : [];
+      cmsField = $(this.base.origElements);
+      scrivito.content_browser.open({
+        filters: cmsField.data('scrivitoEditorsFilter'),
+        filter_context: cmsField.data('scrivitoEditorsFilterContext'),
+        selection: selection,
+        selection_mode: 'single'
+      }).always((function(_this) {
+        return function() {
+          return input.focus();
+        };
+      })(this)).done((function(_this) {
+        return function(selection) {
+          if (selection.length) {
+            return input.val(_this.proxy.pathForId(selection[0]));
+          } else {
+            return input.val('');
+          }
+        };
+      })(this));
+      return false;
     }
   });
 

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

@@ -10,7 +10,7 @@
    *   scrivito_tag(:div, @obj, :my_attribute, data: { scrivito_editors_placeholder: 'My text' })
    */
   scrivito.editors.applyPlaceholder = function ($cmsField) {
-    if (!$cmsField.is('data-scrivito-editors-placeholder')) {
+    if (!$cmsField.is('[data-scrivito-editors-placeholder]')) {
       var fieldName = $cmsField.attr('data-scrivito-field-name');
       var defaultPlaceholder = 'Click to edit the “' + fieldName + '” attribute ...';
 

data/app/assets/stylesheets/scrivito_editors/referencelist_editor.css

@@ -42,11 +42,11 @@
   border-bottom-left-radius: 0;
 }
 
-[data-scrivito-display-mode="editing"] [data-scrivito-field-type="referencelist"] ul li {
+[data-scrivito-editing] [data-scrivito-field-type="referencelist"] ul li {
   padding-left: 28px;
 }
 
-[data-scrivito-display-mode="editing"] [data-scrivito-field-type="referencelist"] ul li:before {
+[data-scrivito-editing] [data-scrivito-field-type="referencelist"] ul li:before {
   content: "↕";
   color: #999;
   font-size: 19px;
@@ -56,12 +56,12 @@
   top: 50%;
 }
 
-[data-scrivito-display-mode="editing"] [data-scrivito-field-type="referencelist"] ul li:hover {
+[data-scrivito-editing] [data-scrivito-field-type="referencelist"] ul li:hover {
   background-color: #e6f3f7;
   cursor: move;
 }
 
-[data-scrivito-display-mode="editing"] [data-scrivito-field-type="referencelist"] ul li.scrivito-sortable-placeholder {
+[data-scrivito-editing] [data-scrivito-field-type="referencelist"] ul li.scrivito-sortable-placeholder {
   background: #f3f3f3;
   border: 2px dashed #9bc2cf;
   height: 36px;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.17.0.rc2
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2020-07-08 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.15.0
+        version: 1.17.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.17.0.rc2
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.17.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.17.0.rc2
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,6 @@ files:
 - app/assets/javascripts/scrivito_editors/filter_context.js
 - app/assets/javascripts/scrivito_editors/helpers/button_container.js
 - app/assets/javascripts/scrivito_editors/helpers/imgly_assets.js.erb
-- app/assets/javascripts/scrivito_editors/helpers/placeholder_helper.js
 - app/assets/javascripts/scrivito_editors/html_editor.js
 - app/assets/javascripts/scrivito_editors/image_editor.js
 - app/assets/javascripts/scrivito_editors/jquery-ui-timepicker-addon-scrivito-namespace.js
@@ -330,8 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '1.8'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Scrivito Editors

data/app/assets/javascripts/scrivito_editors/helpers/placeholder_helper.js

@@ -1,8 +0,0 @@
-'use strict';
-
-scrivito.editors._applyPlaceholderToElement = function _applyPlaceholderToElement(domNode) {
-  var cmsField = $(domNode);
-  if (cmsField.not('[data-scrivito-editors-placeholder]')) {
-    cmsField.attr('data-scrivito-editors-placeholder', 'Click to edit');
-  }
-};