scrivito_editors 0.60.0.rc1 → 0.60.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8460ce5d69c8e0908e775a5e3193e4e84e1293a2
-  data.tar.gz: 00dd10e9587c2a7c6f3e2ff472fb25324f91c7f6
+  metadata.gz: 52bf78879c7b5b0ec864f6b9e2dabe9525dc3fc2
+  data.tar.gz: 5838d45d84675ca135b2b4e58c21c77906ca9555
 SHA512:
-  metadata.gz: c0582e29889ca9b9ebea9abd57b7bde513569ab78f281e9bb764ed435d0997f514519a9b54d449cbe19eca89d82d0203d36da159873901e709c7a90e4dc372f3
-  data.tar.gz: 61275a4000bc4749ff98e3037b1f7fee06a6a0c34d62eece592f26f007a0a21df46115d4229a6b40771ba58a8cd100052451e97d1dce22b121b99e5c7ec66199
+  metadata.gz: 023d3aa2ab889122c12a3a4b05e8fea70e5c4817cf7ed2ba07a03e6f079104566fc4ecceb961d965920e4ec7b94d19f4c64436706e8c2e63502c512fd245969d
+  data.tar.gz: a9f1741649e172023e030947881a71641560406034c2250404f674a1069a15ad23b26efb2bb7acf6434d62c2d3e55003b96da54a1ef3705285744ddd19e77055

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

@@ -34,6 +34,7 @@ $ ->
           .data('cmsField', cmsField)
           .val(selected)
           .insertAfter(cmsField)
+          .change(save)
           .focusout(save)
           .focus()
 

data/app/assets/javascripts/scrivito_editors/multienum_editor.js.coffee

@@ -35,6 +35,7 @@ $ ->
           .data('cmsField', cmsField)
           .val(selected)
           .insertAfter(cmsField)
+          .change(save)
           .focusout(save)
           .focus()
 

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

@@ -7,8 +7,9 @@ $ ->
 
     switch key
       when 13 # Enter
-        event.preventDefault()
-        cmsField.blur()
+        if !isNewlineAllowed(cmsField)
+          event.preventDefault()
+          cmsField.blur()
       when 27 # Esc
         event.stopPropagation()
         cmsField.blur()
@@ -59,13 +60,38 @@ $ ->
     else
       cmsField.siblings().addBack().not(siblingsBefore)
 
+  _deprecationLogged = false
+
+  isNewlineAllowed = (cmsField) ->
+    if cmsField.data('editor') == 'text'
+      if !_deprecationLogged
+        console.warn 'Scrivito editors: data-editor="text" is deprecated, please use data-editor="string" data-newlines="true" instead.'
+        _deprecationLogged = true
+      return true
+
+    return true if cmsField.data('newlines') == true
+    return false if cmsField.data('newlines') == false
+    cmsField.css('white-space').match /pre/
+
   DOUBLE_CLICK_MS = 300
 
+  editSelector = '''
+    [data-scrivito-field-type="string"]:not([data-editor]),
+    [data-editor~="string"],
+    [data-editor~="text"]
+  '''
+
   initialize = ->
-    $(':root').on 'mouseenter', '[data-scrivito-field-type="string"]:not([data-editor]), [data-editor~="string"]', (event) ->
+    $(':root').on 'mouseenter', editSelector, (event) ->
       cmsField = $(@)
 
       unless cmsField.attr('contenteditable')?
+        if isNewlineAllowed(cmsField)
+          html = cmsField.html()
+          htmlNl2Br = html.replace(/\n/g, '<br />')
+          if html != htmlNl2Br
+            cmsField.html(htmlNl2Br)
+
         cmsField
           .attr('contenteditable', true)
           .blur(onBlur)
@@ -75,7 +101,7 @@ $ ->
       if cmsField.attr('data-autosave') != 'false'
         cmsField.on('input', onInput)
 
-    $(':root').on 'click', '[data-scrivito-field-type="string"]:not([data-editor]), [data-editor~="string"]', (event) ->
+    $(':root').on 'click', editSelector, (event) ->
       cmsField = $(@)
       cleanUp(cmsField)
 
@@ -84,7 +110,6 @@ $ ->
         event.preventDefault()
       cmsField.data('scrivito_editors_last_click', event.timeStamp)
 
-
   scrivito.on 'load', ->
     if scrivito.in_editable_view()
       initialize()

data/app/helpers/scrivito_editors/scrivito_tag_helper.rb

@@ -11,7 +11,7 @@ module ScrivitoEditors
     # @param [String, Symbol] attribute_name
     # @param [Hash] options passed to the ++scrivito_tag++ helper
     def scrivito_edit_enum(object, attribute_name, options = {})
-      values = object.obj_class.attributes[attribute_name].values
+      values = _values_for(object, attribute_name)
       values |= [object[attribute_name].to_s]
 
       options.reverse_merge!({
@@ -31,7 +31,7 @@ module ScrivitoEditors
     # @param [String, Symbol] attribute_name
     # @param [Hash] options passed to the ++scrivito_tag++ helper
     def scrivito_edit_multienum(object, attribute_name, options = {})
-      values = object.obj_class.attributes[attribute_name].values
+      values = _values_for(object, attribute_name)
 
       options.reverse_merge!({
         multiple: true,
@@ -125,6 +125,15 @@ module ScrivitoEditors
 
     private
 
+    def _values_for(object, attribute_name)
+      if object.obj_class
+        # pre migration fallback
+        object.obj_class.attributes[attribute_name].try(:values) || []
+      else
+        object.attribute_definitions[attribute_name].try(:values) || []
+      end
+    end
+
     def _edit_link_li(link)
       query = link.query.present? ? "?#{link.query}" : ""
       fragment = link.fragment.present? ? "##{link.fragment}" : ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 0.60.0.rc1
+  version: 0.60.0.rc2
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0.rc1
+        version: 0.60.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0.rc1
+        version: 0.60.0.rc2
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0.rc1
+        version: 0.60.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0.rc1
+        version: 0.60.0.rc2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,6 @@ files:
 - app/assets/javascripts/scrivito_editors/referencelist_editor.js.coffee
 - app/assets/javascripts/scrivito_editors/slider_editor.js.coffee
 - app/assets/javascripts/scrivito_editors/string_editor.js.coffee
-- app/assets/javascripts/scrivito_editors/text_editor.js.coffee
 - app/assets/javascripts/scrivito_editors_addons.js
 - app/assets/javascripts/scrivito_editors_core.js
 - app/assets/stylesheets/jquery-ui-timepicker-addon.min.css

data/app/assets/javascripts/scrivito_editors/text_editor.js.coffee

@@ -1,90 +0,0 @@
-$ ->
-  # This file integrates contenteditable for text attributes.
-  # It provides multiline editing support.
-
-  onKey = (event) ->
-    cmsField = $(event.currentTarget)
-    key = event.keyCode || event.which
-
-    switch key
-      when 27 # Esc
-        event.stopPropagation()
-        cmsField.blur()
-
-  onInput = (event) ->
-    cmsField = $(event.currentTarget)
-    save(cmsField, false)
-
-  onBlur = (event) ->
-    cmsField = $(event.currentTarget)
-
-    save(cmsField, true).done ->
-      if cmsField.attr('data-reload') == 'true'
-        cmsField.scrivito('reload')
-
-  save = (cmsField, andClose) ->
-    cleanUp(cmsField)
-
-    clone = cmsFieldAndPastedContent(cmsField).clone()
-    clone.find('div:not(:has(br))').before('\n')
-    clone.find('br').replaceWith('\n')
-    content = clone.text()
-    clone.remove()
-
-    if andClose
-      cmsField.text(content)
-
-    # Save only if the content has changed.
-    if content != cmsField.scrivito('content')
-      cmsField.scrivito('save', content).done ->
-        cmsField.trigger('save.scrivito_editors')
-    else
-      $.Deferred().resolve()
-
-  cleanUp = (cmsField) ->
-    siblings = cmsFieldAndPastedContent(cmsField)
-    pasted = siblings.not(cmsField)
-    if pasted.length > 0
-      pasted.remove()
-      cmsField.text(siblings.text())
-
-  cmsFieldAndPastedContent = (cmsField) ->
-    siblingsBefore = cmsField.data('scrivito_editors_siblings_before_edit')
-    siblings = cmsField.siblings()
-    needsReset = !siblingsBefore || siblings.filter(siblingsBefore).length < siblingsBefore.length
-    if needsReset
-      cmsField.data('scrivito_editors_siblings_before_edit', siblings)
-    else
-      cmsField.siblings().addBack().not(siblingsBefore)
-
-  DOUBLE_CLICK_MS = 300
-
-  initialize = ->
-    $(':root').on 'mouseenter', '[data-scrivito-field-type="text"]:not([data-editor]), [data-editor~="text"]', (event) ->
-      cmsField = $(@)
-
-      unless cmsField.attr('contenteditable')?
-        html = cmsField.html()
-        html_nl2br = html.replace(/\n/g, '<br />')
-        if html != html_nl2br
-          cmsField.html(html_nl2br)
-
-        cmsField
-          .attr('contenteditable', true)
-          .blur(onBlur)
-          .keypress(onKey)
-          .keyup(onKey)
-          .on('input', onInput)
-
-    $(':root').on 'click', '[data-scrivito-field-type="text"]:not([data-editor]), [data-editor~="text"]', (event) ->
-      cmsField = $(@)
-      cleanUp(cmsField)
-
-      # Prevent editable link strings from being opened on click, but allow an enforcing double click
-      unless event.timeStamp - cmsField.data('scrivito_editors_last_click') < DOUBLE_CLICK_MS
-        event.preventDefault()
-      cmsField.data('scrivito_editors_last_click', event.timeStamp)
-
-  scrivito.on 'load', ->
-    if scrivito.in_editable_view()
-      initialize()