effective_assets 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44f1e683151eec235827918b34aa5e7838c9f34c
-  data.tar.gz: 6c56629f8ffd2f21fd0ea90ab3700c442e064ec7
+  metadata.gz: 13e90b35a299db09418e02d1c372631beb2b4360
+  data.tar.gz: 024fda44ceeca5d6b56c0d18974a3dbffeda030f
 SHA512:
-  metadata.gz: 2aa8570ae9ea214a33570d69df27c4e57eb2be191a21913c5e90007b6a3cd24b7cfdf5695336898afd9520d874115f6ea17960b057f3a443bafa07d940a4addb
-  data.tar.gz: 437d63f81b740e9aec43256bc547db4c41bc4cee56ea808e4659e2d0699113c006cd4667430af4f7981bbcf7c1730b459fa51cf70d732eeb5106d5b603f4f0e5
+  metadata.gz: e4c98bfc63977679f27e210f05d3d18b092de03bc240f0caadc363409ad7959856cebaab34e1ef2fc83096181b482260ccf02adbc08b847867e4435a85b9842a
+  data.tar.gz: 89218d7e52c5ab43cadeb1f90a7aaee039a046974f5672edd9ddd577e40e8cd4298e5dd695159ad9475d362432535fc97db715a832ca82dc88fa00f85c6faf6a

data/app/assets/javascripts/effective_assets/s3_uploader.js.coffee

@@ -30,6 +30,23 @@ $.fn.S3Uploader = (options) ->
       url: settings.url
 
       add: (e, data) ->
+        # Ensure correct $uploadForm is being used
+        $uploadForms = $('.asset-box-uploader')
+        return false if $uploadForms.index($uploadForm) == -1
+
+        # Make sure the user isn't over the upload limit
+        $asset_box = $uploadForm.closest('.asset-box-input')
+        limit = $asset_box.data('limit')
+        if typeof limit == 'number'
+          count = parseInt($asset_box.attr('data-attachment-count'), 10)
+          if count >= limit
+            alert("Unable to add file(s).  You have exceeded the limit of #{limit} uploads.") unless $asset_box.data('over-limit-alerted')
+            $asset_box.data('over-limit-alerted', true)
+            return false
+          else
+            $asset_box.attr('data-attachment-count', count + 1)
+
+        # Add the file to the upload
         file = data.files[0]
 
         # Check File Type
@@ -263,10 +280,16 @@ $.fn.S3Uploader = (options) ->
     else
       bits.toFixed(2) + ' bit/s'
 
+  resetOverLimitAlert = (event) ->
+    $assetBox = $(event.target).closest('.asset-box-input')
+    $assetBox.data('over-limit-alerted', false)
+
   #public methods
   @initialize = ->
     # Save key for IE9 Fix
     $uploadForm.data("key", $uploadForm.find("input[name='key']").val())
+    $uploadForm.data("fileCount", 0)
+    $(document).on 'drop', '.asset-box-uploader', resetOverLimitAlert
     setUploadForm()
     this
 

data/app/models/inputs/asset_box.rb

@@ -42,6 +42,8 @@ module Inputs
         data-attachment-style='#{@options[:attachment_style]}'
         data-attachment-add-to='#{@options[:attachment_add_to]}'
         data-attachment-actions='#{@options[:attachment_actions].to_json()}'
+        data-attachment-count='#{attachments.length}'
+        data-over-limit-alerted='false'
         data-aws-acl='#{@options[:aws_acl]}'
       >".html_safe
     end

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.4.3'.freeze
+  VERSION = '1.4.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails