scrivito_editors 1.0.0 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cabd5e5db7880e7993d507da0f919bf9e6b0add
-  data.tar.gz: 47d2dccbc8e88d51521ee955615ab7b50b336321
+  metadata.gz: 6e3270ccf6587292e9e95e6451970a021be1650c
+  data.tar.gz: ccb599722a4db3e062a13ad5be2fd99fbe0d10d9
 SHA512:
-  metadata.gz: d789d26827cd715b11027bcb221ac482f9bef6580c4dbd3b2ae2c0bfbbe58ec0060118b060ca4b6185080c0d6fc4611ceb5aecfb8bfd9e96a5d5b07aae1118b3
-  data.tar.gz: 500b87661f31212548638c5bccf525836bb1d5aa66bd67b0052d9b109fdcb8a49473d9fd51be4f3b341ba81af35819c0ecf2884fd640994fbfd03e95c677229e
+  metadata.gz: 384bfe1abec2ddf9c28a932818d2ce237a902e7140071ed5e2d1f702d1134ae8d0969957bf16ec5f6ed38f1a11c181ac2ddc936f4de5b7e8e76b7e95d8912c44
+  data.tar.gz: 231c54b4d4f644f5e145ab10a6fde84cedbc49afab87543e6a509b0d223a92616b9ea4a57509c58d44293ea0142db626d01260868e2bc40c2de51a7b582deef3

data/README.md

@@ -1,6 +1,6 @@
 # Scrivito Editors
 
-[![Gem Version](https://badge.fury.io/rb/scrivito_editors.png)](http://badge.fury.io/rb/scrivito_editors)
+[![Gem Version](https://badge.fury.io/rb/scrivito_editors.svg)](https://badge.fury.io/rb/scrivito_editors)
 
 The [Scrivito](http://scrivito.com) Editors gem is a collection of useful standard
 JavaScript editors based on the Scrivito SDK. The editors allow to edit all CMS

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

@@ -1,34 +1,38 @@
 (function() {
-  var activate, clear, save, template,
-    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
-
-  clear = '__scrivito_editors_enum_clear';
+  var activate, blur, change, save, template;
 
   template = function(values) {
     var element;
     element = $('<select></select>').addClass('form-control');
     $.each(values, function(index, value) {
-      var text;
-      if (value === clear) {
-        text = '';
-      } else {
-        text = value;
-      }
-      return $('<option></option>').attr('value', value).text(text).appendTo(element);
+      return $('<option></option>').attr('value', value).text(value).appendTo(element);
     });
     return element;
   };
 
-  save = function(event) {
+  save = function(event, options) {
     var cmsField, content, element;
     element = $(event.currentTarget);
-    cmsField = element.data('cmsField');
+    cmsField = element.data('scrivitoEditorsCmsField');
     content = element.val();
-    if (content === clear) {
+    if (content === '') {
       content = null;
     }
     return cmsField.scrivito('save', content).done(function() {
-      return cmsField.trigger('save.scrivito_editors');
+      cmsField.trigger('scrivito_editors:save');
+      if (options != null ? options.blur : void 0) {
+        return cmsField.trigger('scrivito_editors:blur');
+      }
+    });
+  };
+
+  change = function(event) {
+    return save(event);
+  };
+
+  blur = function(event) {
+    return save(event, {
+      blur: true
     });
   };
 
@@ -36,18 +40,11 @@
     var cmsField;
     cmsField = $(element);
     return cmsField.on('click', function() {
-      var content, selected, values;
+      var content, values;
       content = cmsField.scrivito('content');
       values = cmsField.scrivito('allowed_values');
-      if (indexOf.call(values, '') < 0) {
-        values.push(clear);
-      }
-      if (content) {
-        selected = content;
-      } else {
-        selected = clear;
-      }
-      template(values).data('cmsField', cmsField).val(selected).insertAfter(cmsField).change(save).focusout(save).focus();
+      values.unshift('');
+      template(values).data('scrivitoEditorsCmsField', cmsField).val(content || '').insertAfter(cmsField).change(change).blur(blur).focus();
       return cmsField.hide();
     });
   };

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

@@ -24,7 +24,12 @@
       var files, ref, ref1;
       el.removeClass('image-editor-dragover');
       if (((ref = (files = (ref1 = e.originalEvent.dataTransfer) != null ? ref1.files : void 0)) != null ? ref.length : void 0) === 1) {
+        el.addClass('scrivito_element_overlay');
         callback(el, files[0]);
+      } else {
+        el.children().not('img').css({
+          pointerEvents: 'auto'
+        });
       }
       return false;
     });

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

@@ -1,10 +1,10 @@
 (function() {
   scrivito.editors.html_editor = {
     can_edit: function(element) {
-      return scrivito.editors.redactor_editor.can_edit(element);
+      return scrivito.editors.medium_editor.can_edit(element);
     },
     activate: function(element) {
-      return scrivito.editors.redactor_editor.activate(element);
+      return scrivito.editors.medium_editor.activate(element);
     }
   };
 

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

@@ -52,39 +52,29 @@
   };
 
   setup_image_kit_container = function(element, dialog) {
-    var container, fallbackUrl, image, url;
+    var container, image;
     container = $(".image_kit_start");
     image = new Image();
-    url = element.scrivito("content").url;
-    image.crossOrigin = "Anonymous";
-    image.src = url;
-    fallbackUrl = url;
-    if (url.indexOf("?") < 0) {
-      fallbackUrl = url + "?=" + new Date().getTime();
-    } else {
-      fallbackUrl = url + "&=" + new Date().getTime();
-    }
-    image.onerror = function() {
-      if (image.src === fallbackUrl) {
+    return element.scrivito('content').no_cache_url().then(function(no_cache_url) {
+      image.crossOrigin = "Anonymous";
+      image.src = no_cache_url;
+      image.onerror = function() {
         return $("<div style='padding:20px'>\n  <h1>We're sorry,</h1>\n  <p>Scrivito can't edit this image in your browser. What now?</p>\n  <ul>\n    <li>Check for browser updates</li>\n    <li>Try using a different browser</li>\n    <li>Contact us at\n      <a href=\"https://scrivito.com/support\" target=\"_blank\">https://scrivito.com/support</a>\n    </li>\n  </ul>\n</div>").appendTo(container);
-      } else {
-        console.info("Scrivito detected a probable CORS browser cache mismatch, trying uncached load");
-        return image.src = fallbackUrl;
-      }
-    };
-    return image.onload = function() {
-      var kit;
-      kit = setup_image_kit(image, container);
-      kit.ui.selectOperations({
-        except: "stickers"
-      });
-      kit.run();
-      return dialog.when_closed.then((function(_this) {
-        return function() {
-          return save_edited_image(element, kit);
-        };
-      })(this));
-    };
+      };
+      return image.onload = function() {
+        var kit;
+        kit = setup_image_kit(image, container);
+        kit.ui.selectOperations({
+          except: "stickers"
+        });
+        kit.run();
+        return dialog.when_closed.then((function(_this) {
+          return function() {
+            return save_edited_image(element, kit);
+          };
+        })(this));
+      };
+    });
   };
 
   save_edited_image = function(element, kit) {

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

@@ -1,5 +1,5 @@
 (function() {
-  var activate, openContentBrowser, save, template;
+  var activate, fetchDescription, openContentBrowser, save, template;
 
   scrivito.on('load', function() {
     return scrivito.define_editor('link', scrivito.editors.link_editor);
@@ -14,18 +14,22 @@
     }
   };
 
+  fetchDescription = function(cmsField, objId) {
+    return scrivito.description_for_editor([objId]).then(function(descriptions) {
+      var urlInput;
+      urlInput = cmsField.find('[name=url]');
+      if (descriptions[0] && urlInput.not(':focus')) {
+        return urlInput.val(descriptions[0]);
+      }
+    });
+  };
+
   activate = function(cmsField) {
-    var link, obj_id;
+    var link;
     link = cmsField.scrivito('content') || {};
     cmsField.html(template(link));
-    if (obj_id = link.obj_id) {
-      scrivito.description_for_editor([obj_id]).then(function(descriptions) {
-        var urlInput;
-        urlInput = cmsField.find('[name=url]');
-        if (!urlInput.is(':focus')) {
-          return urlInput.val(descriptions[0]);
-        }
-      });
+    if (link.obj_id) {
+      fetchDescription(cmsField, link.obj_id);
     }
     cmsField.on('blur', 'li input', function() {
       return save(cmsField);
@@ -35,24 +39,24 @@
     return cmsField.find('[name=url]').on('focus', function() {
       var input, raw;
       input = $(this);
-      raw = input.data('value');
+      raw = input.attr('data-value');
       if (raw) {
         input.val(raw);
       }
-      return input.data('value', null);
+      return input.attr('data-value', null);
     });
   };
 
   template = function(link) {
     var obj_url;
-    obj_url = link.obj_id && ("/" + link.obj_id);
+    obj_url = link.obj_id && scrivito.path_for_id(link.obj_id);
     return $("<ul>\n  <li data-id=\"" + link.obj_id + "\" data-title=\"" + link.title + "\" data-url=\"" + link.url + "\">\n    <input type=\"text\" name=\"title\" value=\"" + (link.title || '') + "\" placeholder=\"Title\" />\n    <input type=\"text\" name=\"url\" value=\"" + (link.url || obj_url || '') + "\"\n        data-value=\"" + (link.url || obj_url || '') + "\" placeholder=\"Url\" class=\"editing-url\" />\n    <div class=\"actions\">\n      <a href=\"#\" class=\"scrivito_open_content_browser editing-button editing-green\">\n        <i class=\"editing-icon editing-icon-search\" />\n      </a>\n    </div>\n  </li>\n</ul>");
   };
 
   openContentBrowser = function(cmsField) {
     var id, linkItem;
     linkItem = cmsField.find('li');
-    id = linkItem.data('id');
+    id = linkItem.attr('data-id');
     scrivito.content_browser.open({
       selection: id ? [id] : [],
       selection_mode: 'single',
@@ -61,10 +65,11 @@
     }).done(function(selection) {
       var url, val;
       if (id = selection[0]) {
-        url = "/" + id;
+        url = scrivito.path_for_id(id);
         val = "Content browser selection (" + url + ")";
-        linkItem.data('id', id).find('[name=url]').data('value', url).val(val);
-        return save(cmsField);
+        linkItem.attr('data-id', id).find('[name=url]').attr('data-value', url).val(val);
+        save(cmsField);
+        return fetchDescription(cmsField, id);
       }
     });
     return false;
@@ -75,7 +80,7 @@
     li = cmsField.find('li');
     title = li.find('[name=title]').val();
     urlInput = li.find('[name=url]');
-    url = urlInput.data('value') || urlInput.val();
+    url = urlInput.attr('data-value') || urlInput.val();
     value = url ? {
       title: title,
       url: url

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

@@ -1,5 +1,5 @@
 (function() {
-  var activate, addLink, attachHandlers, attachLinkHandlers, fetchDescriptions, linkTemplate, openContentBrowser, removeLink, render, save, storeLastSaved;
+  var activate, addLink, attachHandlers, attachLinkHandlers, fetchDescriptions, linkTemplate, objIdsFor, openContentBrowser, removeLink, render, save, storeLastSaved;
 
   scrivito.on('load', function() {
     return scrivito.define_editor('linklist', scrivito.editors.linklist_editor);
@@ -18,7 +18,7 @@
     var linklist;
     linklist = cmsField.scrivito('content');
     render(cmsField, linklist);
-    fetchDescriptions(cmsField, linklist);
+    fetchDescriptions(cmsField, objIdsFor(linklist));
     attachHandlers(cmsField);
     return storeLastSaved(cmsField, linklist);
   };
@@ -34,27 +34,15 @@
     return cmsField.append('<button class="editing-button editing-green add-link">\n  <i class="editing-icon editing-icon-plus"></i>\n</button>');
   };
 
-  fetchDescriptions = function(cmsField, linklist) {
-    var link, obj_ids;
-    obj_ids = (function() {
-      var j, len, results;
-      results = [];
-      for (j = 0, len = linklist.length; j < len; j++) {
-        link = linklist[j];
-        if (link.obj_id) {
-          results.push(link.obj_id);
-        }
-      }
-      return results;
-    })();
-    if (obj_ids.length) {
-      return scrivito.description_for_editor(obj_ids).then(function(descriptions) {
-        var i, j, len, obj_id, results, urlInput;
+  fetchDescriptions = function(cmsField, objIds) {
+    if (objIds.length) {
+      return scrivito.description_for_editor(objIds).then(function(descriptions) {
+        var i, j, len, objId, results, urlInput;
         results = [];
-        for (i = j = 0, len = obj_ids.length; j < len; i = ++j) {
-          obj_id = obj_ids[i];
-          urlInput = cmsField.find("[data-id='" + obj_id + "'] [name=url]");
-          if (!urlInput.is(':focus')) {
+        for (i = j = 0, len = objIds.length; j < len; i = ++j) {
+          objId = objIds[i];
+          urlInput = cmsField.find("[data-id='" + objId + "'] [name=url]");
+          if (descriptions[i] && urlInput.not(':focus')) {
             results.push(urlInput.val(descriptions[i]));
           } else {
             results.push(void 0);
@@ -65,6 +53,18 @@
     }
   };
 
+  objIdsFor = function(linklist) {
+    var j, len, link, results;
+    results = [];
+    for (j = 0, len = linklist.length; j < len; j++) {
+      link = linklist[j];
+      if (link.obj_id) {
+        results.push(link.obj_id);
+      }
+    }
+    return results;
+  };
+
   attachHandlers = function(cmsField) {
     var j, len, li, ref, results, ul;
     ul = cmsField.find('ul');
@@ -95,17 +95,17 @@
     }).find('[name=url]').on('focus', function() {
       var input, raw;
       input = $(this);
-      raw = input.data('value');
+      raw = input.attr('data-value');
       if (raw) {
         input.val(raw);
       }
-      return input.data('value', null);
+      return input.attr('data-value', null);
     });
   };
 
   linkTemplate = function(link) {
     var obj_url;
-    obj_url = link.obj_id && ("/" + link.obj_id);
+    obj_url = link.obj_id && scrivito.path_for_id(link.obj_id);
     return $("<li " + (link.obj_id ? "data-id='" + link.obj_id + "'" : void 0) + " data-title=\"" + link.title + "\" data-url=\"" + link.url + "\">\n  <input type=\"text\" name=\"title\" value=\"" + (link.title || '') + "\" placeholder=\"Title\" />\n  <input type=\"text\" name=\"url\" value=\"" + (link.url || obj_url || '') + "\"\n      data-value=\"" + (link.url || obj_url || '') + "\" placeholder=\"Url\" class=\"editing-url\" />\n  <div class=\"actions\">\n    <a href=\"#\" class=\"scrivito_open_content_browser editing-button editing-green\">\n      <i class=\"editing-icon editing-icon-search\" />\n    </a>\n    <a href=\"#\" class=\"editing-button editing-red delete\">\n      <i class=\"editing-icon editing-icon-trash\" />\n    </a>\n  </div>\n</li>");
   };
 
@@ -120,7 +120,7 @@
         li = $(li);
         title = li.find('[name=title]').val();
         input = li.find('[name=url]');
-        url = input.data('value') || input.val();
+        url = input.attr('data-value') || input.val();
         if (url) {
           results.push({
             title: title,
@@ -135,7 +135,7 @@
     value = $.grep(value, function(n) {
       return n;
     });
-    lastSaved = cmsField.data('scrivito-editors-linklist-last-saved');
+    lastSaved = cmsField.attr('data-scrivito-editors-linklist-last-saved');
     if (JSON.stringify(value) !== JSON.stringify(lastSaved)) {
       return cmsField.scrivito('save', value).done(function() {
         cmsField.trigger('save.scrivito_editors');
@@ -154,7 +154,7 @@
 
   openContentBrowser = function(cmsField, li) {
     var id;
-    id = li.data('id');
+    id = li.attr('data-id');
     scrivito.content_browser.open({
       selection: id ? [id] : [],
       selection_mode: 'single',
@@ -164,10 +164,11 @@
       return function(selection) {
         var url, val;
         if (id = selection[0]) {
-          url = "/" + id;
+          url = scrivito.path_for_id(id);
           val = "Content browser selection (" + url + ")";
-          li.data('id', id).find('[name=url]').data('value', url).val(val);
-          return save(cmsField);
+          li.attr('data-id', id).find('[name=url]').attr('data-value', url).val(val);
+          save(cmsField);
+          return fetchDescriptions(cmsField, [id]);
         }
       };
     })(this));
@@ -181,7 +182,7 @@
   };
 
   storeLastSaved = function(cmsField, lastSaved) {
-    return cmsField.data('scrivito-editors-linklist-last-saved', lastSaved);
+    return cmsField.attr('data-scrivito-editors-linklist-last-saved', lastSaved);
   };
 
 }).call(this);

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

@@ -1,5 +1,5 @@
 (function() {
-  var ScrivitoAnchor, activate, editorOptions;
+  var ScrivitoAnchor, activate, customOptions, defaultOptions, editorOptions;
 
   ScrivitoAnchor = MediumEditor.extensions.anchor.extend({
     name: 'scrivito_anchor',
@@ -26,9 +26,8 @@
       input = form.find('.medium-editor-toolbar-input');
       return form.find('.medium-editor-toolbar-browse').on('click', (function(_this) {
         return function() {
-          var cmsField, matches, selection;
-          matches = input.val().match(/\b([a-f0-9]{16})\b/);
-          selection = matches != null ? [matches[1]] : [];
+          var cmsField, id, selection;
+          selection = (id = scrivito.id_from_path(input.val())) ? [id] : [];
           cmsField = $(_this.base.origElements);
           scrivito.content_browser.open({
             filter: cmsField.data('scrivitoEditorsFilter'),
@@ -38,7 +37,11 @@
           }).always(function() {
             return input.focus();
           }).done(function(selection) {
-            return input.val(selection);
+            if (selection.length) {
+              return input.val(scrivito.path_for_id(selection[0]));
+            } else {
+              return input.val('');
+            }
           });
           return false;
         };
@@ -55,28 +58,36 @@
     }
   });
 
-  editorOptions = function(toolbarOptions) {
-    var options;
-    options = {
+  editorOptions = function() {
+    return $.extend({}, defaultOptions(), customOptions());
+  };
+
+  defaultOptions = function() {
+    return {
       anchorPreview: false,
       extensions: {
         scrivito_anchor: new ScrivitoAnchor
       },
+      placeholder: false,
       toolbar: {
-        buttons: ['h1', 'h2', 'h3', 'bold', 'italic', 'scrivito_anchor', 'underline', 'orderedlist', 'unorderedlist', 'indent', 'outdent', 'justifyLeft', 'justifyCenter', 'justifyFull']
+        buttons: ['bold', 'italic', 'scrivito_anchor', 'h2', 'h3', 'unorderedlist', 'orderedlist'],
+        standardizeSelectionStart: true
       }
     };
-    if (toolbarOptions) {
-      options.toolbar = toolbarOptions;
+  };
+
+  customOptions = function() {
+    if (typeof scrivito.editors.medium_editor.options === 'function') {
+      return scrivito.editors.medium_editor.options();
+    } else {
+      return scrivito.editors.medium_editor.options;
     }
-    options.toolbar.standardizeSelectionStart = true;
-    return options;
   };
 
   activate = function(element) {
     var cmsField;
     cmsField = $(element);
-    return new MediumEditor(cmsField, editorOptions(cmsField.data('medium-editor-toolbar'))).subscribe('editableInput', function() {
+    return new MediumEditor(cmsField, editorOptions()).subscribe('editableInput', function() {
       return cmsField.scrivito('save', cmsField.html());
     });
   };
@@ -87,6 +98,9 @@
     },
     activate: function(element) {
       return activate(element);
+    },
+    options: function() {
+      return {};
     }
   };
 

data/app/assets/javascripts/scrivito_editors/redactor_plugins/scrivito_editors_image_manager.js

@@ -33,7 +33,7 @@
         })(this));
       },
       insert: function(id) {
-        return this.image.insert("<img src='/" + id + "'>");
+        return this.image.insert("<img src='" + (scrivito.path_for_id(id)) + "'>");
       }
     };
   };

data/app/assets/javascripts/scrivito_editors/redactor_plugins/scrivito_editors_link_manager.js

@@ -8,7 +8,6 @@
     return self = {
       init: function() {
         this.modal.addTemplate('scrivito_link_manager_browse', self.browseButtonHtml);
-        this.modal.addTemplate('scrivito_link_manager_url', '/$id');
         this.modal.addCallback('imageEdit', self.addBrowseToModal);
         return this.modal.addCallback('link', self.addBrowseToModal);
       },
@@ -36,19 +35,15 @@
         })(this));
       },
       getObjIds: function() {
-        var matches;
-        matches = self.urlInput().val().match(/[\/:]([a-f0-9]{16})\b/);
-        if (matches != null) {
-          return [matches[1]];
+        var id;
+        if (id = scrivito.id_from_path(self.urlInput().val())) {
+          return [id];
         } else {
           return [];
         }
       },
       setObjId: function(id) {
-        return self.urlInput().val(self.toUrl(id));
-      },
-      toUrl: function(id) {
-        return this.modal.getTemplate('scrivito_link_manager_url').replace("$id", id);
+        return self.urlInput().val(scrivito.path_for_id(id));
       }
     };
   };

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

@@ -4,11 +4,13 @@
   activate = function(element) {
     var cmsField, objId;
     cmsField = $(element);
-    objId = cmsField.scrivito('content');
-    if (objId && !cmsField.children().length) {
-      scrivito.description_for_editor([objId]).then(function(results) {
-        return cmsField.text(results[0]);
-      });
+    if (!cmsField.is('video, audio, img')) {
+      objId = cmsField.scrivito('content');
+      if (objId && !cmsField.children().length) {
+        scrivito.description_for_editor([objId]).then(function(results) {
+          return cmsField.text(results[0]);
+        });
+      }
     }
     return cmsField.on('click', function(event) {
       var filterContext, filters, isImage, selected;

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

@@ -42,13 +42,9 @@
   save = function(cmsField) {
     var content;
     content = getCurrentContent(cmsField);
-    if (content !== cmsField.scrivito('content')) {
-      return cmsField.scrivito('save', content).done(function() {
-        return cmsField.trigger('save.scrivito_editors');
-      });
-    } else {
-      return $.Deferred().resolve();
-    }
+    return cmsField.scrivito('save', content).done(function() {
+      return cmsField.trigger('scrivito_editors:save');
+    });
   };
 
   getCurrentContent = function(cmsField) {

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

@@ -8,6 +8,17 @@
       field = $(element);
       return field.tagEditor({
         initialTags: field.scrivito('content'),
+        autocomplete: {
+          source: (function(_this) {
+            return function(request, response) {
+              var fieldName;
+              fieldName = $(element).data("scrivitoFieldName");
+              return scrivito.suggest_completion(fieldName, request.term).then(function(suggestions) {
+                return response(suggestions);
+              });
+            };
+          })(this)
+        },
         onChange: function(field, editor, tags) {
           return field.scrivito('save', tags);
         }

data/app/assets/javascripts/scrivito_editors_addons.js

@@ -2,3 +2,4 @@
 //= require jquery-ui/datepicker
 //= require jquery-ui/slider
 //= require jquery-ui-timepicker-addon.min
+//= require jquery-ui/autocomplete

data/app/assets/stylesheets/scrivito_editors/editors/button_container.css

@@ -5,10 +5,14 @@
   }
 .scrivito-editor-binary-button-container:not(.scrivito-editor-image-button-container) {
   display:block; position: relative;
-  background: rgba(0,0,0,.1);
   box-shadow: 0 0 0 2px rgba(0,0,0,.2);
   min-height: 90px; padding:5px;
   }
+
+.scrivito-editor-binary-button-container:not(.scrivito-editor-image-button-container):not(.scrivito_element_overlay) {
+  background: rgba(0,0,0,.1);
+  }
+
 .scrivito-editor-image-button-container .editing-button,
 .scrivito-editor-binary-button-container .editing-button {
   padding: 5px 8px;  margin: 0px;

data/app/assets/stylesheets/scrivito_editors/editors/medium_editor.css

@@ -4,7 +4,7 @@
  *= require_self
  */
 .medium-toolbar-arrow-under::after { top: auto;}
-.medium-editor-toolbar { z-index: 11112; margin:0 10px; background:rgba(67, 148, 57, 0.9);
+.medium-editor-toolbar { z-index: 111112; margin:0 10px; background:rgba(67, 148, 57, 0.9);
   border-radius:4px;}
 .medium-editor-toolbar li button { height:40px; min-width:40px; padding:10px;
   border:none; margin:1px; background:rgba(0,0,0,.1);

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

@@ -4,7 +4,7 @@
 */
 [data-scrivito-display-mode="editing"] [data-scrivito-editors-placeholder]:empty:not(:focus):before {
   content: attr(data-scrivito-editors-placeholder);
-  color: #999;
+  color: rgba(64, 64, 64, 0.53);
   display: inline-block;
   font-size: 13px;
   font-style: normal;
@@ -24,6 +24,7 @@
 /* Firefox: Let the input cursor appear at the expected position */
 [data-scrivito-display-mode="editing"] [data-scrivito-editors-placeholder]:empty:focus:after,
 [data-scrivito-display-mode="editing"] [data-scrivito-editors-placeholder]:empty:focus:before {
-  content: " ";
+  content: "\200b";
+  color: transparent;
   display: inline-block;
 }

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

@@ -1,5 +1,6 @@
 /*
  *= require jquery.tag-editor
+ *= require jquery-ui/autocomplete
  */
 
 [data-scrivito-field-type=stringlist]+.tag-editor .tag-editor-delete { padding-right: 10px; }

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

@@ -625,7 +625,7 @@ MediumEditor.extensions = {};
         /*
         * Take an element, and break up all of its text content into unique pieces such that:
          * 1) All text content of the elements are in separate blocks. No piece of text content should span
-         *    span multiple blocks. This means no element return by this function should have
+         *    across multiple blocks. This means no element return by this function should have
          *    any blocks as children.
          * 2) The union of the textcontent of all of the elements returned here covers all
          *    of the text within the element.
@@ -2307,6 +2307,10 @@ MediumEditor.extensions = {};
                     // Detecting keydown on the contenteditables
                     this.attachToEachElement('keydown', this.handleKeydown);
                     break;
+                case 'editableKeydownSpace':
+                    // Detecting keydown for SPACE on the contenteditables
+                    this.setupListener('editableKeydown');
+                    break;
                 case 'editableKeydownEnter':
                     // Detecting keydown for ENTER on the contenteditables
                     this.setupListener('editableKeydown');
@@ -2519,8 +2523,13 @@ MediumEditor.extensions = {};
         },
 
         handleKeydown: function (event) {
+
             this.triggerCustomEvent('editableKeydown', event, event.currentTarget);
 
+            if (MediumEditor.util.isKey(event, MediumEditor.util.keyCode.SPACE)) {
+                return this.triggerCustomEvent('editableKeydownSpace', event, event.currentTarget);
+            }
+
             if (MediumEditor.util.isKey(event, MediumEditor.util.keyCode.ENTER) || (event.ctrlKey && MediumEditor.util.isKey(event, MediumEditor.util.keyCode.M))) {
                 return this.triggerCustomEvent('editableKeydownEnter', event, event.currentTarget);
             }
@@ -3322,7 +3331,7 @@ MediumEditor.extensions = {};
             var targetCheckbox = this.getAnchorTargetCheckbox(),
                 buttonCheckbox = this.getAnchorButtonCheckbox(),
                 opts = {
-                    url: this.getInput().value
+                    url: this.getInput().value.trim()
                 };
 
             if (this.linkValidation) {
@@ -3442,6 +3451,7 @@ MediumEditor.extensions = {};
 
     MediumEditor.extensions.anchor = AnchorForm;
 }());
+
 (function () {
     'use strict';
 
@@ -3460,6 +3470,11 @@ MediumEditor.extensions = {};
          */
         previewValueSelector: 'a',
 
+        /* showWhenToolbarIsVisible: [boolean]
+         * determines whether the anchor tag preview shows up when the toolbar is visible
+         */
+        showWhenToolbarIsVisible: false,
+
         init: function () {
             this.anchorPreview = this.createPreview();
 
@@ -3611,7 +3626,7 @@ MediumEditor.extensions = {};
 
             // only show when toolbar is not present
             var toolbar = this.base.getExtensionByName('toolbar');
-            if (toolbar && toolbar.isDisplayed && toolbar.isDisplayed()) {
+            if (!this.showWhenToolbarIsVisible && toolbar && toolbar.isDisplayed && toolbar.isDisplayed()) {
                 return true;
             }
 
@@ -3774,11 +3789,26 @@ MediumEditor.extensions = {};
         },
 
         performLinking: function (contenteditable) {
-            // Perform linking on a paragraph level basis as otherwise the detection can wrongly find the end
-            // of one paragraph and the beginning of another paragraph to constitute a link, such as a paragraph ending
-            // "link." and the next paragraph beginning with "my" is interpreted into "link.my" and the code tries to create
-            // a link across blockElements - which doesn't work and is terrible.
-            // (Medium deletes the spaces/returns between P tags so the textContent ends up without paragraph spacing)
+            /*
+            Perform linking on blockElement basis, blockElements are HTML elements with text content and without
+            child element.
+
+            Example:
+            - HTML content
+            <blockquote>
+              <p>link.</p>
+              <p>my</p>
+            </blockquote>
+
+            - blockElements
+            [<p>link.</p>, <p>my</p>]
+
+            otherwise the detection can wrongly find the end of one paragraph and the beginning of another paragraph
+            to constitute a link, such as a paragraph ending "link." and the next paragraph beginning with "my" is
+            interpreted into "link.my" and the code tries to create a link across blockElements - which doesn't work
+            and is terrible.
+            (Medium deletes the spaces/returns between P tags so the textContent ends up without paragraph spacing)
+            */
             var blockElements = MediumEditor.util.splitByBlockElements(contenteditable),
                 documentModified = false;
             if (blockElements.length === 0) {
@@ -3917,6 +3947,7 @@ MediumEditor.extensions = {};
 
     MediumEditor.extensions.autoLink = AutoLink;
 }());
+
 (function () {
     'use strict';
 
@@ -4090,6 +4121,191 @@ MediumEditor.extensions = {};
     MediumEditor.extensions.keyboardCommands = KeyboardCommands;
 }());
 
+(function () {
+    'use strict';
+
+    var FontNameForm = MediumEditor.extensions.form.extend({
+
+        name: 'fontname',
+        action: 'fontName',
+        aria: 'change font name',
+        contentDefault: '&#xB1;', // ±
+        contentFA: '<i class="fa fa-font"></i>',
+
+        fonts: ['', 'Arial', 'Verdana', 'Times New Roman'],
+
+        init: function () {
+            MediumEditor.extensions.form.prototype.init.apply(this, arguments);
+        },
+
+        // Called when the button the toolbar is clicked
+        // Overrides ButtonExtension.handleClick
+        handleClick: function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+
+            if (!this.isDisplayed()) {
+                // Get FontName of current selection (convert to string since IE returns this as number)
+                var fontName = this.document.queryCommandValue('fontName') + '';
+                this.showForm(fontName);
+            }
+
+            return false;
+        },
+
+        // Called by medium-editor to append form to the toolbar
+        getForm: function () {
+            if (!this.form) {
+                this.form = this.createForm();
+            }
+            return this.form;
+        },
+
+        // Used by medium-editor when the default toolbar is to be displayed
+        isDisplayed: function () {
+            return this.getForm().style.display === 'block';
+        },
+
+        hideForm: function () {
+            this.getForm().style.display = 'none';
+            this.getSelect().value = '';
+        },
+
+        showForm: function (fontName) {
+            var select = this.getSelect();
+
+            this.base.saveSelection();
+            this.hideToolbarDefaultActions();
+            this.getForm().style.display = 'block';
+            this.setToolbarPosition();
+
+            select.value = fontName || '';
+            select.focus();
+        },
+
+        // Called by core when tearing down medium-editor (destroy)
+        destroy: function () {
+            if (!this.form) {
+                return false;
+            }
+
+            if (this.form.parentNode) {
+                this.form.parentNode.removeChild(this.form);
+            }
+
+            delete this.form;
+        },
+
+        // core methods
+
+        doFormSave: function () {
+            this.base.restoreSelection();
+            this.base.checkSelection();
+        },
+
+        doFormCancel: function () {
+            this.base.restoreSelection();
+            this.clearFontName();
+            this.base.checkSelection();
+        },
+
+        // form creation and event handling
+        createForm: function () {
+            var doc = this.document,
+                form = doc.createElement('div'),
+                select = doc.createElement('select'),
+                close = doc.createElement('a'),
+                save = doc.createElement('a'),
+                option;
+
+            // Font Name Form (div)
+            form.className = 'medium-editor-toolbar-form';
+            form.id = 'medium-editor-toolbar-form-fontname-' + this.getEditorId();
+
+            // Handle clicks on the form itself
+            this.on(form, 'click', this.handleFormClick.bind(this));
+
+            // Add font names
+            for (var i = 0; i<this.fonts.length; i++) {
+                option = doc.createElement('option');
+                option.innerHTML = this.fonts[i];
+                option.value = this.fonts[i];
+                select.appendChild(option);
+            }
+
+            select.className = 'medium-editor-toolbar-select';
+            form.appendChild(select);
+
+            // Handle typing in the textbox
+            this.on(select, 'change', this.handleFontChange.bind(this));
+
+            // Add save buton
+            save.setAttribute('href', '#');
+            save.className = 'medium-editor-toobar-save';
+            save.innerHTML = this.getEditorOption('buttonLabels') === 'fontawesome' ?
+                             '<i class="fa fa-check"></i>' :
+                             '&#10003;';
+            form.appendChild(save);
+
+            // Handle save button clicks (capture)
+            this.on(save, 'click', this.handleSaveClick.bind(this), true);
+
+            // Add close button
+            close.setAttribute('href', '#');
+            close.className = 'medium-editor-toobar-close';
+            close.innerHTML = this.getEditorOption('buttonLabels') === 'fontawesome' ?
+                              '<i class="fa fa-times"></i>' :
+                              '&times;';
+            form.appendChild(close);
+
+            // Handle close button clicks
+            this.on(close, 'click', this.handleCloseClick.bind(this));
+
+            return form;
+        },
+
+        getSelect: function () {
+            return this.getForm().querySelector('select.medium-editor-toolbar-select');
+        },
+
+        clearFontName: function () {
+            MediumEditor.selection.getSelectedElements(this.document).forEach(function (el) {
+                if (el.nodeName.toLowerCase() === 'font' && el.hasAttribute('face')) {
+                    el.removeAttribute('face');
+                }
+            });
+        },
+
+        handleFontChange: function () {
+            var font = this.getSelect().value;
+            if (font === '') {
+                this.clearFontName();
+            } else {
+                this.execAction('fontName', { name: font });
+            }
+        },
+
+        handleFormClick: function (event) {
+            // make sure not to hide form when clicking inside the form
+            event.stopPropagation();
+        },
+
+        handleSaveClick: function (event) {
+            // Clicking Save -> create the font size
+            event.preventDefault();
+            this.doFormSave();
+        },
+
+        handleCloseClick: function (event) {
+            // Click Close -> close the form
+            event.preventDefault();
+            this.doFormCancel();
+        }
+    });
+
+    MediumEditor.extensions.fontName = FontNameForm;
+}());
+
 (function () {
     'use strict';
 
@@ -5354,15 +5570,26 @@ MediumEditor.extensions = {};
 
     // Event handlers that shouldn't be exposed externally
 
+    function handleDisableExtraSpaces(event) {
+        var node = MediumEditor.selection.getSelectionStart(this.options.ownerDocument),
+            textContent = node.textContent,
+            caretPositions = MediumEditor.selection.getCaretOffsets(node);
+
+        if ((textContent[caretPositions.left - 1] === undefined) || (textContent[caretPositions.left - 1] === ' ') || (textContent[caretPositions.left] === undefined)) {
+            event.preventDefault();
+        }
+    }
+
     function handleDisabledEnterKeydown(event, element) {
         if (this.options.disableReturn || element.getAttribute('data-disable-return')) {
             event.preventDefault();
         } else if (this.options.disableDoubleReturn || element.getAttribute('data-disable-double-return')) {
             var node = MediumEditor.selection.getSelectionStart(this.options.ownerDocument);
 
-            // if current text selection is empty OR previous sibling text is empty
-            if ((node && node.textContent.trim() === '') ||
-                (node.previousElementSibling && node.previousElementSibling.textContent.trim() === '')) {
+            // if current text selection is empty OR previous sibling text is empty OR it is not a list
+            if ((node && node.textContent.trim() === '' && node.nodeName.toLowerCase() !== 'li') ||
+                (node.previousElementSibling && node.previousElementSibling.nodeName.toLowerCase() !== 'br' &&
+                 node.previousElementSibling.textContent.trim() === '')) {
                 event.preventDefault();
             }
         }
@@ -5702,6 +5929,11 @@ MediumEditor.extensions = {};
         this.subscribe('editableKeydownDelete', handleBlockDeleteKeydowns.bind(this));
         this.subscribe('editableKeydownEnter', handleBlockDeleteKeydowns.bind(this));
 
+        // Bind double space event
+        if (this.options.disableExtraSpaces) {
+            this.subscribe('editableKeydownSpace', handleDisableExtraSpaces.bind(this));
+        }
+
         // disabling return or double return
         if (this.options.disableReturn || this.options.disableDoubleReturn) {
             this.subscribe('editableKeydownEnter', handleDisabledEnterKeydown.bind(this));
@@ -5828,6 +6060,10 @@ MediumEditor.extensions = {};
             return this.options.ownerDocument.execCommand('fontSize', false, opts.size);
         }
 
+        if (action === 'fontName') {
+            return this.options.ownerDocument.execCommand('fontName', false, opts.name);
+        }
+
         if (action === 'createLink') {
             return this.createLink(opts);
         }
@@ -6057,6 +6293,9 @@ MediumEditor.extensions = {};
                 case 'fileDragging':
                     extension = new MediumEditor.extensions.fileDragging(opts);
                     break;
+                case 'fontname':
+                    extension = new MediumEditor.extensions.fontName(this.options.fontName);
+                    break;
                 case 'fontsize':
                     extension = new MediumEditor.extensions.fontSize(opts);
                     break;
@@ -6410,6 +6649,7 @@ MediumEditor.extensions = {};
         delay: 0,
         disableReturn: false,
         disableDoubleReturn: false,
+        disableExtraSpaces: false,
         disableEditing: false,
         autoLink: false,
         elementsContainer: false,
@@ -6438,7 +6678,7 @@ MediumEditor.parseVersionString = function (release) {
 
 MediumEditor.version = MediumEditor.parseVersionString.call(this, ({
     // grunt-bump looks for this:
-    'version': '5.8.3'
+    'version': '5.10.0'
 }).version);
 
     return MediumEditor;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement