scrivito_resourcebrowser 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b8db9c0c1ec3589c28f0cfb57912fa653c7290
-  data.tar.gz: b8090d83c3a11d3017a165a34b91f58c7c199a42
+  metadata.gz: 3a776d207d54700e9fb70dba52e61df3d4ab345f
+  data.tar.gz: e97becbc05eaf0d1904f18d47cecdd595063f3ac
 SHA512:
-  metadata.gz: 4d61ea74dbde427eb752e6cf15b08d97ffb1b7af685f48546237cca277a0c0f03edc8bd7ff74c6e5013800ab662f4a40085e1e3f8bc28bd60bba119b30c48751
-  data.tar.gz: 6a04de77ef1d62f0af2f1d2e40bb2c7aaaae3ee7ecbc3f75855f89be2980344f9506fe8ba921bc7a5389537eea218f5ed8cedf9ed34cd32b1a952d537063b06d
+  metadata.gz: 60fc3266ebb1b3466261eb0d9f16d8fbbdc80a0ceba888519fbb6d7808ed2301431403abba41b755657c2e0c520f9a9997388b36c086b73ecc5f278677843d4b
+  data.tar.gz: d2589336876293d65a7114a2af538929fe57a4bee72f2e51804e3461bf9dac4c9e7c812e6e4fa74882d195583acb2d6e370cc79108b5ec978b55fc1c02eeef20

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.0.5
+  * Uploading a MIME type with no configured `obj_class` shows sensible error message.
+  * Show the app configurable `description_for_editor` as subtitle.
+  * Some visual improvements.
+
 # 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

data/README.md

@@ -3,7 +3,6 @@
 [![Gem Version](https://badge.fury.io/rb/scrivito_resourcebrowser.png)](http://badge.fury.io/rb/scrivito_resourcebrowser)
 [![Code Climate](https://codeclimate.com/github/infopark/scrivito_resourcebrowser.png)](https://codeclimate.com/github/infopark/scrivito_resourcebrowser)
 [![Dependency Status](https://gemnasium.com/infopark/scrivito_resourcebrowser.png)](https://gemnasium.com/infopark/scrivito_resourcebrowser)
-[![Build Status](https://travis-ci.org/infopark/scrivito_resourcebrowser.png)](https://travis-ci.org/infopark/scrivito_resourcebrowser)
 
 The [Scrivito](http://scrivito.com) Resource Browser is a JavaScript based tool to add, update and
 delete resources. It provides flexible configuration options and can easily be integrated into your

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

@@ -265,7 +265,7 @@
 
   _itemTemplate: (object) ->
     url = object.preview
-    title = object.title || object.name
+    title = object.title || object.id
     id = object.id
 
     wrapper = $('<div></div>')
@@ -447,8 +447,12 @@
         ResourcebrowserInspector.init(@modal)
         ResourcebrowserUploader.init(@modal)
 
-        ResourcebrowserUploader.onUploadFailure = (error) =>
-          console.error('Resourcebrowser Uploader Error:', error)
+        ResourcebrowserUploader.onUploadStart = (files) =>
+          @upload_errors = false
+
+        ResourcebrowserUploader.onUploadFailure = (errors) =>
+          @upload_errors = errors
+          # console.error('Resourcebrowser uploader errors: ', JSON.stringify(upload_errors))
 
         ResourcebrowserUploader.onUploadSuccess = (objs) =>
-          @_renderPlaceholder(@_activeQuery())
+          @_renderPlaceholder(@_activeQuery()) unless @upload_errors

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

@@ -27,7 +27,7 @@
 
     undefined
 
-  _processQueue: (queue, createdObjs, promise) ->
+  _processQueue: (queue, createdObjs, failedUploads, promise) ->
     file = queue.pop()
 
     if file?
@@ -35,9 +35,14 @@
         .done (obj) =>
           @_updateProgress(file, '100%')
           createdObjs.push(obj)
-          @_processQueue(queue, createdObjs, promise)
+          @_processQueue(queue, createdObjs, failedUploads, promise)
+        .fail (args) =>
+          @_updateError(file, args.message || "Upload failed. Please check your network connection.")
+          @_updateProgress(file, '0%')
+          failedUploads.push(args)
+          @_processQueue(queue, createdObjs, failedUploads, promise)
     else
-      return promise.resolve(createdObjs)
+      return promise.resolve(createdObjs, failedUploads)
 
   _addProgressWrapper: () ->
     itemsElement = $('.editing-resourcebrowser-items').empty()
@@ -62,17 +67,25 @@
     fileName = $('<p></p>')
       .html(file.name)
 
+    error = $('<p></p>')
+      .addClass('editing-resourcebrowser-error')
+
     $('<div></div>')
       .addClass('editing-resourcebrowser-progress-file')
       .append(fileName)
+      .append(error)
       .append(progress)
       .prependTo $('.editing-resourcebrowser-progress-wrapper')
 
-    file['progressBar'] = progressBar
+    file.progressBar = progressBar
+    file.error = error
 
   _updateProgress: (file, percent) ->
     file.progressBar.css('width', percent)
 
+  _updateError: (file, message) ->
+    file.error.text(message)
+
   _onDrop: (event) ->
     dataTransfer = event.originalEvent.dataTransfer
 
@@ -84,19 +97,19 @@
     if files.length == 0
       return
 
-    @onUploadStart(queue)
     @_addProgressWrapper()
 
-    promise = $.Deferred()
-      .done (data) =>
-        @onUploadSuccess(data)
-
     queue = for file in files
       @_addProgress(file)
       file
 
-    @_processQueue(queue, [], promise)
+    @onUploadStart(queue)
+    promise = $.Deferred()
+      .done (createdObjs, failedUploads) =>
+        @onUploadFailure(failedUploads) if failedUploads.length > 0
+        @onUploadSuccess(createdObjs) if createdObjs.length > 0
 
+    @_processQueue(queue, [], [], promise)
     promise
 
   _randomResourceId: ->
@@ -110,11 +123,18 @@
   _createResource: (file) ->
     objName = file.name.replace(/[^a-z0-9_.$\-]/ig, '-')
     path = "_resources/#{@_randomResourceId()}/#{objName}"
+    objClass = @_objClassForMimeType(file.type)
 
-    scrivito.create_obj
-      blob: file
-      _path: path
-      _obj_class: @_objClassForMimeType(file.type)
+    if objClass
+      scrivito.create_obj
+        blob: file
+        _path: path
+        _obj_class: objClass
+    else
+      $.Deferred().reject
+        id: "no_obj_class_for_mime_type"
+        file_name: file.name
+        message: "File type #{file.type} rejected by resource configuration."
 
   init: (@modal) ->
     @_initializeBindings()
@@ -123,7 +143,7 @@
   onUploadStart: (files) ->
 
   # Hook for 3rd parties when the upload fails.
-  onUploadFailure: (error) ->
+  onUploadFailure: (errors) ->
 
   # Hook for 3rd parties when the upload was successful.
   onUploadSuccess: (objs) ->

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

@@ -115,8 +115,10 @@
 
 .editing-resourcebrowser .editing-resourcebrowser-search {
   float: left;
+  overflow: hidden;
   position: relative;
   width: 65%;
+  white-space: nowrap;
 }
 
 .editing-resourcebrowser .editing-resourcebrowser-search .search-field {
@@ -173,8 +175,7 @@
   border-left: none;
   color: #fff;
   cursor: pointer;
-  display: block;
-  float: left;
+  display: inline;
   font-size: 14px;
   font-weight: normal;
   height: 30px;
@@ -394,7 +395,7 @@
 
 .editing-resourcebrowser ul.editing-resourcebrowser-filter-items .editing-icon {
   color: #666;
-  display: inline-block;
+  display: inline;
   font-size: 12px;
   line-height: 20px;
   padding: 0 7px 0 0;
@@ -403,10 +404,11 @@
 
 .editing-resourcebrowser ul.editing-resourcebrowser-filter-items .editing-resourcebrowser-filter-name {
   color: #666;
-  display: inline-block;
+  display: inline;
   font-size: 11px;
   font-weight: bold;
   line-height: 20px;
+  word-wrap: break-word;
 }
 
 .editing-resourcebrowser ul.editing-resourcebrowser-filter-items li:hover .editing-resourcebrowser-counter,
@@ -504,8 +506,14 @@
 
 .editing-resourcebrowser ul.editing-resourcebrowser-thumbnails li .editing-resourcebrowser-preview img {
   display: block;
-  height: 100%;
-  margin: 0 auto;
+  max-height: 100%;
+  max-width: 100%;
+  margin: auto;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
 
 .editing-resourcebrowser ul.editing-resourcebrowser-thumbnails li .editing-resourcebrowser-preview .editing-icon {
@@ -574,6 +582,7 @@
   vertical-align: middle;
   width: 40px;
   font-size: 11px;
+  z-index: 1;
 }
 
 .editing-resourcebrowser ul.editing-resourcebrowser-thumbnails li .editing-resourcebrowser-thumbnails-select:before {
@@ -852,6 +861,17 @@
   text-overflow: ellipsis;
 }
 
+.editing-resourcebrowser-progress-wrapper .editing-resourcebrowser-progress-file .editing-resourcebrowser-error:empty {
+  display: none;
+}
+
+.editing-resourcebrowser-progress-wrapper .editing-resourcebrowser-progress-file .editing-resourcebrowser-error {
+  color: #aa4040;
+  font-size: 13px;
+  font-weight: normal;
+  margin: 0 3px 6px 3px;
+}
+
 .editing-resourcebrowser-progress-wrapper .editing-resourcebrowser-progress {
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);

data/config/initializers/resourcebrowser.rb

@@ -2,7 +2,7 @@
 Scrivito::Configuration.register_obj_format('resourcebrowser') do |obj|
   format = {
     id: obj.id,
-    title: obj.title || obj.name,
+    title: obj.description_for_editor,
   }
 
   if obj.respond_to?(:image?) && obj.image?

data/lib/scrivito_resourcebrowser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_resourcebrowser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.8'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Scrivito Resource Browser