scrivito_resourcebrowser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22954b1594aa0ff0220c82cc5c861ec92545d907
-  data.tar.gz: bbd59e66cb869d48c8e064b4ba9928582542a0a8
+  metadata.gz: 61d54d510c1edf96bced6adb3617648a7135e295
+  data.tar.gz: 6e9088de1291df9865a3b0c914aa21d5ca73cf30
 SHA512:
-  metadata.gz: c417363f8bd0ef31bb6ad9e4618f6e677556f2234db308d18285db41c064c87e7e6f816cfcc503ffe1339510275e09f8cc3ad4549b5df92632ddb9b2cef1be71
-  data.tar.gz: e30796d4321b04a0d39e0a8eb62bf3662f616e9bb7a17c2697c0bdad3bdf9a8d74eeae64ce69c26cba89f7352307d1378698530aff85915bc21c336e4f1f6aec
+  metadata.gz: f476f5289b1fe86f5069b3d2083675070beea31e3697919b7dc647830135480edbb2eb60a8ddd382e073b33e15af24a9868c66cc3c3043cd12ccbc5355bb9d4e
+  data.tar.gz: 28541dfb09b77499ccf095b7c8d5e4a6549a3eaf179d2ff983a3341911c715441019e6beed452e145266772b917191c1665356eb9d697556cd6a866142e299a3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.0.3
+  * Change the icon to open the details view from a magnifying glass to a pen.
+  * Added option "selectionMode", which can be set to `single` in order to allow only one selected
+    item at a time. Any other value will allow to select an arbitrary number of items.
+  * Added "selected" filter that displays all currently selected items.
+  * Display "missing title" when a custom filter has no title configured.
+  * Added installation and usage section in the README.
+
 # v0.0.2
   * Bugfix: An error on assets:precompile was caused by a typo. (Thanks @dcsaszar)
 

data/README.md

@@ -11,7 +11,20 @@ application.
 
 ## Installation and Usage
 
-TODO
+If you already use the gem [scrivito_editors](https://github.com/infopark/scrivito_editors) then you
+don't have to change anything, because it is a dependency that will be installed automatically.
+
+If you want to use this gem separately, please add it to your `Gemfile`.
+
+    gem 'scrivito_resourcebrowser'
+
+Then require it in your stylesheet manifest.
+
+    *= require scrivito_resourcebrowser
+
+And require it in your JavaScript manifest.
+
+    //= require scrivito_resourcebrowser
 
 
 ## Changelog

data/app/assets/javascripts/scrivito_resourcebrowser/resourcebrowser.js.coffee

@@ -20,13 +20,24 @@
       .addClass('editing-resourcebrowser-filter-items')
 
     for name, options of filters
-      title = options.title
+      title = options.title || 'missing title'
       icon = options.icon || 'editing-icon-generic'
-      query = @_prepareQuery(options.query)
+      query = options.query
 
       @_filterTemplate(title, icon, query)
+        .addClass('filter')
         .appendTo(list)
 
+    separator = $('<li></li>')
+      .addClass('separator')
+      .appendTo(list)
+
+    title = 'Selected <span class="editing-resourcebrowser-counter selected-total"></span>'
+    icon = 'editing-icon-ok'
+    @_filterTemplate(title, icon)
+      .addClass('selected-filter')
+      .appendTo(list)
+
     list
 
   _loadFilter: () ->
@@ -69,7 +80,7 @@
     @_getFilterQuery(filter)
 
   _filterItems: ->
-    @modal.find('li.filter')
+    @modal.find('ul.editing-resourcebrowser-filter-items li')
 
   _deactivateAllFilter: ->
     @_getSearch().val('')
@@ -83,10 +94,21 @@
     query = @_getFilterQuery(filter)
     @_renderPlaceholder(query)
 
+  _triggerSelectedFilter: (filter) ->
+    if @selected.length > 0
+      query = @_prepareQuery(scrivito.obj_where('id', 'equals', @selected))
+      filter.data('query', query)
+    else
+      filter.removeData('query')
+
+    @_triggerFilter(filter)
+
   _filterTemplate: (title, icon, query) ->
     filter = $('<li></li>')
-      .addClass('filter')
-      .data('query', query)
+
+    if query?
+      query = @_prepareQuery(query)
+      filter.data('query', query)
 
     icon = $('<span></span>')
       .addClass('editing-icon')
@@ -101,8 +123,7 @@
     filter
 
   _prepareQuery: (query) ->
-    params = $.extend(true, {}, query.query())
-    scrivito.chainable_search.create_instance(params)
+    query.clone()
       .order('_last_changed')
       .reverse_order()
       .format('resourcebrowser')
@@ -136,6 +157,9 @@
     if (item.hasClass('active'))
       @_removeItem(item)
     else
+      if @options.selectionMode == 'single'
+        @_deselectAllItems()
+
       @_addItem(item)
 
   _addItem: (item) ->
@@ -202,21 +226,19 @@
     $(item).html(loading)
 
   _renderPlaceholder: (query) ->
-    query ||= @_defaultQuery()
-
-    return unless query?
-
     @_getItems()
       .empty()
-      .html(@_loadingTemplate())
 
-    query.size()
-      .then (total) =>
-        if total > 0
-          @_itemsPlaceholder(total)
-          @_renderItems(query)
-        else
-          @_getItems().empty()
+    if query?
+      @_getItems().html(@_loadingTemplate())
+
+      query.size()
+        .then (total) =>
+          if total > 0
+            @_itemsPlaceholder(total)
+            @_renderItems(query)
+          else
+            @_getItems().empty()
 
   _renderItems: (query, index = 0) ->
     query
@@ -328,6 +350,10 @@
       event.preventDefault()
       @_triggerFilter($(event.currentTarget))
 
+    @modal.on 'click', 'li.selected-filter', (event) =>
+      event.preventDefault()
+      @_triggerSelectedFilter($(event.currentTarget))
+
     @modal.on 'click', @thumbnailViewButtonSelector, (event) =>
       size = $(event.currentTarget).data('size')
       @_changeThumbnailSize(size)
@@ -405,9 +431,9 @@
         @options = options
 
         @_loadModal(json.content)
-        @_setSelected()
         @_loadFilter()
-        @_renderPlaceholder()
+        @_setSelected()
+        @_renderPlaceholder(@_defaultQuery())
         @_changeThumbnailSize()
 
         ResourcebrowserInspector.init(@modal)
@@ -417,4 +443,4 @@
           console.error('Resourcebrowser Uploader Error:', error)
 
         ResourcebrowserUploader.onUploadSuccess = (objs) =>
-          @_renderPlaceholder()
+          @_renderPlaceholder(@_defaultQuery())

data/app/assets/stylesheets/scrivito_resourcebrowser/resourcebrowser.css

@@ -558,7 +558,7 @@
   background: #7EA46A;
   top: 0;
   color: #fff;
-  content: '\F043';
+  content: '\F026';
   display: block;
   font-family: 'editing_iconsregular';
   font-style: normal;

data/lib/scrivito_resourcebrowser/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoResourcebrowser
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_resourcebrowser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties