scrivito_editors 0.65.2 → 0.66.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bffe1f32ebdd4464332854c6f67d013f00446684
-  data.tar.gz: 90441a854af2de652b9632e9e7ffcf395b45b864
+  metadata.gz: bc477c2e6090499886b031af001f3a130d319324
+  data.tar.gz: f32c5368bd71c2afb30aa774141ffbabaa426677
 SHA512:
-  metadata.gz: dfdb048fb70e226ca98480e5aff620266a7c512edd0e53b7e1ac3af94e4d287e61c797c4efc561c2d3e63a7f3b98a768987b80d7366aa9cf113ef25a76a9e293
-  data.tar.gz: 397fb96b61ef6912e37205d73c16fb308b53beb6e504bcf7d5a05aee3a4d07d0192756cad69392c7c44f61e08ef89e62703c6ef9d7dd08ff8bfa0372e965fb47
+  metadata.gz: d1f507b5b3e64343e7966928a5dcf18e5535c9d4e37a861bc1668893896b406ecff961f56afca57321c6f64ad83702dd78d00a8e60abfbb0035f59057e9c9cdd
+  data.tar.gz: 84351750e70d266d2cca66fa927d2cf77968c28dbf3eee0462dd2c06e9051b288e5dfcad19bd472ecb877c4b1ad6c2c54cecd07cd4a1505b64fa70936fd6238d

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

@@ -0,0 +1,26 @@
+$ ->
+  # Merge data-filter-context-* into data('filterContext') for relevant CMS attributes.
+  # Editors will then be able to pass data('filterContext') to content_browser.open()
+
+  extendDeepData = (data, prefix) ->
+    for own key, value of data when key.search(prefix) == 0
+      path = key.match(///([A-Z]|^#{prefix})[^A-Z]*///g)
+      if path[0] == prefix
+        value = {"#{name.toLowerCase()}": value} for name in path[1..].reverse()
+        $.extend(true, data, "#{prefix}": value)
+
+  mergeFilterContexts = ->
+    cmsFields = $("""
+      [data-scrivito-field-type][data-filter-context],
+      [data-scrivito-field-type^="html"],
+      [data-scrivito-field-type^="link"],
+      [data-scrivito-field-type^="reference"]
+    """)
+
+    cmsFields.each ->
+      cmsField = $(@)
+      data = cmsField.data()
+      extendDeepData(data, 'filterContext')
+
+  scrivito.on 'content', ->
+    mergeFilterContexts() if scrivito.in_editable_view()

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

@@ -15,7 +15,5 @@ save = (field, file) ->
     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}
+  scrivito.create_obj {blob, _obj_class}

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

@@ -49,13 +49,15 @@ $ ->
 
     linkItem = $(event.currentTarget).closest('li')
     cmsField = getCmsField(linkItem)
-    filters = cmsField.data('filters') || cmsField.data('filter')
+    filters = cmsField.data('filters')
+    filterContext = cmsField.data('filterContext')
     id = linkItem.data('id')
     selection = if id then [id] else []
 
     scrivito.content_browser.open
       selection: selection
       filters: filters
+      filter_context: filterContext
       selection_mode: 'single'
     .done (selection) =>
       onContentBrowserSaveLinkItem(selection, linkItem)

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

@@ -55,13 +55,15 @@ $ ->
 
     linkItem = $(event.currentTarget).closest('li')
     cmsField = getCmsField(linkItem)
-    filters = cmsField.data('filters') || cmsField.data('filter')
+    filters = cmsField.data('filters')
+    filterContext = cmsField.data('filterContext')
     id = linkItem.data('id')
     selection = if id then [id] else []
 
     scrivito.content_browser.open
       selection: selection
       filters: filters
+      filter_context: filterContext
       selection_mode: 'single'
     .done (selection) =>
       onContentBrowserSaveLinkItem(selection, linkItem)

data/app/assets/javascripts/scrivito_editors/redactor_plugins/scrivito_editors_image_manager.js.coffee

@@ -6,7 +6,11 @@ $ ->
       @modal.addCallback 'image', self.browse
 
     browse: ->
+      filterContext = $.extend {_image: true}, @$element.data('filterContext')
+
       scrivito.content_browser.open
+        filter: @$element.data('filter')
+        filter_context: filterContext
         selection_mode: 'single'
       .done (selection) =>
         id = selection[0]

data/app/assets/javascripts/scrivito_editors/redactor_plugins/scrivito_editors_link_manager.js.coffee

@@ -27,6 +27,8 @@ $ ->
 
     browse: ->
       scrivito.content_browser.open
+        filter: @$element.data('filter')
+        filter_context: @$element.data('filterContext')
         selection: self.getObjIds()
         selection_mode: 'single'
       .done (selection) =>

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

@@ -8,12 +8,14 @@ $ ->
 
         cmsField = $(event.currentTarget)
         selected = [cmsField.scrivito('content')].filter (element) -> element
-        filters = cmsField.data('filters') || cmsField.data('filter')
+        filters = cmsField.data('filters')
+        filterContext = $.extend {_image: cmsField.is('img')}, cmsField.data('filterContext')
 
         # Open content browser with current reference selected.
         scrivito.content_browser.open
-          selection: selected
           filters: filters
+          filter_context: filterContext
+          selection: selected
           selection_mode: 'single'
 
         .done (selection) =>

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

@@ -43,10 +43,12 @@ $ ->
     event.preventDefault()
 
     cmsField = getCmsField($(event.currentTarget))
-    filters = cmsField.data('filters') || cmsField.data('filter')
+    filters = cmsField.data('filters')
+    filterContext = cmsField.data('filterContext')
 
     scrivito.content_browser.open
       filters: filters
+      filter_context: filterContext
     .done (selection) =>
       ids = getIds(cmsField).concat(selection)
       save(ids, cmsField)

data/app/helpers/scrivito_editors/scrivito_tag_helper.rb

@@ -126,12 +126,7 @@ 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
+      object.attribute_definitions[attribute_name].try(:values) || []
     end
 
     def _edit_link_li(link)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_editors
 version: !ruby/object:Gem::Version
-  version: 0.65.2
+  version: 0.66.0.rc1
 platform: ruby
 authors:
 - Scrivito
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-script-source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.65.2
+        version: 0.66.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.65.2
+        version: 0.66.0.rc1
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.65.2
+        version: 0.66.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.65.2
+        version: 0.66.0.rc1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +143,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
@@ -142,6 +155,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/filter_context.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

data/CHANGELOG.md

@@ -1,150 +0,0 @@
-# v0.50.0
-  * When using the HTML editor, you can now insert an image by browsing.
-  * When using the HTML editor, you can now browse content when inserting a link.
-
-# v0.42.0
-  * Resolved: Link and linklist editors remember selected item when re-opening the content browser.
-  * Resolved: Link editor works on empty links, too.
-  * Resolved: Internal links with fragments no longer lose the fragment when re-editing.
-
-# 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.
-    `scrivito.editors.html_editor.redactor.options = { buttonSource: true }`
-  * Resolved: Markup will now stay unchanged when the editor is closed without editing.
-  * Resolved: Cursor will now appear at the point of clicking, if possible. Otherwise at the end.
-  * Resolved: Link editor shows current selection when opening the content browser.
-
-# v0.30.1
-  * Resolved issue: Date editor keeps time when editing
-  * Resolved issue: Date editor saves without NaN errors in Safari and Firefox
-  * Resolved issue: text editor on Chrome keeps line breaks when leaving the editor
-
-# v0.30.0
-  * Compatibility with https://rubygems.org/gems/scrivito 0.30.0
-  * Scrivito editors no longer provide icon font support. We recommend to use screenshots or an
-    open font CSS library when migrating thumbnail views to the SDK's `scrivito_thumbnail` helper.
-
-# v0.1.0
-  * Changed dependency to `scrivito_content_browser` due to gem renaming
-  * Removed deprecated content browser API calls, use new API
-  * See your app's JS console for hints and deprecation warnings
-
-# v0.0.16
-  * Bugfix: added a missing constant in text editor
-  * Introduced `ScrivitoTagHelper` for upcoming Scrivito SDK releases
-    (`CmsTagHelper` is still available for compatibility with older releases)
-
-# 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.
-    You can now safely delete `editing_helper.rb` generated by Scrivito Kickstarter.
-    Kickstarter will still generate this file, while we are in the process of providing you
-    with alternative ways to get you going without the need for Kickstarter.
-    (Keep an eye on https://github.com/infopark/scrivito_example and upcoming Scrivito SDK releases)
-  * Tuned Redactor settings to make the HTML editor less intrusive
-  * Corrected the `jquery-rails` gem version dependency
-  * Solved various editor related issues
-
-# v0.0.13
-  * Added `autosave` option to the string editor to prevent that on every input the content is saved
-    to the CMS. This is useful when setting a permalink for example, where intermediate strings
-    would trigger an error. When `data-autosave` is set to `false`, then only `enter` and the `blur`
-    event will save the string to the CMS.
-  * Added editor for new attribute type `link`. It lets you set the title and url of the link,
-    similar to how a linklist is edited. It can also handle an empty url, which effectively deletes
-    the link.
-  * Allow to select multiple editors on one cms field. You can now use
-    `data-editor="reference image"` for example, to activate both editors.
-  * Added image upload editor, that allows to drag & drop an image on an existing image. This
-    functionality was moved out of the Scrivito SDK.
-  * Updated Redactor to version 9.2.5.
-  * Removed unused `jQuery.center` addon.
-  * We separated the jQuery addons from the core editors functionality, which allows to only require
-    one, but not the other. Use `//= require 'scrivito_editors'` to require both,
-    `//= require 'scrivito_editors_core'` to only include the editor but not the addons and use
-    `//= require 'scrivito_addons'` if you only want the addons. (Thanks @cedrics)
-
-# 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".
-  * The new Scrivito SDK feature to serialize save requests allows editors to automatically save the
-    content on every input instead of every 3 seconds. The `string`, `text` and `html` editor now
-    all make use of this feature.
-  * The "Esc" key on `string`, `text` and `html` editors now just destroys the editor, without
-    resetting to any old content.
-  * All editors now trigger a `save.scrivito_editors` event, when the content was successfully
-    saved in the CMS.
-  * `string` and `text` editors now only save, if the content has changed, as it is already
-    the case for the `html` editor.
-  * `referencelist` and `linklist` editors now make use of the new single selection mode option of
-    the resource browser.
-
-# v0.0.10
-  * Extracted resource browser into separate gem.
-
-# 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.
-    The styling of both editors was also improved to make it more user friendly.
-  * Resourcebrowser: Thumbnails only display an image, if the object defines a `image?` method, that
-    returns `true`, otherwise a generic icon is rendered.
-  * Bugfix: The string and text editor now also save correctly, when highlighting and editing the
-    content without triggering a `click` event.
-  * Bugfix: The placeholder now also works for attributes, that have been cleared without triggering
-    a reload of the page afterwards. (Thanks @gertimon)
-  * Bugfix: The default placeholder text for empty CMS attributes only used the name of the first
-    attribute on the page, instead of the correct field name for each CMS attribute.
-
-# v0.0.6
-  * Rewrite of string and text editor to better support pasting HTML, correctly handling quotes,
-    inserting the carrot at the correct position and better multiline support for preformatted text
-    fields. (Thanks @dcsaszar)
-  * Bugfix: Using renamed `obj_class_name` method from the new Scrivito SDK instead of `obj_class`.
-  * Changed the behavior when an item is clicked in the resource browser. Instead of opening the
-    inspector, the item is now selected or deselected. A small magnifying glass in the upper right
-    corner of the thumbnail now allows to open the inspector for the item.
-  * Rename the fallback inspector view to `details.html`, to be consistent to the new Scrivito SDK.
-
-# v0.0.5
-  * The template used in the inspector is no longer configurable and always corresponds to the
-    details view used by the Scrivito SDK.
-  * Bugfix: The resource browser did not use a correct start index to render multiple thumbnails.
-
-# v0.0.4
-  * Bugfix: Resourcebrowser buttons now also work in Chrome browser.
-
-# v0.0.3
-  * Updated redactor to version 9.2.1 and removed all custom settings.
-  * Added option `data-reload` to the string editor to configure if a reload event should
-    be triggered or not after saving the changes. (Thanks @apepper)
-
-# v0.0.2
-  * Added placeholder text to empty CMS attributes.
-
-# v0.0.1
-  * Updated html editor seperator height from 29px to 27px.
-  * Updated the README to describe the new gem.
-  * Added editing icons used in some of the editors and the resource browser.
-  * Removed the saving animation for editors to not disturb the in-place editing
-    experience.