scrivito_editors 0.40.0 → 0.41.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8cd655f0c8e4dc6ef31ab2370da5166cb50e17d
-  data.tar.gz: af2c116ad1ebf36bfc69efcc2b28281bc7927c78
+  metadata.gz: 67f5aedc7181ead6c2782fae77773a56dfa8ff61
+  data.tar.gz: 162b00e6981d66cec5e975f39df882c00a57ce55
 SHA512:
-  metadata.gz: 8a07c21e92396e780db4f5b92d8636da87e46189a297a5688f2348fa54460ae912b131fbea03b8fcdbaf3bea140e7c834565da66cd27f93e6d75afbf728483fb
-  data.tar.gz: 5fded99d3f799e35c0c05f442a35ca8ae85f2ae394769886fcb8e1f25fc1e45fdda529c4858468025ff9c361ed6963e1c72729480dd64560aa411ee1b75edc02
+  metadata.gz: 3543ba8d15cd33d894b30aa74074bdb4581c025d81ce6ae5ba46092bdd2ba6bbe7d0dff1d30a9618864cfc7ec1e33c768aa7df21e90ec361e8994962c2951b03
+  data.tar.gz: 91c45bf04573c1650313d3bcd93b6934649cd33d9314efe8c0595bef8294908081940378ebb465b20e049f34cd0e98a0edc436874667baa9493c74d606e5e9f8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.41.0
+  * Link and linklist editors initially show description for editor (for internal links).
+
 # v0.40.0
   * Updated HTML editor to Redactor 10.0.6
   * Introduced API for Redactor options, e. g.

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

@@ -1,49 +1,22 @@
-$ ->
-  selector = '[data-scrivito-field-type=binary]:not([data-editor])'
-  status_indicator_class = 'image-editor-dragover'
-  image_container_class = 'scrivito-editor-image-container'
-
-  handle_file_upload = (event, element, file) ->
-    element.scrivito('save', file).then ->
-      element.scrivito('reload')
-
-  delete_binary = (cms_field) ->
-    if $(cms_field).scrivito('content')
-      $(cms_field).scrivito('save', null).then ->
-        $(cms_field).scrivito('reload')
-
-  binary_field_container = (binary_field) ->
-    if $(binary_field).prop('tagName') == 'IMG'
-      if $(binary_field).parent(".#{image_container_class}").length == 0
-        $(binary_field).wrap("<div class='#{image_container_class}'></div>")
-      $(binary_field).parent(".#{image_container_class}")
-    else
-      binary_field
-
-  add_delete_to_binary = (binary_element) ->
-    if $(binary_element).scrivito('content')
-      container = binary_field_container(binary_element)
-
-      if $(container).find('delete-binary').length == 0
-        delete_icon = $(
-          '<a href="#" class="delete-binary editing-button editing-red delete">' +
-          '<i class="editing-icon editing-icon-trash" /></a>'
-        )
-
-        delete_icon.click (event) ->
-          event.preventDefault()
-          delete_binary(binary_element)
-
-        $(container).prepend(delete_icon)
-
-  scrivito.on 'content', (content_root) ->
-    if scrivito.in_editable_view()
-      binary_elements = $(content_root).find(
-        "#{selector}[data-scrivito-editors-allow-delete]")
-
-      for binary_element in binary_elements
-        add_delete_to_binary(binary_element)
-
-  scrivito.on 'load', ->
-    if scrivito.in_editable_view()
-      scrivito.editors._file_drop_zone(selector, handle_file_upload, status_indicator_class)
+scrivito.on 'content', (content) ->
+  return unless scrivito.in_editable_view()
+  fields = $(content).find('[data-scrivito-field-type=binary]:not([data-editor])')
+  scrivito.editors._file_dropzone fields,
+    (el, file) -> el.scrivito('save', file).then(-> el.scrivito('reload')),
+    'image-editor-dragover'
+  fields.filter('[data-scrivito-editors-allow-delete]').each -> setup_delete_btn $(this)
+
+setup_delete_btn = (el) ->
+  return unless el.scrivito('content')
+  container = if el.prop('tagName') is 'IMG'
+    css_class = 'scrivito-editor-image-container'
+    el.wrap("<div class=#{css_class}></div>") unless el.parent(".#{css_class}").length
+    el.parent(".#{css_class}")
+  else
+    el
+
+  return if container.find('.delete-binary').length
+  $("<a href=# class='delete-binary editing-button editing-red delete'>
+     <i class='editing-icon editing-icon-trash'></i></a>")
+    .prependTo(container)
+    .click -> el.scrivito('save', null).then(-> el.scrivito('reload')) and off

data/app/assets/javascripts/scrivito_editors/helpers/file_dropzone.js.coffee

@@ -0,0 +1,10 @@
+scrivito.editors._file_dropzone = (fields, callback) -> fields.each(-> setup $(this), callback)
+setup = (el, callback) ->
+  field = el.closest('[data-scrivito-field-name]')
+  el.on 'dragenter', -> field.addClass('image-editor-dragover') and off
+  el.on 'dragleave', -> field.removeClass('image-editor-dragover') and off
+  el.on 'drop', (e) ->
+    field.removeClass 'image-editor-dragover'
+    if (files = e.originalEvent.dataTransfer?.files)?.length is 1
+      callback field, files[0]
+    off

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

@@ -1,37 +1,21 @@
-$ ->
-  statusIndicatorClass = 'image-editor-dragover'
-
-  activateForFieldType = (fieldType) ->
-    selector = 'img[data-scrivito-field-type=' + fieldType  + ']:not([data-editor])'
-    scrivito.editors._file_drop_zone(selector, save)
-
-  save = (event, element, file) ->
-    fieldType = element.attr('data-scrivito-field-type')
-
-    createImage(file).then (obj) ->
-      value = switch
-        when fieldType == 'reference' then obj.id
-        when fieldType == 'linklist' then [{obj_id: obj.id}]
-        else $.error('Field type must be "reference" or "linklist".')
-
-      element.scrivito('save', value).then ->
-        element.scrivito('reload')
-
-  createImage = (file) ->
-    name = file.name.replace(/[^a-z0-9_.$\-]/ig, '-')
-    path = '_resources/' + Math.floor(Math.random() * 1000) + '/' + name
-
-    scrivito.create_obj
-      blob: file
-      _path: path
-      _obj_class: 'Image'
-
-  # Integrates an image drag & drop editor.
-  scrivito.on 'load', ->
-    if scrivito.in_editable_view()
-      # Activate the image editor for all supported field types.
-      activateForFieldType('linklist')
-      activateForFieldType('reference')
-
-      # Activate the image editor if it is explicitely selected.
-      scrivito.editors._file_drop_zone('[data-editor~="image"]', save,statusIndicatorClass)
+scrivito.on 'content', (content) ->
+  return unless scrivito.in_editable_view()
+  setup = (sel) -> scrivito.editors._file_dropzone $(content).find(sel), save
+  setup 'img[data-scrivito-field-type=linklist]:not([data-editor])'
+  setup 'img[data-scrivito-field-type=reference]:not([data-editor])'
+  setup '[data-editor~=image]'
+
+save = (field, file) ->
+  createImage(file).then (obj) ->
+    type = field.attr('data-scrivito-field-type')
+    value = switch
+      when type is 'reference' then obj.id
+      when type is 'linklist'  then [{obj_id: obj.id}]
+      else $.error 'Field type must be "reference" or "linklist"'
+    field.scrivito('save', value).then -> field.scrivito('reload')
+
+createImage = (blob) ->
+  name = blob.name.replace(/[^a-z0-9_.$\-]/ig, '-')
+  _path = "_resources/#{Math.floor(Math.random() * 1000)}/#{name}"
+  _obj_class = 'Image'
+  scrivito.create_obj {blob, _path, _obj_class}

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

@@ -6,17 +6,18 @@ $ ->
   template = (attributes) ->
     attributes ||= {}
 
+    description = attributes['description'] || ''
     title = attributes['title'] || ''
     url = attributes['url'] || ''
 
-    $("<ul><li>
-       <input type=\"text\" name=\"title\" value=\"#{title}\" placeholder=\"Title\" />
-       <input type=\"text\" name=\"url\" value=\"#{url}\" placeholder=\"Url\" class=\"editing-url\" />
+    $("<input type=\"text\" name=\"title\" value=\"#{title}\" placeholder=\"Title\" />
+       <input type=\"text\" name=\"url\" value=\"#{description}\" data-value=\"#{url}\"
+           placeholder=\"Url\" class=\"editing-url\" />
        <div class=\"actions\">
          <a href=\"#\" class=\"editing-button content-browser-open editing-green\">
            <i class=\"editing-icon editing-icon-search\" />
          </a>
-       </div></li></ul>")
+       </div>")
 
   contentBrowserButtonTemplate = ->
     icon = $('<i></i>')
@@ -62,7 +63,9 @@ $ ->
   # Resource browser callback for saving a single link.
   onContentBrowserSaveLinkItem = (selection, linkItem) ->
     url = buildUrl(selection[0])
-    linkItem.find('[name=url]').val(url)
+    linkItem.find('[name=url]')
+      .data "value", url
+      .val "Content browser selection (#{url})"
 
     # trigger save after inserting the value
     cmsField = getCmsField(linkItem)
@@ -82,7 +85,8 @@ $ ->
     if items.length > 0
       item = $(items[0])
       title = item.find('[name=title]').val()
-      url = item.find('[name=url]').val()
+      input = item.find('[name=url]')
+      url = input.data('value') || input.val()
 
       if url
         'title': title
@@ -98,10 +102,17 @@ $ ->
         item = $(item)
 
         content = template
+          description: item.data('description')
           title: item.data('title')
           url: item.data('url')
 
         item.html(content)
+          .find('[name=url]')
+          .on 'focus', ->
+            input = $(this)
+            raw = input.data 'value'
+            input.val raw if raw
+            input.data 'value', null
 
       if items.length == 0
         cmsField.append(template())

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

@@ -6,11 +6,13 @@ $ ->
   template = (attributes) ->
     attributes ||= {}
 
+    description = attributes['description'] || ''
     title = attributes['title'] || ''
     url = attributes['url'] || ''
 
     $("<input type=\"text\" name=\"title\" value=\"#{title}\" placeholder=\"Title\" />
-       <input type=\"text\" name=\"url\" value=\"#{url}\" placeholder=\"Url\" class=\"editing-url\" />
+       <input type=\"text\" name=\"url\" value=\"#{description}\" data-value=\"#{url}\"
+           placeholder=\"Url\" class=\"editing-url\" />
        <div class=\"actions\">
          <a href=\"#\" class=\"editing-button content-browser-open editing-green\">
            <i class=\"editing-icon editing-icon-search\" />
@@ -67,7 +69,9 @@ $ ->
   # Resource browser callback for saving a single link.
   onContentBrowserSaveLinkItem = (selection, linkItem) ->
     url = buildUrl(selection[0])
-    linkItem.find('[name=url]').val(url)
+    linkItem.find('[name=url]')
+      .data "value", url
+      .val "Content browser selection (#{url})"
 
     # trigger save after inserting the value
     cmsField = getCmsField(linkItem)
@@ -88,7 +92,8 @@ $ ->
       for item in items
         item = $(item)
         title = item.find('[name=title]').val()
-        url = item.find('[name=url]').val()
+        input = item.find('[name=url]')
+        url = input.data('value') || input.val()
 
         # Make sure the url is not empty.
         if !isEmpty(url)
@@ -133,10 +138,17 @@ $ ->
       item = $(item)
 
       content = template
+        description: item.data('description')
         title: item.data('title')
         url: item.data('url')
 
       item.html(content)
+        .find('[name=url]')
+        .on 'focus', ->
+          input = $(this)
+          raw = input.data 'value'
+          input.val raw if raw
+          input.data 'value', null
 
   # Returns the last saved value.
   getLastSaved = (cmsField) ->

data/app/assets/javascripts/scrivito_editors_core.js

@@ -2,4 +2,12 @@
 //= require_self
 //= require_tree ./scrivito_editors
 
-scrivito.editors = {}
+scrivito.editors = {};
+
+scrivito.on('load', function() {
+  if (scrivito.in_editable_view()) {
+    scrivito.register_select_content(function() {
+      return scrivito.content_browser.open({selectionMode: 'single'});
+    });
+  }
+});

data/app/helpers/scrivito_editors/scrivito_tag_helper.rb

@@ -129,7 +129,7 @@ module ScrivitoEditors
       query = link.query.present? ? "?#{link.query}" : ""
       url = link.internal? ? scrivito_path(link).sub(/\?.*/, query) : link.url
       description = link.internal? ? link.obj.description_for_editor : link.url
-      data = { title: link.title, url: url }
+      data = { description: description, title: link.title, url: url }
       data[:id] = link.obj.id if link.internal?
 
       content_tag(:li, data: data) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-05 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.40.0
+        version: 0.41.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.41.0.rc1
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.41.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.41.0.rc1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ files:
 - app/assets/javascripts/scrivito_editors/binary_editor.js.coffee
 - app/assets/javascripts/scrivito_editors/date_editor.js.coffee
 - app/assets/javascripts/scrivito_editors/enum_editor.js.coffee
-- app/assets/javascripts/scrivito_editors/helpers/file_drop_zone.js.coffee
+- app/assets/javascripts/scrivito_editors/helpers/file_dropzone.js.coffee
 - app/assets/javascripts/scrivito_editors/html_editor.js.coffee
 - app/assets/javascripts/scrivito_editors/image_editor.js.coffee
 - app/assets/javascripts/scrivito_editors/link_editor.js.coffee

data/app/assets/javascripts/scrivito_editors/helpers/file_drop_zone.js.coffee

@@ -1,43 +0,0 @@
-fetch_file = (event) ->
-  data_transfer = event.originalEvent.dataTransfer
-  return unless data_transfer
-
-  files = data_transfer.files
-  if (files.length > 1)
-    alert('You dropped multiple files, but only one file is supported.')
-    return
-
-  files[0]
-
-find_cms_field = (target) ->
-  if $(target).attr('data-scrivito-field-name')
-    $(target)
-  else
-    $(target).parent('[data-scrivito-field-name]')
-
-scrivito.editors._file_drop_zone = (selector, callback, status_indicator_class) ->
-  # Disable DnD for all elements by default to prevent the user
-  # from accidentally opening an image in browser.
-  $('body').on 'dragover', -> false
-  $('body').on 'drop', -> false
-
-  status_indicator_class ||= 'scrivito-editor-dragover'
-
-  body_element = $('body')
-  body_element.on 'dragover.scrivito-editor', selector, (event) ->
-    event.preventDefault()
-    $(find_cms_field(event.target)).addClass(status_indicator_class)
-
-  body_element.on 'dragleave.scrivito-editor', selector, (event) ->
-    event.preventDefault()
-    $(find_cms_field(event.target)).removeClass(status_indicator_class)
-
-  body_element.on 'drop.scrivito-editor', selector, (event) ->
-    event.preventDefault()
-    cms_field = find_cms_field(event.target)
-    file = fetch_file(event)
-    $(cms_field).removeClass(status_indicator_class)
-
-    if file
-      callback(event, cms_field, file)
-