scrivito_editors 1.13.0 → 1.14.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ddac99443feb82c41e2fbca3b617cdf3a0d33172a206ab702a2acb0c9735ebf
-  data.tar.gz: fea0c9001e47b3cfeb126c729a31c4c944ca80d4dab1ca0d6d590bb92401ef5a
+  metadata.gz: edde882877616fa1eb7d8fcf7dc8b7c66857099c11a854e27b9d5fcb8389f864
+  data.tar.gz: aba07a37cf676ba3d547789bc817c238a6de2cf8a28b2a5d92b2cdbb1bcba04f
 SHA512:
-  metadata.gz: 6d5ee0f3bd1fe4983405d14cde61a87d9e8b773d64e4c366c4445c693e6a13dec228eb08d67b7af573cf8f200b0b08971d93755cff82b53f7e06242218da565a
-  data.tar.gz: 4fdf7ddc43c3b618baceb3e5691346a1bf80b60155cb8985204cb0eb6a1bb49415188649da4238743459598493c766f9f6fec058fc5a1f2081c6d0cf10d54e51
+  metadata.gz: f6e5604538b714ece7c86c3de8a8d2b0f20fcd2d1fe3e4500d4102dc2726fdaed31467272b6a4d0ac77f30fe83041c53e39f1851db17dc9994801d8eb6983e90
+  data.tar.gz: a6d44761c8a5eaa1831dae061c37a2a64004c55702f6cd9aed39448fdeeb7a27d7837ae82a5b132540e9f4ee326d5277ce4ce89bebab47344e691128290498cd

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2014 Infopark AG (http://www.infopark.com)
+Copyright (c) 2009 - 2018 Infopark AG (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

@@ -2,25 +2,17 @@
 
 [![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
-attributes in place and provide helper for the property view of pages and
-widgets. A content browser comes with the gem, to add, update and delete
-resources.
+[Scrivito](http://scrivito.com/rails/documentation) Editors is a
+collection of JavaScript editors based on the Scrivito SDK.
+The editors let you edit CMS attributes in place and in property views of pages and widgets.
 
 ## Installation and Usage
 
-Please visit our Documentation to get the
-[latest installation and usage information](https://scrivito.com/editors).
-
-
-## Changelog
-
-{include:file:CHANGELOG.md}
-
+Please refer to the
+[latest installation and usage instructions](https://scrivito.com/editors).
 
 ## License
-Copyright (c) 2009 - 2016 Infopark AG (http://www.infopark.com)
+Copyright (c) 2009 - 2018 Infopark AG (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/string_editor.js

@@ -1,165 +1,168 @@
-(function() {
-  var DOUBLE_CLICK_MS, activate, cleanUp, cmsFieldAndPastedContent, finishEditing, fixSelectionForFirefox, getCurrentContent, isNewlineAllowed, onBlur, onClick, onFocus, onInput, onKey, prepareForEditing, save;
-
-  onKey = function(event, proxy) {
-    var cmsField, key;
-    cmsField = proxy.jQueryElement();
-    key = event.keyCode || event.which;
-    switch (key) {
-      case 13:
-        if (!isNewlineAllowed(cmsField)) {
-          event.preventDefault();
-          return cmsField.blur();
-        }
-        break;
-      case 27:
-        event.stopPropagation();
-        return cmsField.blur();
-    }
-  };
+// This file integrates contenteditable for string attributes.
 
-  onInput = function(proxy) {
-    return save(proxy);
-  };
+'use strict';
 
-  onFocus = function(proxy) {
-    return prepareForEditing(proxy.jQueryElement());
-  };
+function onKey(event, proxy) {
+  var cmsField = proxy.jQueryElement();
+  var key = event.keyCode || event.which;
 
-  onClick = function(proxy) {
-    return fixSelectionForFirefox(proxy.jQueryElement());
-  };
+  switch (key) {
+    case 13:
+      // Enter
+      if (!isNewlineAllowed(cmsField)) {
+        event.preventDefault();
+        cmsField.blur();
+      }
+      break;
+    case 27:
+      // Esc
+      event.stopPropagation();
+      cmsField.blur();
+  }
+}
+
+function onInput(proxy) {
+  save(proxy);
+}
+
+function onFocus(proxy) {
+  prepareForEditing(proxy.jQueryElement());
+}
+
+function onClick(proxy) {
+  fixSelectionForFirefox(proxy.jQueryElement());
+}
+
+function onBlur(proxy) {
+  save(proxy).done(function () {
+    return proxy.trigger('scrivito_editors:blur');
+  });
 
-  onBlur = function(proxy) {
-    save(proxy).done(function() {
-      return proxy.trigger('scrivito_editors:blur');
-    });
-    finishEditing(proxy);
-    return prepareForEditing(proxy.jQueryElement());
-  };
-
-  save = function(proxy) {
-    var content;
-    content = getCurrentContent(proxy.jQueryElement());
-    return proxy.save(content).done(function() {
-      return proxy.trigger('scrivito_editors:save');
-    });
-  };
+  finishEditing(proxy);
+  prepareForEditing(proxy.jQueryElement());
+}
 
-  getCurrentContent = function(cmsField) {
-    cleanUp(cmsField);
-    return cmsField[0].innerText.replace(/\r\n/g, '\n').replace(/\n+$/, '');
-  };
-
-  cleanUp = function(cmsField) {
-    var pasted, siblings;
-    siblings = cmsFieldAndPastedContent(cmsField);
-    pasted = siblings.not(cmsField);
-    if (pasted.length > 0) {
-      pasted.remove();
-      return cmsField.text(siblings.text());
-    }
-  };
-
-  cmsFieldAndPastedContent = function(cmsField) {
-    var needsReset, siblings, siblingsBefore;
-    siblingsBefore = cmsField.data('scrivito_editors_siblings_before_edit');
-    siblings = cmsField.siblings();
-    needsReset = !siblingsBefore || siblings.filter(siblingsBefore).length < siblingsBefore.length;
-    if (needsReset) {
-      return cmsField.data('scrivito_editors_siblings_before_edit', siblings);
-    } else {
-      return cmsField.siblings().addBack().not(siblingsBefore);
+function save(proxy) {
+  var content = getCurrentContent(proxy.jQueryElement());
+  return proxy.save(content).done(function () {
+    return proxy.trigger('scrivito_editors:save');
+  });
+}
+
+function getCurrentContent(cmsField) {
+  cleanUp(cmsField);
+  return cmsField[0].innerText.replace(/\r\n/g, '\n').replace(/\n+$/, '');
+}
+
+function cleanUp(cmsField) {
+  var siblings = cmsFieldAndPastedContent(cmsField);
+  var pasted = siblings.not(cmsField);
+  if (pasted.length > 0) {
+    pasted.remove();
+    cmsField.text(siblings.text());
+  }
+}
+
+function cmsFieldAndPastedContent(cmsField) {
+  var siblingsBefore = cmsField.data('scrivito_editors_siblings_before_edit');
+  var siblings = cmsField.siblings();
+  var needsReset = !siblingsBefore || siblings.filter(siblingsBefore).length < siblingsBefore.length;
+  if (needsReset) {
+    return cmsField.data('scrivito_editors_siblings_before_edit', siblings);
+  }
+  return cmsField.siblings().addBack().not(siblingsBefore);
+}
+
+function isNewlineAllowed(cmsField) {
+  if (cmsField.data('scrivitoEditorsMultiline') === true) {
+    return true;
+  }
+  if (cmsField.data('scrivitoEditorsMultiline') === false) {
+    return false;
+  }
+  return cmsField.css('white-space').match(/pre/);
+}
+
+function prepareForEditing(cmsField) {
+  if (isNewlineAllowed(cmsField) && !cmsField.data('scrivito_editors_prepared_for_editing')) {
+    cmsField.data('scrivito_editors_prepared_for_editing', true);
+    var html = cmsField.html();
+    var htmlNl2Br = html.replace(/\r?\n/g, '<br />');
+    if (html !== htmlNl2Br) {
+      cmsField.html(htmlNl2Br);
     }
-  };
+  }
+}
+
+function finishEditing(proxy) {
+  var cmsField = proxy.jQueryElement();
+  cmsField.data('scrivito_editors_prepared_for_editing', false);
+  cmsField.text(proxy.content());
+}
+
+var DOUBLE_CLICK_MS = 300;
+
+function fixSelectionForFirefox(cmsField) {
+  // see https://bugzilla.mozilla.org/show_bug.cgi?id=389348
+  var sel = document.getSelection();
+  if (!sel.anchorNode || !sel.focusNode) {
+    return;
+  }
+
+  if (!cmsField.find(sel.anchorNode).addBack(sel.anchorNode).length || !cmsField.find(sel.focusNode).addBack(sel.focusNode).length) {
+    sel.selectAllChildren(cmsField[0]);
+  }
+}
+
+function _activate(proxy) {
+  var cmsField = proxy.jQueryElement();
+
+  scrivito.editors.applyPlaceholder(cmsField);
+
+  cmsField.attr('contenteditable', 'true').blur(function () {
+    return onBlur(proxy);
+  }).click(function () {
+    return onClick(proxy);
+  }).focus(function () {
+    return onFocus(proxy);
+  }).keypress(function (event) {
+    return onKey(event, proxy);
+  }).keyup(function (event) {
+    return onKey(event, proxy);
+  });
 
-  isNewlineAllowed = function(cmsField) {
-    if (cmsField.data('scrivitoEditorsMultiline') === true) {
-      return true;
-    }
-    if (cmsField.data('scrivitoEditorsMultiline') === false) {
-      return false;
-    }
-    return cmsField.css('white-space').match(/pre/);
-  };
-
-  prepareForEditing = function(cmsField) {
-    var html, htmlNl2Br;
-    if (isNewlineAllowed(cmsField) && !cmsField.data('scrivito_editors_prepared_for_editing')) {
-      cmsField.data('scrivito_editors_prepared_for_editing', true);
-      html = cmsField.html();
-      htmlNl2Br = html.replace(/\r?\n/g, '<br />');
-      if (html !== htmlNl2Br) {
-        return cmsField.html(htmlNl2Br);
-      }
-    }
-  };
-
-  finishEditing = function(proxy) {
-    var cmsField;
-    cmsField = proxy.jQueryElement();
-    cmsField.data('scrivito_editors_prepared_for_editing', false);
-    return cmsField.text(proxy.content());
-  };
-
-  DOUBLE_CLICK_MS = 300;
-
-  fixSelectionForFirefox = function(cmsField) {
-    var sel;
-    sel = document.getSelection();
-    if (!sel.anchorNode || !sel.focusNode) {
-      return;
-    }
-    if (!cmsField.find(sel.anchorNode).addBack(sel.anchorNode).length || !cmsField.find(sel.focusNode).addBack(sel.focusNode).length) {
-      return sel.selectAllChildren(cmsField[0]);
-    }
-  };
-
-  activate = function(proxy) {
-    var cmsField;
-    cmsField = proxy.jQueryElement();
-    scrivito.editors.applyPlaceholder(cmsField);
-    cmsField.attr('contenteditable', true).blur(function() {
-      return onBlur(proxy);
-    }).click(function() {
-      return onClick(proxy);
-    }).focus(function() {
-      return onFocus(proxy);
-    }).keypress(function(event) {
-      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', function() {
-        return onInput(proxy);
-      });
-    }
-    prepareForEditing(cmsField);
-    return cmsField.on('click', function(event) {
-      cmsField.attr('contenteditable', true);
-      cleanUp(cmsField);
-      if (!(event.timeStamp - cmsField.data('scrivito_editors_last_click') < DOUBLE_CLICK_MS)) {
-        event.preventDefault();
-      }
-      return cmsField.data('scrivito_editors_last_click', event.timeStamp);
+  if (cmsField.attr('data-scrivito-editors-autosave') !== 'false') {
+    cmsField.on('cut input keypress keyup paste', function () {
+      return onInput(proxy);
     });
-  };
-
-  scrivito.editors.string_editor = {
-    can_edit: function(element) {
-      return $(element).is('[data-scrivito-field-type=string]');
-    },
-    activate: function(element) {
-      return activate(new scrivito.editors.DomContentProxy(element));
-    },
-    _activateWithProxy: function(proxy) {
-      return activate(proxy);
-    }
-  };
+  }
 
-  scrivito.on('load', function() {
-    return scrivito.define_editor('string', scrivito.editors.string_editor);
-  });
+  prepareForEditing(cmsField);
+
+  cmsField.on('click', function (event) {
+    cmsField.attr('contenteditable', 'true');
+    cleanUp(cmsField);
 
-}).call(this);
+    // Prevent editable link strings from being opened on click, but allow an enforcing double click
+    if (event.timeStamp - cmsField.data('scrivito_editors_last_click') >= DOUBLE_CLICK_MS) {
+      event.preventDefault();
+    }
+    cmsField.data('scrivito_editors_last_click', event.timeStamp);
+  });
+}
+
+scrivito.editors.string_editor = {
+  can_edit: function can_edit(element) {
+    return $(element).is('[data-scrivito-field-type=string]');
+  },
+  activate: function activate(element) {
+    _activate(new scrivito.editors.DomContentProxy(element));
+  },
+  _activateWithProxy: function _activateWithProxy(proxy) {
+    _activate(proxy);
+  }
+};
+
+scrivito.on('load', function () {
+  return scrivito.define_editor('string', scrivito.editors.string_editor);
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-05-25 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.13.0
+        version: 1.14.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0.rc1
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0.rc1
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.8'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Scrivito Editors