scrivito_editors 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf1ebdd00044d7054e121007f00f33c8db2d49c5
-  data.tar.gz: daf06bd788bba66cad36195e3d03243f2bf51f3c
+  metadata.gz: 8932ef4918333e5dfaaf6f17709443047b70d43a
+  data.tar.gz: 6bc0d6dc0e4ed00f1448552050de29219e31435b
 SHA512:
-  metadata.gz: d9571c486b4a348b976259632dd20194eff1e8af0acb3cc12a29e30e844e5e60cac5930080b594183976e770f2daf23ca0c99f2329dcce958cd9e8fe38b2b8b3
-  data.tar.gz: f62413860d2790e1d6a9195b6dd653ff5ccd4a6207b96ba10d987562d6c05114d87ca197740024b18dcd3ba2494e1d0fd4aeac276bbb1ea7337389bc6785e412
+  metadata.gz: 029b31a17c912f02275c8b7736d5275e6cabc7d7c440bc792a74d7f3ef4768d6ce07b057113bf854edee920c043e17d57ee305c26946d3e8f876ced682e0ef21
+  data.tar.gz: 19fe0d897f4d49b9b0ea350c71e2b87964a105a653191935acdb23f8c066a22547c08ddec9eacd452e6b52f2ea73c4b46f50eb339aaf923e78a5b086a247201a

data/CHANGELOG.md

@@ -1,6 +1,9 @@
+# v0.0.9
+  * Bugfix: It is now possible to have multiple string and text editors active at the same time.
+
 # v0.0.8
   * Use Twitter Bootstrap styling for enum and multienum select fields.
-  
+
 # v0.0.7
   * Linklist and referencelist editors now better handle all aspects of the inplace editing process
     for these two attributes. The "add" button no longer has to be rendered by the application code.

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

@@ -1,74 +1,69 @@
 $ ->
   # This file integrates contenteditable for string attributes.
 
-  scrivito.on 'editing', ->
-    cmsField = undefined
-    timeout = undefined
-
-    onKey = (event) ->
-      if timeout?
-        clearTimeout(timeout)
-
-      if cmsField?
-        key = event.keyCode || event.which
-
-        switch key
-          when 13 # Enter
-            event.preventDefault()
-            cmsField.blur()
-          when 27 # Esc
-            if event.type == 'keyup'
-              event.stopPropagation()
-              cmsField
-                .off('blur')
-                .trigger('scrivito_reload')
-              cmsField = undefined
-          else
-            setTimeout(cleanUp)
-            timeout = setTimeout ( ->
-              save(false)
-            ), 3000
-
-    onBlur = (event) ->
-      if cmsField?
-        field = cmsField
-
-        save(true).done ->
-          if field.attr('data-reload') == 'true'
-            field.trigger('scrivito_reload')
-
-    save = (andClose) ->
-      if timeout?
-        clearTimeout(timeout)
-
-      cleanUp()
-
-      clone = cmsFieldAndPastedContent().clone()
-      clone.find('br').replaceWith('\n')
-      content = clone.text()
-      clone.remove()
-
-      field = cmsField
-
-      if andClose
-        cmsField.text(content)
-        cmsField = undefined
-
-      field.scrivito('save', content)
-
-    cleanUp = ->
-      siblings = cmsFieldAndPastedContent()
-      pasted = siblings.not(cmsField)
-      if pasted.length > 0
-        pasted.remove()
-        cmsField.text(siblings.text())
-
-    cmsFieldAndPastedContent = ->
-      cmsField.siblings().addBack().not(cmsField.data('siblings_before_edit'))
-
+  timeout = undefined
+
+  onKey = (event) ->
+    if timeout?
+      clearTimeout(timeout)
+
+    cmsField = $(event.currentTarget)
+    key = event.keyCode || event.which
+
+    switch key
+      when 13 # Enter
+        event.preventDefault()
+        cmsField.blur()
+      when 27 # Esc
+        if event.type == 'keyup'
+          event.stopPropagation()
+          cmsField
+            .off('blur')
+            .trigger('scrivito_reload')
+      else
+        setTimeout ->
+          cleanUp(cmsField)
+
+        timeout = setTimeout ( ->
+          save(cmsField, false)
+        ), 3000
+
+  onBlur = (event) ->
+    cmsField = $(event.currentTarget)
+
+    save(cmsField, true).done ->
+      if cmsField.attr('data-reload') == 'true'
+        cmsField.trigger('scrivito_reload')
+
+  save = (cmsField, andClose) ->
+    if timeout?
+      clearTimeout(timeout)
+
+    cleanUp(cmsField)
+
+    clone = cmsFieldAndPastedContent(cmsField).clone()
+    clone.find('br').replaceWith('\n')
+    content = clone.text()
+    clone.remove()
+
+    if andClose
+      cmsField.text(content)
+
+    cmsField.scrivito('save', content)
+
+  cleanUp = (cmsField) ->
+    siblings = cmsFieldAndPastedContent(cmsField)
+    pasted = siblings.not(cmsField)
+    if pasted.length > 0
+      pasted.remove()
+      cmsField.text(siblings.text())
+
+  cmsFieldAndPastedContent = (cmsField) ->
+    cmsField.siblings().addBack().not(cmsField.data('siblings_before_edit'))
+
+  initialize = ->
     $('body').on 'mouseenter', '[data-scrivito-field-type="string"]:not([data-editor]), [data-editor="string"]', (event) ->
-      unless cmsField?
-        cmsField = $(event.currentTarget)
+      cmsField = $(event.currentTarget)
 
       unless cmsField.attr('contenteditable')?
         cmsField
@@ -81,3 +76,6 @@ $ ->
     # Prevent editable link strings to follow the link target on click.
     $('body').on 'click', '[data-scrivito-field-type="string"]:not([data-editor]), [data-editor="string"]', (event) ->
       event.preventDefault()
+
+  scrivito.on 'editing', ->
+    initialize()

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

@@ -2,77 +2,73 @@ $ ->
   # This file integrates contenteditable for text attributes.
   # It provides multiline editing support.
 
-  scrivito.on 'editing', ->
-    cmsField = undefined
-    timeout = undefined
-
-    onKey = (event) ->
-      if timeout?
-        clearTimeout(timeout)
-
-      if cmsField?
-        key = event.keyCode || event.which
-
-        switch key
-          when 27 # Esc
-            if event.type == 'keyup'
-              event.stopPropagation()
-              cmsField
-                .off('blur')
-                .trigger('scrivito_reload')
-              cmsField = undefined
-          else
-            setTimeout(cleanUp)
-            timeout = setTimeout ( ->
-              save(false)
-            ), 3000
-
-    onBlur = (event) ->
-      if cmsField?
-        field = cmsField
-
-        save(true).done ->
-          if field.attr('data-reload') == 'true'
-            field.trigger('scrivito_reload')
-
-    save = (andClose) ->
-      if timeout?
-        clearTimeout(timeout)
-
-      cleanUp()
-
-      clone = cmsFieldAndPastedContent().clone()
-      clone.find('br').replaceWith('\n')
-      content = clone.text()
-      clone.remove()
-
-      field = cmsField
-
-      if andClose
-        cmsField.text(content)
-        cmsField = undefined
-
-      field.scrivito('save', content)
-
-    cleanUp = ->
-      siblings = cmsFieldAndPastedContent()
-      pasted = siblings.not(cmsField)
-      if pasted.length > 0
-        pasted.remove()
-        cmsField.text(siblings.text())
-
-    cmsFieldAndPastedContent = ->
-      cmsField.siblings().addBack().not(cmsField.data('siblings_before_edit'))
-
+  timeout = undefined
+
+  onKey = (event) ->
+    if timeout?
+      clearTimeout(timeout)
+
+    cmsField = $(event.currentTarget)
+    key = event.keyCode || event.which
+
+    switch key
+      when 27 # Esc
+        if event.type == 'keyup'
+          event.stopPropagation()
+          cmsField
+            .off('blur')
+            .trigger('scrivito_reload')
+      else
+        setTimeout ->
+          cleanUp(cmsField)
+          
+        timeout = setTimeout ( ->
+          save(cmsField, false)
+        ), 3000
+
+  onBlur = (event) ->
+    cmsField = $(event.currentTarget)
+
+    save(cmsField, true).done ->
+      if cmsField.attr('data-reload') == 'true'
+        cmsField.trigger('scrivito_reload')
+
+  save = (cmsField, andClose) ->
+    if timeout?
+      clearTimeout(timeout)
+
+    cleanUp(cmsField)
+
+    clone = cmsFieldAndPastedContent(cmsField).clone()
+    clone.find('br').replaceWith('\n')
+    content = clone.text()
+    clone.remove()
+
+    if andClose
+      cmsField.text(content)
+
+    cmsField.scrivito('save', content)
+
+  cleanUp = (cmsField) ->
+    siblings = cmsFieldAndPastedContent(cmsField)
+    pasted = siblings.not(cmsField)
+    if pasted.length > 0
+      pasted.remove()
+      cmsField.text(siblings.text())
+
+  cmsFieldAndPastedContent = (cmsField) ->
+    cmsField.siblings().addBack().not(cmsField.data('siblings_before_edit'))
+
+  initialize = ->
     $('body').on 'mouseenter', '[data-scrivito-field-type="text"]:not([data-editor]), [data-editor="text"]', (event) ->
-      unless cmsField?
-        cmsField = $(event.currentTarget)
-
-      html = cmsField.html()
-      html_nl2br = html.replace(/\n/g, '<br />')
-      cmsField.html(html_nl2br) if html != html_nl2br
+      cmsField = $(event.currentTarget)
 
       unless cmsField.attr('contenteditable')?
+        html = cmsField.html()
+        html_nl2br = html.replace(/\n/g, '<br />')
+        if html != html_nl2br
+          cmsField.html(html_nl2br)
+
         cmsField
           .data('siblings_before_edit', cmsField.siblings())
           .attr('contenteditable', true)
@@ -83,3 +79,6 @@ $ ->
     # Prevent editable link text to follow the link target on click.
     $('body').on 'click', '[data-scrivito-field-type="text"]:not([data-editor]), [data-editor="text"]', (event) ->
       event.preventDefault()
+
+  scrivito.on 'editing', ->
+    initialize()

data/lib/scrivito_editors/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoEditors
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties