scrivito_editors 1.5.5 → 1.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b4fe623dfc9c65600c66b4bf951a496d1073877
-  data.tar.gz: 3936b9ff497ce0fcbd43d7e13c68599a2b171659
+  metadata.gz: b1e64036fba4d9337ff09359bca23128bd2331ce
+  data.tar.gz: ad8cb2a6a261240c62a490899fd0e6b84de406cd
 SHA512:
-  metadata.gz: e2ac308168f1bc7ce02c7fd090537cc4a38bf835b1320d85313f14f663ce62dd29207871273af8b251e89c105772eec603163c5bdb5ae521feb860611c76b585
-  data.tar.gz: bce4346c5ec5af3a1261b6f391e6bd181887879e0d9be872ca8e9e9b92a4741b6214c47d4f5456603102781571cca412b682ec11d0c01a8788bf23011aedd182
+  metadata.gz: cd8bbbfc314996b164ead0662a4f6680124709d236260b49cfa19aea2a1dfa9b60c4244e9870c9058918ce793ff71fefe4fb1a78cf4269c2b23b545f81e81ab5
+  data.tar.gz: 747e1b0e15718226cb645d9c779ac1bff7321803a942e0ca86913c4d46b4c4698b811b43f2f5fc7853bb506f3697f463cffcb89ee76d78cd15c94261f578f48b

data/app/assets/javascripts/scrivito_editors.js

@@ -13,12 +13,16 @@
 //= require jquery.caret
 //= require jquery.tag-editor
 //= require medium-editor
-//= require_tree ./scrivito_editors/dependencies
+//= require jquery-ui/sortable
+//= require jquery-ui/datepicker
+//= require jquery-ui/slider
 //= require jquery-ui-timepicker-addon.min
+//= require jquery-ui/autocomplete
 //= require redactor
 //= require redactor_plugins/table
 //= require canvas-to-blob
 //= require imglykit
+//= require URI
 //= require_self
 //= require scrivito_editors_sortable
 //= require_tree ./scrivito_editors

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

@@ -4,12 +4,7 @@
   activate = function(element) {
     var cmsField, container;
     cmsField = $(element);
-    container = scrivito.editors._setup_binary_button_container(cmsField, 'scrivito-editor-binary-ui-container');
-    scrivito.editors._file_dropzone(container, function(_, file) {
-      return cmsField.scrivito('save', file).then(function() {
-        return cmsField.scrivito('reload');
-      });
-    }, 'image-editor-dragover');
+    container = scrivito.editors._setupButtonContainer(cmsField);
     if (cmsField.scrivito('content') && cmsField.is('[data-scrivito-editors-allow-delete]')) {
       showDeleteButton(container, cmsField);
     }

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

@@ -10,7 +10,7 @@
     cmsField = datetimepickerElement.data('cmsField');
     datetime = datetimepickerElement.datetimepicker('getDate');
     return cmsField.scrivito('save', datetime).done(function() {
-      cmsField.trigger('save.scrivito_editors');
+      cmsField.trigger('scrivito_editors:save');
       if (additionalDoneEvent) {
         return cmsField.trigger(additionalDoneEvent);
       }

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

@@ -1,25 +1,16 @@
 (function() {
   var COEXISTING_EDITORS, PRIMARY_EDITORS, default_editor;
 
-  PRIMARY_EDITORS = ['date_editor', 'enum_editor', 'html_editor', 'image_editor', 'link_editor', 'linklist_editor', 'multienum_editor', 'permalink_editor', 'reference_editor', 'referencelist_editor', 'string_editor', 'stringlist_editor'];
+  PRIMARY_EDITORS = ['date_editor', 'enum_editor', 'html_editor', 'image_editor', 'link_editor', 'linklist_editor', 'multienum_editor', 'number_editor', 'permalink_editor', 'reference_editor', 'referencelist_editor', 'string_editor', 'stringlist_editor'];
 
-  COEXISTING_EDITORS = ['binary_editor', 'image_drop_editor'];
+  COEXISTING_EDITORS = ['binary_editor'];
 
   default_editor = {
     can_edit: function() {
       return true;
     },
     activate: function(element) {
-      var editor, i, j, legacyApiEditor, len, len1, ref;
-      legacyApiEditor = $(element).data('editor');
-      if (legacyApiEditor) {
-        editor = legacyApiEditor + "_editor";
-        console.warn("data-editor is deprecated, please use scrivito_tag(tag, obj, field_name, html_options, editor: '" + legacyApiEditor + "')");
-        if ((ref = scrivito.editors[editor]) != null) {
-          ref.activate(element);
-        }
-        return;
-      }
+      var editor, i, j, len, len1;
       for (i = 0, len = COEXISTING_EDITORS.length; i < len; i++) {
         editor = COEXISTING_EDITORS[i];
         if (scrivito.editors[editor].can_edit(element)) {

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

@@ -0,0 +1,19 @@
+(function() {
+  scrivito.editors._setupButtonContainer = function(element) {
+    var container, containerClass;
+    if (element.is('img')) {
+      containerClass = 'scrivito-editors-image-ui-container';
+    } else {
+      containerClass = 'scrivito-editors-ui-container';
+    }
+    container = element.parent(".scrivito-editor-button-container");
+    if (container.length) {
+      return container.addClass(containerClass);
+    } else {
+      container = element.wrap("<div class='" + containerClass + " scrivito-editor-button-container' />").parent();
+      element.css('min-height', container.css('min-height'));
+      return container;
+    }
+  };
+
+}).call(this);

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

@@ -6,7 +6,7 @@
   };
 
   setup_edit_btn = function(element) {
-    scrivito.editors._setup_binary_button_container(element, 'scrivito-editor-image-button-container');
+    scrivito.editors._setupButtonContainer(element);
     if (element.scrivito('content')) {
       return $("<a href='#' class='edit-image editing-button'> <i class='editing-icon editing-icon-edit'></i></a>").insertBefore(element).click(function(event) {
         event.preventDefault();

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

@@ -51,9 +51,11 @@
   };
 
   template = function(link) {
-    var obj_url, url;
-    obj_url = link.obj_id && scrivito.path_for_id(link.obj_id);
-    url = link.url || obj_url || '';
+    var objUrl, url;
+    if (link.obj_id) {
+      objUrl = URI(scrivito.path_for_id(link.obj_id)).query(link.query || null).fragment(link.fragment || null);
+    }
+    url = link.url || objUrl || '';
     return $("<ul>\n  <li data-id=\"" + (link.obj_id || '') + "\" data-target=\"\">\n    <input type=\"text\" name=\"title\" value=\"" + (link.title || '') + "\" placeholder=\"Title\" />\n    <input type=\"text\" name=\"url\" value=\"" + url + "\" data-value=\"" + url + "\" placeholder=\"URL\"\n        class=\"editing-url\" />\n    <div class=\"actions\">\n      <div class=\"input_group_btn\">\n        <a href=\"#\" class=\"editing-button editing-grey editing-clear\"\n            data-scrivito-editors-toggle-target>\n          <span class=\"scrivito_editors_current_target\"></span>\n          <i class=\"scrivito_icon scrivito_icon_link_target\"></i>\n        </a>\n        <ul class=\"dropdown_menu\"></ul>\n      </div>\n      <a href=\"#\" class=\"editing-button content-browser-open editing-green\"\n          data-scrivito-editors-browse>\n        <i class=\"scrivito_icon scrivito_icon_content_browser\"></i>\n      </a>\n    </div>\n  </li>\n</ul>");
   };
 
@@ -93,7 +95,7 @@
       url: url
     } : null;
     return cmsField.scrivito('save', value).done(function() {
-      return cmsField.trigger('save.scrivito_editors');
+      return cmsField.trigger('scrivito_editors:save');
     });
   };
 

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

@@ -108,9 +108,11 @@
   };
 
   linkTemplate = function(link) {
-    var obj_url, url;
-    obj_url = link.obj_id && scrivito.path_for_id(link.obj_id);
-    url = link.url || obj_url || '';
+    var objUrl, url;
+    if (link.obj_id) {
+      objUrl = URI(scrivito.path_for_id(link.obj_id)).query(link.query || null).fragment(link.fragment || null);
+    }
+    url = link.url || objUrl || '';
     return $("<li data-id=\"" + (link.obj_id || '') + "\" data-title=\"" + (link.title || '') + "\" data-url=\"" + url + "\"\n    data-target=\"\">\n  <span class=\"scrivito-editors-handle\"></span>\n  <input type=\"text\" name=\"title\" value=\"" + (link.title || '') + "\" placeholder=\"Title\" />\n  <input type=\"text\" name=\"url\" value=\"" + url + "\" data-value=\"" + url + "\" placeholder=\"URL\"\n      class=\"editing-url\" />\n  <div class=\"actions\">\n    <div class=\"input_group_btn\">\n      <a href=\"#\" class=\"editing-button editing-grey editing-clear\"\n          data-scrivito-editors-toggle-target>\n        <span class=\"scrivito_editors_current_target\"></span>\n        <i class=\"scrivito_icon scrivito_icon_link_target\"></i>\n      </a>\n      <ul class=\"dropdown_menu\"></ul>\n    </div>\n    <a href=\"#\" class=\"editing-button content-browser-open editing-green\"\n        data-scrivito-editors-browse>\n      <i class=\"scrivito_icon scrivito_icon_content_browser\"></i>\n    </a>\n    <a href=\"#\" class=\"editing-button editing-red delete\">\n      <i class=\"scrivito_icon scrivito_icon_trash\"></i>\n    </a>\n  </div>\n</li>");
   };
 
@@ -145,7 +147,7 @@
     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');
+        cmsField.trigger('scrivito_editors:save');
         return storeLastSaved(cmsField, value);
       });
     }

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

@@ -0,0 +1,88 @@
+(function() {
+  var activate, canBeBlank, currentNumericInput, initInputTemplate, onInput, save, template;
+
+  template = function() {
+    return $('<input class="scrivito_number_editor" type="number" />');
+  };
+
+  onInput = function(event) {
+    var cmsField;
+    cmsField = $(event.currentTarget);
+    if (cmsField.find("input").is(":valid")) {
+      return save(cmsField);
+    }
+  };
+
+  save = function(cmsField) {
+    cmsField.find("input").attr("data-scrivito-editors-number-invalid", false);
+    return cmsField.scrivito('save', currentNumericInput(cmsField)).done(function() {
+      return cmsField.trigger('scrivito_editors:save');
+    }).fail(function() {
+      return cmsField.find("input").attr("data-scrivito-editors-number-invalid", true);
+    });
+  };
+
+  currentNumericInput = function(cmsField) {
+    var val;
+    val = cmsField.find("input").val();
+    if (val) {
+      return Number(val);
+    } else if (val === "" && canBeBlank(cmsField)) {
+      return null;
+    } else {
+      return NaN;
+    }
+  };
+
+  canBeBlank = function(cmsField) {
+    return cmsField.data("scrivito-editors-allow-delete") !== false;
+  };
+
+  initInputTemplate = function(cmsField) {
+    var html, max, min, stepParam;
+    html = template();
+    stepParam = cmsField.data('scrivito-editors-step');
+    max = cmsField.data('scrivito-editors-max');
+    min = cmsField.data('scrivito-editors-min');
+    if (cmsField.is('[data-scrivito-field-type=float]')) {
+      if (stepParam == null) {
+        stepParam = "any";
+      }
+    }
+    if (cmsField.is('[data-scrivito-field-type=integer]')) {
+      if (max == null) {
+        max = 9007199254740991;
+      }
+      if (min == null) {
+        min = -9007199254740991;
+      }
+    }
+    html.attr('step', stepParam);
+    html.attr('min', min);
+    html.attr('max', max);
+    html.attr('value', cmsField.scrivito('content'));
+    return html;
+  };
+
+  activate = function(element) {
+    var cmsField, html;
+    cmsField = $(element);
+    html = initInputTemplate(cmsField);
+    cmsField.html(html);
+    return cmsField.on('input', onInput);
+  };
+
+  scrivito.editors.number_editor = {
+    can_edit: function(element) {
+      return $(element).is("[data-scrivito-field-type=float],\n[data-scrivito-field-type=integer]");
+    },
+    activate: function(element) {
+      return activate(element);
+    }
+  };
+
+  scrivito.on('load', function() {
+    return scrivito.define_editor('number', scrivito.editors.number_editor);
+  });
+
+}).call(this);

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

@@ -1,5 +1,5 @@
 (function() {
-  var activate, closeEditor, defaultOptions, getCurrentContent, getOptions, saveContents;
+  var activate, closeEditor, defaultOptions, getCurrentContent, getOptions, saveContents, showDeprecationWarningOnce;
 
   this.RedactorPlugins || (this.RedactorPlugins = {});
 
@@ -106,7 +106,7 @@
     content = getCurrentContent(editor);
     if (content !== cmsField.scrivito('content')) {
       return cmsField.scrivito('save', content).done(function() {
-        return cmsField.trigger('save.scrivito_editors');
+        return cmsField.trigger('scrivito_editors:save');
       });
     } else {
       return $.Deferred().resolve();
@@ -129,12 +129,20 @@
   activate = function(element) {
     var cmsField;
     cmsField = $(element);
-    return cmsField.on('click', function(event) {
+    cmsField.on('click', function(event) {
       event.preventDefault();
       if (!cmsField.hasClass('scrivito_editors_redactor')) {
         return cmsField.redactor(getOptions()).addClass('scrivito_editors_redactor');
       }
     });
+    return showDeprecationWarningOnce();
+  };
+
+  showDeprecationWarningOnce = function() {
+    if (scrivito.editors.redactor_editor.deprecation_warning) {
+      console.warn(scrivito.editors.redactor_editor.deprecation_warning);
+      return delete scrivito.editors.redactor_editor.deprecation_warning;
+    }
   };
 
   scrivito.editors.redactor_editor = {
@@ -145,6 +153,7 @@
       return activate(element);
     },
     default_options: defaultOptions,
+    deprecation_warning: "The Scrivito Redactor editor is deprecated. See https://scrivito.com/editors for details.\nYou can continue to use Redactor, but there will be no updates in future Scrivito versions.\nScrivito recommends MediumEditor for smooth on-page editing, CodeMirror for HTML source editing.",
     options: {}
   };
 

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

@@ -1,10 +1,13 @@
 (function() {
-  var activate, onContentBrowserSave;
+  var DELETE_BUTTON_TEMPLATE, activate, activateUi, save;
 
   activate = function(element) {
     var cmsField, objId;
     cmsField = $(element);
-    if (!cmsField.is('video, audio, img')) {
+    if (cmsField.is('[data-scrivito-editors-allow-delete=true]')) {
+      activateUi(cmsField);
+    }
+    if (cmsField.not('video, audio, img')) {
       objId = cmsField.scrivito('content');
       if (objId && !cmsField.children().length) {
         scrivito.description_for_editor([objId]).then(function(results) {
@@ -30,17 +33,29 @@
         selection_mode: 'single'
       }).done((function(_this) {
         return function(selection) {
-          return onContentBrowserSave(selection, cmsField);
+          return save(cmsField, selection[0] || null);
         };
       })(this));
     });
   };
 
-  onContentBrowserSave = function(selection, cmsField) {
-    var value;
-    value = selection[0] || null;
+  activateUi = function(cmsField) {
+    var container;
+    container = scrivito.editors._setupButtonContainer(cmsField);
+    if (cmsField.scrivito('content')) {
+      return $(DELETE_BUTTON_TEMPLATE).prependTo(container).click(function() {
+        save(cmsField, null);
+        return false;
+      });
+    }
+  };
+
+  DELETE_BUTTON_TEMPLATE = "<a href='#' class='editing-button'>\n  <i class='editing-icon editing-icon-trash'></i>\n</a>";
+
+  save = function(cmsField, value) {
     cmsField.scrivito('save', value).done(function() {
-      cmsField.trigger('save.scrivito_editors');
+      cmsField.trigger('scrivito_editors:save');
+      cmsField.trigger('scrivito_editors:blur');
       return cmsField.scrivito('reload');
     });
     return true;

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

@@ -2,7 +2,7 @@
   var activate, collectIds, contentBrowserButtonTemplate, getCmsField, onContentBrowserOpen, remove, render, renderItem, save;
 
   renderItem = function(objId) {
-    return $("<li data-scrivito-editors-obj-id=\"" + objId + "\">\n  <span class=\"list-content\"></span>\n  <div class=\"actions\">\n    <a href=\"#\" class=\"editing-button editing-red delete\">\n      <i class=\"editing-icon editing-icon-trash\" />\n    </a>\n  </div>\n</li>");
+    return $("<li data-id=\"" + objId + "\">\n  <span class=\"list-content\"></span>\n  <div class=\"actions\">\n    <a href=\"#\" class=\"editing-button editing-red delete\">\n      <i class=\"editing-icon editing-icon-trash\" />\n    </a>\n  </div>\n</li>");
   };
 
   contentBrowserButtonTemplate = function() {
@@ -21,7 +21,7 @@
     lastSaved = cmsField.scrivito('content');
     if (JSON.stringify(ids) !== JSON.stringify(lastSaved)) {
       return cmsField.scrivito('save', ids).done(function() {
-        cmsField.trigger('save.scrivito_editors');
+        cmsField.trigger('scrivito_editors:save');
         if (reload) {
           return cmsField.scrivito('reload');
         }
@@ -49,13 +49,13 @@
 
   collectIds = function(cmsField) {
     var item, items, value;
-    items = $(cmsField).find('[data-scrivito-editors-obj-id]');
+    items = $(cmsField).find('[data-id]');
     return value = (function() {
       var i, len, results;
       results = [];
       for (i = 0, len = items.length; i < len; i++) {
         item = items[i];
-        results.push($(item).attr('data-scrivito-editors-obj-id'));
+        results.push($(item).data('id'));
       }
       return results;
     })();

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

@@ -10,7 +10,7 @@
     cmsField = $(this).data('cmsField');
     content = ui.value;
     return cmsField.scrivito('save', content).done(function() {
-      cmsField.trigger('save.scrivito_editors');
+      cmsField.trigger('scrivito_editors:save');
       return cmsField.trigger('scrivito_editors:blur');
     });
   };
@@ -24,7 +24,7 @@
 
   parse = function(string, fallback) {
     var value;
-    value = parseInt(string);
+    value = parseFloat(string);
     if (isNaN(value)) {
       return fallback;
     } else {
@@ -58,7 +58,7 @@
 
   scrivito.editors.slider_editor = {
     can_edit: function(element) {
-      return $(element).is('[data-scrivito-field-type=string]');
+      return $(element).is("[data-scrivito-field-type=float],\n[data-scrivito-field-type=integer],\n[data-scrivito-field-type=string]");
     },
     activate: function(element) {
       return activate(element);

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

@@ -1,28 +1,28 @@
 
-.scrivito-editor-image-button-container {
+.scrivito-editors-image-ui-container {
   display:inline-block; position: relative;
   max-width:100%;
   }
-.scrivito-editor-binary-ui-container:not(.scrivito-editor-image-button-container) {
+.scrivito-editors-ui-container:not(.scrivito-editors-image-ui-container) {
   display:block; position: relative;
   box-shadow: 0 0 0 2px rgba(0,0,0,.2);
   min-height: 90px; padding:5px;
   }
 
-.scrivito-editor-binary-ui-container:not(.scrivito-editor-image-button-container):not(.scrivito_element_overlay) {
+.scrivito-editors-ui-container:not(.scrivito-editors-image-ui-container):not(.scrivito_element_overlay) {
   background: rgba(0,0,0,.1);
   }
 
-.scrivito-editor-image-button-container .editing-button,
-.scrivito-editor-binary-ui-container .editing-button {
+.scrivito-editors-image-ui-container .editing-button,
+.scrivito-editors-ui-container .editing-button {
   padding: 5px 8px;  margin: 0px;
   position: absolute; right: 10px; top: 10px;
   background: rgba(0,0,0,.7);
   border:1px solid rgba(255, 255, 255, 0.3);
   box-shadow: 0 0 3px 2px rgba(255, 255, 255, 0.2);
   }
-.scrivito-editor-image-button-container .editing-button:hover,
-.scrivito-editor-binary-ui-container .editing-button:hover {
+.scrivito-editors-image-ui-container .editing-button:hover,
+.scrivito-editors-ui-container .editing-button:hover {
   background: rgba(88,88,88,.8);
   }
 .scrivito_binary_file_name_editor_wrapper {position: absolute; left: 0; bottom: 0; right: 0;}
@@ -97,9 +97,9 @@
   z-index: 1;
   }
 
-.scrivito-editor-image-button-container .editing-button + .editing-button,
-.scrivito-editor-binary-ui-container .editing-button + .editing-button {
+.scrivito-editors-image-ui-container .editing-button + .editing-button,
+.scrivito-editors-ui-container .editing-button + .editing-button {
   right: 50px;
   }
-.scrivito-editor-image-button-container .editing-button .editing-icon,
-.scrivito-editor-binary-ui-container .editing-button .editing-icon { color:#fff;}
+.scrivito-editors-image-ui-container .editing-button .editing-icon,
+.scrivito-editors-ui-container .editing-button .editing-icon { color:#fff;}