s3ff 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bd380626001b2b203f6924a3b66d6e89bf28c7e
-  data.tar.gz: 0cd8675ecdd614a797e39062e46b9f97ae795000
+  metadata.gz: bcf736d404180f697959d82d620993018d078882
+  data.tar.gz: f3a1ce7709027b08b302a0a6dc64e3953147aa8b
 SHA512:
-  metadata.gz: 8c1ed0e0a858f87395cbd48fcb03b33f09ef844404f8701a971a23377d0d36721c32134d44eccb9d2b10222fa96b56728f350df9156eb2545ab523763d97561e
-  data.tar.gz: f61cbbea7b9c342d5005a6f1f90e7c7db2fe312892d7f54dc1e624de76abeb5572b6e006dab901d0d11e37e6e680ccbf4bec4c2404102317ab18239f5289b4ce
+  metadata.gz: 50d9807e83124f2feca1ae22d3874ba806e6438c01cccf16d28415f8d97b32e8e9d92f1ebe4e54aafa66a99c84004d5a08b9da0e84aed3533e3eebe8a82f93d8
+  data.tar.gz: 66ba7a6c6a5b99a63133c962575f9f8aaa09e53f2fb72e48fca5dc3352aab950509da8a20ae82404cf9682cdcd7c4d7e83e196a834b17cf215753511fbd0bfd4

data/app/assets/javascripts/s3ff.js

@@ -42,36 +42,37 @@ $(function() {
 
           var s3ff_handlers = {
             drop: function(e, data) {
-              if (that[0] != e.originalEvent.target) return e.preventDefault();
-              if (! multi) $.observable(obj).refresh(data.files);
+              if (e.delegatedEvent.target.parentNode != wrap[0]) return e.preventDefault();
+              $.observable(obj).refresh(data.files);
             },
             change: function(e, data) {
-              if (! multi) $.observable(obj).refresh(data.files);
+              $.observable(obj).refresh(data.files);
             },
             send: function(e, data) {
               $.each(obj, function() {
                 if (data.files[0].unique_id == this.unique_id) {
-                  dom.find('.s3ff_bar').parent().show();
+                  this.progress_pct = "0%";
                   this.placeholder = placeholder;
                 }
               });
-              // $.observable(obj).refresh(obj); // progress bar animation doesn't work
+              $.observable(obj).refresh(obj);
             },
             progress: function(e, data) {
+              // $.observable(obj).refresh(obj); // progress bar animation doesn't work
+              // :. adjust manually
               $.each(obj, function() {
                 if (data.files[0].unique_id == this.unique_id) {
-                  this.progress = (parseInt(data.loaded / data.total * 100, 10)) + "%";
-                  dom.find('.s3ff_bar').css({width: this.progress}).text(this.progress);
+                  this.progress_pct = (parseInt(data.loaded / data.total * 100, 10)) + "%";
+                  dom.find('#s3ff_progress-' + this.unique_id).show().find('.s3ff_bar').css({width: this.progress_pct}).text(this.name);
                 }
               });
-              // $.observable(obj).refresh(obj); // progress bar animation doesn't work
             },
             done: function(e, data) {
-              var field_prefix = that.attr('name').replace(/\]$/, '');
+              var field_prefix = that.attr('name').replace(/(\]\[\]|\])$/, '');
               $.each(obj, function() {
                 if (data.files[0].unique_id == this.unique_id) {
-                  delete this.progress;
-                  this.fieldname = field_prefix + '_direct_url';
+                  delete this.progress_pct;
+                  this.fieldname = field_prefix + '_direct_url]' + (multi ? '[]' : '');
                   this.result = data.result;
                 }
               });
@@ -81,7 +82,6 @@ $(function() {
               $.each(obj, function() {
                 if (data.files[0].unique_id == this.unique_id) {
                   this.progress_pct = "80%";
-                  this.progress_style = "width:" + this.progress_pct;
                   this.failReason = data.failReason || data.textStatus || 'Failed!';
                 }
               });
@@ -89,7 +89,7 @@ $(function() {
             },
             add: function(e, data) {
               // beginning; disable submit
-              wrap.parents("form").find("[type='submit']").each(function() {
+              wrap.parents("form").find("button,[type='submit']").each(function() {
                 this.uploading = this.uploading || 0;
                 $(this).attr({'disabled': (++this.uploading > 0)});
               });
@@ -97,7 +97,7 @@ $(function() {
             },
             always: function(e, data) {
               // end; re-enable submit
-              wrap.parents("form").find("[type='submit']").each(function() {
+              wrap.parents("form").find("button,[type='submit']").each(function() {
                 this.uploading = this.uploading || 0;
                 $(this).attr({'disabled': (--this.uploading > 0)});
               });
@@ -111,4 +111,17 @@ $(function() {
     $(s3ff.selector).each(s3ff.init);
     $(document).on("mouseenter mousedown touchstart", s3ff.selector, s3ff.init);
   });
+
+  $(document).bind('dragover', function (e) {
+    var timeout = s3ff.dropZoneTimeout;
+    if (! timeout) {
+      $(document.body).addClass('s3ff_dragover');
+    } else {
+      clearTimeout(timeout);
+    }
+    s3ff.dropZoneTimeout = setTimeout(function () {
+      $(document.body).removeClass('s3ff_dragover');
+      s3ff.dropZoneTimeout = null;
+    }, 100);
+  });
 });

data/lib/s3ff/version.rb

@@ -1,3 +1,3 @@
 module S3FF
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/lib/s3ff/view_helper.rb

@@ -5,16 +5,22 @@ module S3FF
       <div style="display:none;">
         <script id="s3ff_template" type="text/x-tmpl">
           {^{if failReason}}
-            <div class="progress s3ff_progress">
-              <div class="progress-bar progress-bar-danger s3ff_bar" style="width:80%;">
+            <div class="progress s3ff_progress" id="s3ff_progress-{{:unique_id}}">
+              <div class="progress-bar progress-bar-danger s3ff_bar" style="width:{{:progress_pct}}">
                 <span class="fa fa-exclamation-triangle"></span>
                 {^{:failReason}}
               </div>
             </div>
           {^{else}}
-            <div class="progress s3ff_progress" style="display:none;">
-              <div class="progress-bar progress-bar-striped active s3ff_bar" style="width:0%;"></div>
-            </div>
+            {^{if progress_pct}}
+              <div class="progress s3ff_progress" id="s3ff_progress-{{:unique_id}}">
+                <div class="progress-bar progress-bar-striped active s3ff_bar" style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:{{:progress_pct}}">{{:name}}</div>
+              </div>
+            {^{else}}
+              <div class="progress s3ff_progress" id="s3ff_progress-{{:unique_id}}" style="display:none;">
+                <div class="progress-bar progress-bar-striped active s3ff_bar" style="width:0%;"></div>
+              </div>
+            {{/if}}
           {{/if}}
           {^{if result}}
             <div class="thumbnail" id="upload-{{:unique_id}}">
@@ -32,17 +38,19 @@ module S3FF
             </div>
           {^{else}}
             {^{if placeholder}}
-              <div class="thumbnail" id="upload-{{:unique_id}}">
-                {^{if placeholder.url}}
-                  <img data-link="src{:placeholder.url}">
-                {{/if}}
-                {^{if placeholder.filename}}
-                  <div class="caption">
-                    <span class="fa fa-file-o"></span>
-                    {^{:placeholder.filename}}
-                  </div>
-                {{/if}}
-              </div>
+              {^{if placeholder.url || placeholder.filename}}
+                <div class="thumbnail" id="upload-{{:unique_id}}">
+                  {^{if placeholder.url}}
+                    <img data-link="src{:placeholder.url}">
+                  {{/if}}
+                  {^{if placeholder.filename}}
+                    <div class="caption">
+                      <span class="fa fa-file-o"></span>
+                      {^{:placeholder.filename}}
+                    </div>
+                  {{/if}}
+                </div>
+              {{/if}}
             {{/if}}
           {{/if}}
         </script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3ff
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Chew Choon Keat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: s3_file_field
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Direct S3 upload using CORS with s3_file_field + paperclip