scrivito_resourcebrowser 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61d54d510c1edf96bced6adb3617648a7135e295
-  data.tar.gz: 6e9088de1291df9865a3b0c914aa21d5ca73cf30
+  metadata.gz: e9b8db9c0c1ec3589c28f0cfb57912fa653c7290
+  data.tar.gz: b8090d83c3a11d3017a165a34b91f58c7c199a42
 SHA512:
-  metadata.gz: f476f5289b1fe86f5069b3d2083675070beea31e3697919b7dc647830135480edbb2eb60a8ddd382e073b33e15af24a9868c66cc3c3043cd12ccbc5355bb9d4e
-  data.tar.gz: 28541dfb09b77499ccf095b7c8d5e4a6549a3eaf179d2ff983a3341911c715441019e6beed452e145266772b917191c1665356eb9d697556cd6a866142e299a3
+  metadata.gz: 4d61ea74dbde427eb752e6cf15b08d97ffb1b7af685f48546237cca277a0c0f03edc8bd7ff74c6e5013800ab662f4a40085e1e3f8bc28bd60bba119b30c48751
+  data.tar.gz: 6a04de77ef1d62f0af2f1d2e40bb2c7aaaae3ee7ecbc3f75855f89be2980344f9506fe8ba921bc7a5389537eea218f5ed8cedf9ed34cd32b1a952d537063b06d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.0.4
+  * The filters are now a simple hash instead of a function that returns a hash. This allows to
+    extend the filters multiple times. This is useful, when a gem wants to add filters to the ones
+    already defined in the application. (Thanks @gertimon)
+
 # 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

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

@@ -1,6 +1,7 @@
 @Resourcebrowser = do ->
   thumbnailViewButtonSelector: '.editing-button-view'
   options: {}
+  filters: {}
 
   # The resource browser supports operations like +delete+ and +edit+ of resources that require a page
   # reload, so that all references of the resources get updated.
@@ -50,7 +51,7 @@
     @_defaultFilter().trigger('click')
 
   _selectedFilters: ->
-    availableFilters = @filters()
+    availableFilters = @filters
     selectedFilters = @options.filters
     filters = availableFilters
 
@@ -232,8 +233,11 @@
     if query?
       @_getItems().html(@_loadingTemplate())
 
+      query
+        .batch_size(@_getBatchSize())
+
       query.size()
-        .then (total) =>
+        .done (total) =>
           if total > 0
             @_itemsPlaceholder(total)
             @_renderItems(query)
@@ -241,11 +245,8 @@
             @_getItems().empty()
 
   _renderItems: (query, index = 0) ->
-    query
-      .batch_size(@_getBatchSize())
-
     query.load_batch()
-      .then (result, next) =>
+      .done (result, next) =>
         objects = result.hits
         @_replacePlaceholder(objects, index)
 
@@ -318,8 +319,8 @@
     @_renderPlaceholder(query)
 
   _initializeBindings: ->
-    $(window).resize ->
-      $('#editing-resourcebrowser.show').center()
+    $(window).resize =>
+      @_center(@modal)
 
     @modal.on 'keyup', 'input.search-field', (event) =>
       if event.keyCode == 13
@@ -381,11 +382,21 @@
       .addClass('editing-resourcebrowser show')
       .attr('id', 'editing-resourcebrowser')
       .appendTo($('body'))
-      .center()
       .html(content)
 
+    @_center(@modal)
+
     @_initializeBindings()
 
+  _center: (domElement) ->
+    if domElement
+      domElement = $(domElement)
+      domElement.css(
+        marginLeft: -domElement.innerWidth() / 2
+        marginTop: -domElement.innerHeight() / 2
+        left: '50%'
+      )
+
   _loadingTemplate: ->
     icon = $('<i></i>')
       .addClass('editing-icon editing-icon-refresh')
@@ -411,9 +422,6 @@
       .filter("[data-size='#{size}']")
       .addClass('active')
 
-  filters: ->
-    {}
-
   close: ->
     (@options.onClose || $.noop)()
 
@@ -443,4 +451,4 @@
           console.error('Resourcebrowser Uploader Error:', error)
 
         ResourcebrowserUploader.onUploadSuccess = (objs) =>
-          @_renderPlaceholder(@_defaultQuery())
+          @_renderPlaceholder(@_activeQuery())

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

@@ -28,19 +28,14 @@
     undefined
 
   _processQueue: (queue, createdObjs, promise) ->
-    promise.then (data) =>
-      @onUploadSuccess(data)
-
     file = queue.pop()
 
     if file?
-      @_createResource(file).then (obj) =>
-        @_updateProgress(file, '100%')
-        createdObjs.push(obj)
-      .always =>
-        @_processQueue(queue, createdObjs, promise)
-
-      return promise
+      @_createResource(file)
+        .done (obj) =>
+          @_updateProgress(file, '100%')
+          createdObjs.push(obj)
+          @_processQueue(queue, createdObjs, promise)
     else
       return promise.resolve(createdObjs)
 
@@ -93,6 +88,8 @@
     @_addProgressWrapper()
 
     promise = $.Deferred()
+      .done (data) =>
+        @onUploadSuccess(data)
 
     queue = for file in files
       @_addProgress(file)

data/lib/scrivito_resourcebrowser/engine.rb

@@ -1,5 +1,4 @@
 module ScrivitoResourcebrowser
   class Engine < ::Rails::Engine
-    isolate_namespace ScrivitoResourcebrowser
   end
 end

data/lib/scrivito_resourcebrowser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_resourcebrowser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Scrivito Resource Browser
 email:
 - info@infopark.de
@@ -85,7 +99,6 @@ files:
 - app/assets/stylesheets/scrivito_resourcebrowser/resourcebrowser.css
 - app/controllers/scrivito_resourcebrowser/resourcebrowser_controller.rb
 - app/views/layouts/scrivito_resourcebrowser/inspector.html.erb
-- app/views/scrivito_resourcebrowser/application.html.erb
 - app/views/scrivito_resourcebrowser/obj/details.html
 - app/views/scrivito_resourcebrowser/resourcebrowser/_buttons.html.erb
 - app/views/scrivito_resourcebrowser/resourcebrowser/_header.html.erb
@@ -115,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.8'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Scrivito Resource Browser

data/app/views/scrivito_resourcebrowser/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>ScrivitoResourcebrowser</title>
-  <%= stylesheet_link_tag    "scrivito_resourcebrowser/application", media: "all" %>
-  <%= javascript_include_tag "scrivito_resourcebrowser/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>