scrivito_editors 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18977d126e4b35ad587ce7fb5037209c057d903b
-  data.tar.gz: 9031005f81cffa1fe61c817b8e25fb17038d5ffe
+  metadata.gz: 664c752683fce0e45ced59c64ddc88bbd8e2571d
+  data.tar.gz: 80d4b66240203c032fc7a61ea323142eb40a6f16
 SHA512:
-  metadata.gz: 9bdc8e2382aa12229772012003692b34116b92ff90a760c0dbd34a3a859da4d3fcded838a5f054df5790ab5a33a62e9dbe1f3be8762a395163745e6858a56edc
-  data.tar.gz: df60487fb2c03b11209b818f55395836d722b3fccbbb22a93dd3991ca2b0717f9759141d7299ff103264e37f4266321e97f329870c9067bca574d44c5e895609
+  metadata.gz: d4c34cea254c1c34308d3384e82830c6ede0acac50b0ed205795557b2b4115017cdd7a8dbe5d777ec985f621f0e525fffb6c84ced188cd371ceefae40fbdb425
+  data.tar.gz: 09758ec3293500ba33c49913af4e21abbb1d605967be1214dcdb467d2953ed5574f986e149789fabe03688e1d0054b650750f020b2f025e72b7c1ddd9d9b642a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.0.12
+  * Rails no longer supports the `vendor` directory, so we moved the assets into the standard asset
+    folder, so that they are integrated into the asset pipeline automatically.
+  * Integrate new Scrivito SDK JavaScript events.
+  * Editing `enum` and `multienum` fields no longer triggers a page or widget reload.
+
 # v0.0.11
   * Added "Close" button to the HTML editor, to have an additional option to close the editor,
     besides hitting "Esc".

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

@@ -1,51 +1,52 @@
 $ ->
   # Define editor behavior for date attributes.
 
-  scrivito.on 'editing', ->
-    template = ->
-      $('<input />')
-        .attr('type', 'text')
-
-    onKeyup = (event) ->
-      key = event.keyCode || event.which
-
-      switch key
-        when 27 # Esc
-          # Prevent the property view to close when the ESC key is pressed.
-          event.stopPropagation()
-
-    save = (dateTimeText) ->
-      element = $(this)
-      cmsField = element.data('cmsField')
-
-      if dateTimeText? && dateTimeText.length > 0
-        dateTimeText = new Date(dateTimeText)
-
-      cmsField.scrivito('save', dateTimeText)
-        .done ->
-          cmsField.trigger('save.scrivito_editors')
-          cmsField.trigger('scrivito_reload')
-
-    $('body').on 'click', '[data-scrivito-field-type="date"]:not(.hasDatepicker):not([data-editor]), [data-editor="date"]', (event) ->
-      event.preventDefault()
-
-      cmsField = $(this)
-      content = cmsField.html().trim()
-      dateFormat = cmsField.attr('data-date-format') || 'yy-mm-dd'
-      timeFormat = cmsField.attr('data-time-format') || 'HH:mm:ss'
-
-      $('body').keyup(onKeyup)
-
-      template()
-        .data('cmsField', cmsField)
-        .insertAfter(cmsField)
-        .val(content)
-        .keyup(onKeyup)
-        .datetimepicker(
-          dateFormat: dateFormat
-          timeFormat: timeFormat
-          onClose: save
-        )
-        .focus()
-
-      cmsField.hide()
+  scrivito.on 'load', ->
+    if scrivito.in_editable_view()
+      template = ->
+        $('<input />')
+          .attr('type', 'text')
+
+      onKeyup = (event) ->
+        key = event.keyCode || event.which
+
+        switch key
+          when 27 # Esc
+            # Prevent the property view to close when the ESC key is pressed.
+            event.stopPropagation()
+
+      save = (dateTimeText) ->
+        element = $(this)
+        cmsField = element.data('cmsField')
+
+        if dateTimeText? && dateTimeText.length > 0
+          dateTimeText = new Date(dateTimeText)
+
+        cmsField.scrivito('save', dateTimeText)
+          .done ->
+            cmsField.trigger('save.scrivito_editors')
+            cmsField.trigger('scrivito_reload')
+
+      $('body').on 'click', '[data-scrivito-field-type="date"]:not(.hasDatepicker):not([data-editor]), [data-editor="date"]', (event) ->
+        event.preventDefault()
+
+        cmsField = $(this)
+        content = cmsField.html().trim()
+        dateFormat = cmsField.attr('data-date-format') || 'yy-mm-dd'
+        timeFormat = cmsField.attr('data-time-format') || 'HH:mm:ss'
+
+        $('body').keyup(onKeyup)
+
+        template()
+          .data('cmsField', cmsField)
+          .insertAfter(cmsField)
+          .val(content)
+          .keyup(onKeyup)
+          .datetimepicker(
+            dateFormat: dateFormat
+            timeFormat: timeFormat
+            onClose: save
+          )
+          .focus()
+
+        cmsField.hide()

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

@@ -1,37 +1,37 @@
 $ ->
   # Define editor behavior for enum attributes.
 
-  scrivito.on 'editing', ->
-    template = (values) ->
-      element = $('<select></select>')
-        .addClass('form-control')
+  scrivito.on 'load', ->
+    if scrivito.in_editable_view()
+      template = (values) ->
+        element = $('<select></select>')
+          .addClass('form-control')
 
-      $.each values, (index, value) ->
-        $('<option></option>')
-          .attr('value', value)
-          .text(value)
-          .appendTo(element)
+        $.each values, (index, value) ->
+          $('<option></option>')
+            .attr('value', value)
+            .text(value)
+            .appendTo(element)
 
-      element
+        element
 
-    save = (event) ->
-      element = $(event.currentTarget)
-      cmsField = element.data('cmsField')
-      content = element.val()
-      cmsField.scrivito('save', content).done ->
-        cmsField.trigger('save.scrivito_editors')
-        cmsField.trigger('scrivito_reload')
+      save = (event) ->
+        element = $(event.currentTarget)
+        cmsField = element.data('cmsField')
+        content = element.val()
+        cmsField.scrivito('save', content).done ->
+          cmsField.trigger('save.scrivito_editors')
 
-    $(document).on 'click', '[data-scrivito-field-type="enum"]:not([data-editor]), [data-editor="enum"]', (event) ->
-      cmsField = $(event.currentTarget)
-      selected = cmsField.scrivito('content')
-      values = cmsField.data('values')
+      $(document).on 'click', '[data-scrivito-field-type="enum"]:not([data-editor]), [data-editor="enum"]', (event) ->
+        cmsField = $(event.currentTarget)
+        selected = cmsField.scrivito('content')
+        values = cmsField.data('values')
 
-      template(values)
-        .data('cmsField', cmsField)
-        .val(selected)
-        .insertAfter(cmsField)
-        .focusout(save)
-        .focus()
+        template(values)
+          .data('cmsField', cmsField)
+          .val(selected)
+          .insertAfter(cmsField)
+          .focusout(save)
+          .focus()
 
-      cmsField.hide()
+        cmsField.hide()

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

@@ -86,10 +86,7 @@ $ ->
         cmsField.redactor(redactorOptions())
         cmsField.redactor('focus')
 
-  # Registers all handlers when inplace editing is activated.
-  scrivito.on 'editing', ->
-    addOnclickRedactorHandlers($('body'))
-
   # Registers all handlers when content has changed.
-  scrivito.on 'new_content', (domElement) ->
-    addOnclickRedactorHandlers($(domElement))
+  scrivito.on 'content', (domElement) ->
+    if scrivito.in_editable_view()
+      addOnclickRedactorHandlers($(domElement))

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

@@ -171,8 +171,6 @@ $ ->
           save(cmsField)
 
   # Initialize linklist editor and setup event callbacks.
-  scrivito.on 'new_content', (root) ->
-    initialize(root)
-
-  scrivito.on 'editing', ->
-    initialize(document)
+  scrivito.on 'content', (root) ->
+    if scrivito.in_editable_view()
+      initialize(root)

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

@@ -1,38 +1,38 @@
 $ ->
   # Define editor behavior for multienum attributes.
 
-  scrivito.on 'editing', ->
-    template = (values) ->
-      element = $('<select></select>')
-        .attr('multiple', 'true')
-        .addClass('form-control')
+  scrivito.on 'load', ->
+    if scrivito.in_editable_view()
+      template = (values) ->
+        element = $('<select></select>')
+          .attr('multiple', 'true')
+          .addClass('form-control')
 
-      $.each values, (index, value) ->
-        $('<option></option>')
-          .attr('value', value)
-          .text(value)
-          .appendTo(element)
+        $.each values, (index, value) ->
+          $('<option></option>')
+            .attr('value', value)
+            .text(value)
+            .appendTo(element)
 
-      element
+        element
 
-    save = (event) ->
-      element = $(event.currentTarget)
-      cmsField = element.data('cmsField')
-      content = element.val()
-      cmsField.scrivito('save', content).done ->
-        cmsField.trigger('save.scrivito_editors')
-        cmsField.trigger('scrivito_reload')
+      save = (event) ->
+        element = $(event.currentTarget)
+        cmsField = element.data('cmsField')
+        content = element.val()
+        cmsField.scrivito('save', content).done ->
+          cmsField.trigger('save.scrivito_editors')
 
-    $(document).on 'click', '[data-scrivito-field-type="multienum"]:not([data-editor]), [data-editor="multienum"]', (event) ->
-      cmsField = $(event.currentTarget)
-      selected = cmsField.scrivito('content')
-      values = cmsField.data('values')
+      $(document).on 'click', '[data-scrivito-field-type="multienum"]:not([data-editor]), [data-editor="multienum"]', (event) ->
+        cmsField = $(event.currentTarget)
+        selected = cmsField.scrivito('content')
+        values = cmsField.data('values')
 
-      template(values)
-        .data('cmsField', cmsField)
-        .val(selected)
-        .insertAfter(cmsField)
-        .focusout(save)
-        .focus()
+        template(values)
+          .data('cmsField', cmsField)
+          .val(selected)
+          .insertAfter(cmsField)
+          .focusout(save)
+          .focus()
 
-      cmsField.hide()
+        cmsField.hide()

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

@@ -15,8 +15,6 @@ $ ->
 
       cmsField.attr('data-placeholder', placeholder)
 
-  scrivito.on 'new_content', ->
-    addPlaceholder()
-
-  scrivito.on 'editing', ->
-    addPlaceholder()
+  scrivito.on 'content', ->
+    if scrivito.in_editable_view()
+      addPlaceholder()

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

@@ -1,30 +1,31 @@
 $ ->
   # Integrates a resource browser based editor for reference CMS attributes.
 
-  scrivito.on 'editing', ->
-    $('body').on 'click', '[data-scrivito-field-type="reference"]:not([data-editor]), [data-editor="reference"]', (event) ->
-      event.preventDefault()
+  scrivito.on 'load', ->
+    if scrivito.in_editable_view()
+      $('body').on 'click', '[data-scrivito-field-type="reference"]:not([data-editor]), [data-editor="reference"]', (event) ->
+        event.preventDefault()
 
-      cmsField = $(event.currentTarget)
-      selected = [cmsField.scrivito('content')].filter (element) -> element
-      filters = cmsField.data('filters') || cmsField.data('filter')
+        cmsField = $(event.currentTarget)
+        selected = [cmsField.scrivito('content')].filter (element) -> element
+        filters = cmsField.data('filters') || cmsField.data('filter')
 
-      # Open resource browser with current reference selected.
-      Resourcebrowser.open
-        selection: selected
-        filters: filters
-        selectionMode: 'single'
+        # Open resource browser with current reference selected.
+        Resourcebrowser.open
+          selection: selected
+          filters: filters
+          selectionMode: 'single'
 
-        onSave: (selection) =>
-          onResourcebrowserSave(selection, cmsField)
+          onSave: (selection) =>
+            onResourcebrowserSave(selection, cmsField)
 
-    # Save single reference when resource browser calls "save".
-    onResourcebrowserSave = (selection, cmsField) ->
-      value = selection[0] || null
+      # Save single reference when resource browser calls "save".
+      onResourcebrowserSave = (selection, cmsField) ->
+        value = selection[0] || null
 
-      cmsField.scrivito('save', value)
-      .done ->
-        cmsField.trigger('save.scrivito_editors')
-        cmsField.trigger('scrivito_reload')
+        cmsField.scrivito('save', value)
+        .done ->
+          cmsField.trigger('save.scrivito_editors')
+          cmsField.trigger('scrivito_reload')
 
-      true
+        true

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

@@ -91,22 +91,23 @@ $ ->
     $(cmsField).data('last-saved', value)
 
   # Initialize referencelist editor and setup event callbacks.
-  scrivito.on 'new_content', (root) ->
-    elements = $(root).find('[data-scrivito-field-type="referencelist"]:not([data-editor]), [data-editor="referencelist"]')
+  scrivito.on 'content', (root) ->
+    if scrivito.in_editable_view()
+      elements = $(root).find('[data-scrivito-field-type="referencelist"]:not([data-editor]), [data-editor="referencelist"]')
 
-    if elements.length
-      transform(elements)
+      if elements.length
+        transform(elements)
 
-      for element in elements
-        ids = getIds(element)
-        storeLastSaved(element, ids)
+        for element in elements
+          ids = getIds(element)
+          storeLastSaved(element, ids)
 
-      elements.on 'click', 'li a.delete', remove
-      elements.on 'click', 'button.resourcebrowser-open', onResourcebrowserOpen
+        elements.on 'click', 'li a.delete', remove
+        elements.on 'click', 'button.resourcebrowser-open', onResourcebrowserOpen
 
-      elements.find('ul').sortable
-        update: (event) ->
-          cmsField = getCmsField($(event.target))
-          ids = getIds(cmsField)
+        elements.find('ul').sortable
+          update: (event) ->
+            cmsField = getCmsField($(event.target))
+            ids = getIds(cmsField)
 
-          save(ids, cmsField)
+            save(ids, cmsField)

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

@@ -1,40 +1,41 @@
 $ ->
   # Slider for integer values stored in a string CMS attribute.
 
-  scrivito.on 'editing', ->
-    template = ->
-      $('<div></div>')
+  scrivito.on 'load', ->
+    if scrivito.in_editable_view()
+      template = ->
+        $('<div></div>')
 
-    onStop = (event, ui) ->
-      cmsField = $(@).data('cmsField')
-      content = ui.value
-      cmsField.scrivito('save', content).done ->
-        cmsField.trigger('save.scrivito_editors')
-        cmsField.trigger('scrivito_reload')
+      onStop = (event, ui) ->
+        cmsField = $(@).data('cmsField')
+        content = ui.value
+        cmsField.scrivito('save', content).done ->
+          cmsField.trigger('save.scrivito_editors')
+          cmsField.trigger('scrivito_reload')
 
-    onSlide = (event, ui) ->
-      cmsField = $(@).data('cmsField')
-      content = ui.value
-      cmsField.text(ui.value)
+      onSlide = (event, ui) ->
+        cmsField = $(@).data('cmsField')
+        content = ui.value
+        cmsField.text(ui.value)
 
-    $('body').on 'click', '[data-editor="slider"]:not(.active)', (event) ->
-      cmsField = $(event.currentTarget)
-      content = cmsField.scrivito('content')
-      min = cmsField.attr('data-min') || 1
-      max = cmsField.attr('data-max') || 10
-      step = cmsField.attr('data-step') || 1
+      $('body').on 'click', '[data-editor="slider"]:not(.active)', (event) ->
+        cmsField = $(event.currentTarget)
+        content = cmsField.scrivito('content')
+        min = cmsField.attr('data-min') || 1
+        max = cmsField.attr('data-max') || 10
+        step = cmsField.attr('data-step') || 1
 
-      cmsField.addClass('active')
+        cmsField.addClass('active')
 
-      template()
-        .data('cmsField', cmsField)
-        .insertAfter(cmsField)
-        .slider(
-          min: parseInt(min)
-          max: parseInt(max)
-          step: parseInt(step)
-          value: content
-          range: 'min'
-          stop: onStop
-          slide: onSlide
-        )
+        template()
+          .data('cmsField', cmsField)
+          .insertAfter(cmsField)
+          .slider(
+            min: parseInt(min)
+            max: parseInt(max)
+            step: parseInt(step)
+            value: content
+            range: 'min'
+            stop: onStop
+            slide: onSlide
+          )

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

@@ -69,5 +69,6 @@ $ ->
     $('body').on 'click', '[data-scrivito-field-type="string"]:not([data-editor]), [data-editor="string"]', (event) ->
       event.preventDefault()
 
-  scrivito.on 'editing', ->
-    initialize()
+  scrivito.on 'load', ->
+    if scrivito.in_editable_view()
+      initialize()

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

@@ -72,5 +72,6 @@ $ ->
     $('body').on 'click', '[data-scrivito-field-type="text"]:not([data-editor]), [data-editor="text"]', (event) ->
       event.preventDefault()
 
-  scrivito.on 'editing', ->
-    initialize()
+  scrivito.on 'load', ->
+    if scrivito.in_editable_view()
+      initialize()

data/lib/scrivito_editors/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoEditors
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -108,7 +108,10 @@ files:
 - app/assets/fonts/editing_icons-webfont.eot
 - app/assets/fonts/editing_icons-webfont.ttf
 - app/assets/fonts/editing_icons-webfont.woff
+- app/assets/fonts/redactor-font.eot
+- app/assets/javascripts/jquery-ui-timepicker-addon.min.js
 - app/assets/javascripts/jquery_additions/jquery_center.js.coffee
+- app/assets/javascripts/redactor.js
 - app/assets/javascripts/scrivito_editors.js
 - app/assets/javascripts/scrivito_editors/date_editor.js.coffee
 - app/assets/javascripts/scrivito_editors/enum_editor.js.coffee
@@ -121,6 +124,8 @@ files:
 - 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/stylesheets/jquery-ui-timepicker-addon.min.css
+- app/assets/stylesheets/redactor.css.erb
 - app/assets/stylesheets/scrivito_editors.css
 - app/assets/stylesheets/scrivito_editors/buttons.css
 - app/assets/stylesheets/scrivito_editors/editors/html_editor.css
@@ -133,11 +138,6 @@ files:
 - lib/scrivito_editors.rb
 - lib/scrivito_editors/engine.rb
 - lib/scrivito_editors/version.rb
-- vendor/assets/fonts/redactor-font.eot
-- vendor/assets/javascripts/jquery-ui-timepicker-addon.min.js
-- vendor/assets/javascripts/redactor.js
-- vendor/assets/stylesheets/jquery-ui-timepicker-addon.min.css
-- vendor/assets/stylesheets/redactor.css.erb
 homepage: http://www.scrivito.com
 licenses:
 - LGPL-3.0