scrivito_editors 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e68077db1a5df9620e228f62c35ba73a45551155
-  data.tar.gz: 5e123dd72c8dbcc44586e5f597976562ecd60419
+  metadata.gz: ab01a47f8d3930f53b531f531e876af4b2cdfcfb
+  data.tar.gz: a763ce5cb7a1bb7cc08d3d982f14849f9871cf52
 SHA512:
-  metadata.gz: 10872a133c7a89f83f011685f357ed0bb247d94c998457f0000871cc91eef2b918b8eb6a3403e6b4386d22499955d64f84731d44eb0c25c1f290a801dd3f04c4
-  data.tar.gz: a32e8317fefc45cc77632a5fb4bedfade91381849df5c98f92758c1595bc9eb206002d6ad822a4df46a6d9bb3cc2ea49d514f5f3d0153d5a12f6a9ae89220b23
+  metadata.gz: 7c893e87c20a703ad41b0b3700ea5c8ad0e81055bbbba85bc13e0200996870c2e83bba4998b2a4635986807892fecfd48365648791dacec6698a4919cdd6f2a4
+  data.tar.gz: 6e9d5f21d7b3eef301331583cfea7875871b8ed556fdbfdee6698e6427a75983cfa8ef21ce864addd99d4cd765c268c37e85f2c24bfff52fb6625f7bd5ecc354

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.0.15
+  * Reduce unwanted `nbsp` in HTML editor
+  * Resolved issues in string and text editor
+  * Experimental feature: double clicking editable link texts follow the link
+
 # v0.0.14
   * Added the `CmsTagHelper` module containing methods that are needed to render the html for
     certain editors.

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

@@ -19,6 +19,7 @@ $ ->
   # Stores redactor options, custom settings and configures callbacks.
   redactorOptions = ->
     return {} =
+      cleanSpaces: false
       convertLinks: false
       formattingPre: false
       paragraphy: false
@@ -94,18 +95,16 @@ $ ->
       $.Deferred().resolve()
 
   # Registers Redactor for all CMS html attributes found in the given scope of the DOM element.
-  addOnclickRedactorHandlers = (domElement) ->
-    domElement.on 'click', '[data-scrivito-field-type="html"]:not([data-editor]), [data-editor~="html"]', (event) ->
+  addOnclickRedactorHandlers = ->
+    $(':root').on 'click.scrivito_editors', '[data-scrivito-field-type="html"]:not([data-editor]), [data-editor~="html"]', (event) ->
       event.preventDefault()
       cmsField = $(@)
 
       unless cmsField.hasClass('redactor_editor')
-        cmsField.replaceWith(cmsField = cmsField.clone(true, true))
         cmsField.redactor(redactorOptions())
         cmsField.redactor('set', cmsField.scrivito('content'), false)
         cmsField.redactor('focus')
 
-  # Registers all handlers when content has changed.
-  scrivito.on 'content', (domElement) ->
+  scrivito.on 'load', ->
     if scrivito.in_editable_view()
-      addOnclickRedactorHandlers($(domElement))
+      addOnclickRedactorHandlers()

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

@@ -50,15 +50,22 @@ $ ->
       cmsField.text(siblings.text())
 
   cmsFieldAndPastedContent = (cmsField) ->
-    cmsField.siblings().addBack().not(cmsField.data('siblings_before_edit'))
+    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 = ->
-    $('body').on 'mouseenter', '[data-scrivito-field-type="string"]:not([data-editor]), [data-editor~="string"]', (event) ->
-      cmsField = $(event.currentTarget)
+    $(':root').on 'mouseenter', '[data-scrivito-field-type="string"]:not([data-editor]), [data-editor~="string"]', (event) ->
+      cmsField = $(@)
 
       unless cmsField.attr('contenteditable')?
         cmsField
-          .data('siblings_before_edit', cmsField.siblings())
           .attr('contenteditable', true)
           .blur(onBlur)
           .keypress(onKey)
@@ -67,9 +74,15 @@ $ ->
       if cmsField.attr('data-autosave') != 'false'
         cmsField.on('input', onInput)
 
-    # 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()
+    $(':root').on 'click', '[data-scrivito-field-type="string"]:not([data-editor]), [data-editor~="string"]', (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()

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

@@ -48,11 +48,17 @@ $ ->
       cmsField.text(siblings.text())
 
   cmsFieldAndPastedContent = (cmsField) ->
-    cmsField.siblings().addBack().not(cmsField.data('siblings_before_edit'))
+    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)
 
   initialize = ->
-    $('body').on 'mouseenter', '[data-scrivito-field-type="text"]:not([data-editor]), [data-editor~="text"]', (event) ->
-      cmsField = $(event.currentTarget)
+    $(':root').on 'mouseenter', '[data-scrivito-field-type="text"]:not([data-editor]), [data-editor~="text"]', (event) ->
+      cmsField = $(@)
 
       unless cmsField.attr('contenteditable')?
         html = cmsField.html()
@@ -61,16 +67,20 @@ $ ->
           cmsField.html(html_nl2br)
 
         cmsField
-          .data('siblings_before_edit', cmsField.siblings())
           .attr('contenteditable', true)
           .blur(onBlur)
           .keypress(onKey)
           .keyup(onKey)
           .on('input', onInput)
 
-    # 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()
+    $(':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()

data/lib/scrivito_editors/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoEditors
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties