scrivito_editors 1.7.0 → 1.8.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e4ceb5ac52b3b08920347efe1efbcde1797daa4
-  data.tar.gz: 20c0661ed2a8bfadacb392dffede44a25ceff6cd
+  metadata.gz: 1d1a39587b189bd3d8d4b56ae481dfb8171f5975
+  data.tar.gz: 6acd8d01478898f158ae6304c888b443263eea63
 SHA512:
-  metadata.gz: 2b956fba03f5d543a7a9ccbe7f4adc821a344ffa6287811aa29bb252d27c0c11256e35cb24989ef9861d075aaa5057b5920783267aad900988c7a32ee54cadbc
-  data.tar.gz: f8c4dc91b7ac8bbdcbb415b809fcd2c0c0a06e274dcab90b08e49acb70c66a2ed16ef0352337ce3688db5621df3a28f98fdf02363623d5c598b5342511327105
+  metadata.gz: d23c0f408683624d4561914ec634c622b03fae68626e0b2a6c15c5338cf3ea28ff24d0df921ebcc6c811de1cb99a79dde15dc144f88e39ed58fddda588a7c1ef
+  data.tar.gz: 4133d4194188406228af5b0d55c3ab881bcc2b0899aec8e7033d0a1d2c3788bacd69c9a08c3bdbd8afadbc54e6114e2bfd7a834cdee9f20e368052ff3288f02b

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

@@ -0,0 +1,54 @@
+'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

@@ -0,0 +1,50 @@
+"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

@@ -0,0 +1,66 @@
+"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

@@ -0,0 +1,54 @@
+"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);
+}

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

@@ -0,0 +1,47 @@
+'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.DomContentProxy = (function () {
+  function DomContentProxy(domNode) {
+    _classCallCheck(this, DomContentProxy);
+
+    this.domNode = domNode;
+  }
+
+  _createClass(DomContentProxy, [{
+    key: 'content',
+    value: function content() {
+      return this.jQueryElement().scrivito('content');
+    }
+  }, {
+    key: 'idFromPath',
+    value: function idFromPath(path) {
+      return scrivito.id_from_path(path);
+    }
+  }, {
+    key: 'jQueryElement',
+    value: function jQueryElement() {
+      return $(this.domNode);
+    }
+  }, {
+    key: 'pathForId',
+    value: function pathForId(id) {
+      return scrivito.path_for_id(id);
+    }
+  }, {
+    key: 'save',
+    value: function save(content) {
+      return this.jQueryElement().scrivito('save', content);
+    }
+  }, {
+    key: 'trigger',
+    value: function trigger(event) {
+      return this.jQueryElement().trigger(event);
+    }
+  }]);
+
+  return DomContentProxy;
+})();

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

@@ -0,0 +1,8 @@
+'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');
+  }
+};

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

@@ -3,6 +3,7 @@
 
   ScrivitoAnchor = MediumEditor.extensions.anchor.extend({
     name: 'scrivito_anchor',
+    proxy: null,
     contentDefault: '<i class="scrivito_customer_icon sci_link"></i>',
     handleClick: function(event) {
       var firstTextElement, linkElement, linkValue, selectedParent, selectionRange;
@@ -27,7 +28,7 @@
       return form.find('.medium-editor-toolbar-browse').on('click', (function(_this) {
         return function() {
           var cmsField, id, selection;
-          selection = (id = scrivito.id_from_path(input.val())) ? [id] : [];
+          selection = (id = _this.proxy.idFromPath(input.val())) ? [id] : [];
           cmsField = $(_this.base.origElements);
           scrivito.content_browser.open({
             filter: cmsField.data('scrivitoEditorsFilter'),
@@ -38,7 +39,7 @@
             return input.focus();
           }).done(function(selection) {
             if (selection.length) {
-              return input.val(scrivito.path_for_id(selection[0]));
+              return input.val(_this.proxy.pathForId(selection[0]));
             } else {
               return input.val('');
             }
@@ -85,12 +86,14 @@
     }
   };
 
-  activate = function(element) {
-    var cmsField;
-    cmsField = $(element);
-    return new MediumEditor(cmsField, editorOptions()).subscribe('editableInput', function() {
-      return cmsField.scrivito('save', cmsField.html());
+  activate = function(proxy) {
+    var cmsField, mediumEditor, scrivitoAnchorExtension;
+    cmsField = proxy.jQueryElement();
+    mediumEditor = new MediumEditor(cmsField, editorOptions()).subscribe('editableInput', function() {
+      return proxy.save(cmsField.html());
     });
+    scrivitoAnchorExtension = mediumEditor.getExtensionByName('scrivito_anchor');
+    return scrivitoAnchorExtension != null ? scrivitoAnchorExtension.proxy = proxy : void 0;
   };
 
   scrivito.editors.medium_editor = {
@@ -98,11 +101,14 @@
       return $(element).is('[data-scrivito-field-type=html]');
     },
     activate: function(element) {
-      return activate(element);
+      return activate(new scrivito.editors.DomContentProxy(element));
     },
     default_options: defaultOptions,
     options: function() {
       return {};
+    },
+    _activateWithProxy: function(proxy) {
+      return activate(proxy);
     }
   };
 

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

@@ -1,9 +1,9 @@
 (function() {
   var DOUBLE_CLICK_MS, activate, cleanUp, cmsFieldAndPastedContent, finishEditing, getCurrentContent, isNewlineAllowed, onBlur, onFocus, onInput, onKey, prepareForEditing, save;
 
-  onKey = function(event) {
+  onKey = function(event, proxy) {
     var cmsField, key;
-    cmsField = $(event.currentTarget);
+    cmsField = proxy.jQueryElement();
     key = event.keyCode || event.which;
     switch (key) {
       case 13:
@@ -18,32 +18,26 @@
     }
   };
 
-  onInput = function(event) {
-    var cmsField;
-    cmsField = $(event.currentTarget);
-    return save(cmsField);
+  onInput = function(proxy) {
+    return save(proxy);
   };
 
-  onFocus = function(event) {
-    var cmsField;
-    cmsField = $(event.currentTarget);
-    return prepareForEditing(cmsField);
+  onFocus = function(proxy) {
+    return prepareForEditing(proxy.jQueryElement());
   };
 
-  onBlur = function(event) {
-    var cmsField;
-    cmsField = $(event.currentTarget);
-    save(cmsField).done(function() {
-      return cmsField.trigger('scrivito_editors:blur');
+  onBlur = function(proxy) {
+    save(proxy).done(function() {
+      return proxy.trigger('scrivito_editors:blur');
     });
-    return finishEditing(cmsField);
+    return finishEditing(proxy);
   };
 
-  save = function(cmsField) {
+  save = function(proxy) {
     var content;
-    content = getCurrentContent(cmsField);
-    return cmsField.scrivito('save', content).done(function() {
-      return cmsField.trigger('scrivito_editors:save');
+    content = getCurrentContent(proxy.jQueryElement());
+    return proxy.save(content).done(function() {
+      return proxy.trigger('scrivito_editors:save');
     });
   };
 
@@ -55,6 +49,9 @@
     clone.find('br').replaceWith('\n');
     content = clone.text();
     clone.remove();
+    if (!isNewlineAllowed(cmsField)) {
+      content = content.replace(/\n$/, '');
+    }
     return content;
   };
 
@@ -102,19 +99,31 @@
     }
   };
 
-  finishEditing = function(cmsField) {
+  finishEditing = function(proxy) {
+    var cmsField;
+    cmsField = proxy.jQueryElement();
     cmsField.data('scrivito_editors_prepared_for_editing', false);
-    return cmsField.text(cmsField.scrivito('content'));
+    return cmsField.text(proxy.content());
   };
 
   DOUBLE_CLICK_MS = 300;
 
-  activate = function(element) {
+  activate = function(proxy) {
     var cmsField;
-    cmsField = $(element);
-    cmsField.attr('contenteditable', true).blur(onBlur).focus(onFocus).keypress(onKey).keyup(onKey);
+    cmsField = proxy.jQueryElement();
+    cmsField.attr('contenteditable', true).blur(function() {
+      return onBlur(proxy);
+    }).focus(function() {
+      return onFocus(proxy);
+    }).keypress(function(event) {
+      return onKey(event, proxy);
+    }).keyup(function(event) {
+      return onKey(event, proxy);
+    });
     if (cmsField.attr('data-scrivito-editors-autosave') !== 'false') {
-      cmsField.on('cut input keypress keyup paste', onInput);
+      cmsField.on('cut input keypress keyup paste', function() {
+        return onInput(proxy);
+      });
     }
     prepareForEditing(cmsField);
     return cmsField.on('click', function(event) {
@@ -132,7 +141,10 @@
       return $(element).is('[data-scrivito-field-type=string]');
     },
     activate: function(element) {
-      return activate(element);
+      return activate(new scrivito.editors.DomContentProxy(element));
+    },
+    _activateWithProxy: function(proxy) {
+      return activate(proxy);
     }
   };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0.rc1
 platform: ruby
 authors:
 - Scrivito
@@ -50,28 +50,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0.rc1
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0.rc1
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -184,13 +184,19 @@ 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
+- app/assets/javascripts/scrivito_editors/dom_content_proxy.js
 - app/assets/javascripts/scrivito_editors/enum_editor.js
 - 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/link_editor.js