universal_s3_uploader 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 73f63e41f9b6f24c596350c0bca808fe50e11c1b
4
- data.tar.gz: 4b3f18c431c25c02d01920cdd2fc8bed9b2da69c
3
+ metadata.gz: 10cb6d020745ff0cabf66f8a95dcdfaa7eca1329
4
+ data.tar.gz: 7a53dbd31ad01c19401349fba74dfbd242c65c0d
5
5
  SHA512:
6
- metadata.gz: 93e288b7fe0f14291dc9040ec6e6e98c7fd19b3cfe55fed8c8840a56d6c03e5a0d266f751d0a29da266542957bf56e845d48a663a459ca1ab2c12026c07b0eb3
7
- data.tar.gz: 518f68496c4e1e4c7e77fc1902641ed0bf76bd681280f8a3cbe6949c2137cc01999ac8b3aec58b0a09b6c7a616f577b6d3bb75cb8e358eb34c10e786477c9def
6
+ metadata.gz: 7384fa091913942810ff50ebf34030f10276009bb1907d5411666bfbdfb2cbb75f035423cd46425a033a93fdbdd8b2a27f9c7ef70052de00e3e3e681f31df466
7
+ data.tar.gz: 38881b13b635c4c3413e9b47570adc65843d3bc360382b0cf8e7fcf56a8a23e8c865d071ad63fc4e4697998195361479989d1c2fce1981df58a9e737e6bf38fe
@@ -1,3 +1,3 @@
1
1
  module UniversalS3Uploader
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.1"
3
3
  end
@@ -59,7 +59,8 @@ module UniversalS3Uploader
59
59
  tag += div_tag 'Signature', signature
60
60
  tag += av.file_field_tag :file, multiple: true, accept: 'image/*'
61
61
 
62
- tag += '<object id="flashUploader" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=11,1,0,0">'
62
+ object_id = 'flash_' + id
63
+ tag += "<object id=#{'flash_' + id} class='flash_uploader' classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=11,1,0,0'>"
63
64
  tag += '<param name="movie" value="/assets/UniversalS3Uploader.swf">'
64
65
  tag += '<param name="wmode" value="transparent">'
65
66
  tag += '</object>'
@@ -2,12 +2,14 @@
2
2
  {
3
3
  $.fn.universal_s3_uploader = function(options)
4
4
  {
5
- if (!this.universalS3UploaderInstance)
5
+ var instance = $.data(this.get(0), 'universalS3UploaderInstance');
6
+
7
+ if (!instance)
6
8
  {
7
- this.universalS3UploaderInstance = new UniversalS3Uploader(this, options);
9
+ instance = $.data(this.get(0), 'universalS3UploaderInstance', new UniversalS3Uploader(this, options));
8
10
  }
9
11
 
10
- return this.universalS3UploaderInstance;
12
+ return instance;
11
13
  };
12
14
 
13
15
  var defaultOptions =
@@ -51,7 +53,7 @@
51
53
  {
52
54
  if (supportFormData) // if supports HTML5 FormData
53
55
  {
54
- this.element.children('object#flashUploader').remove();
56
+ this.element.children('object.flash_uploader').remove();
55
57
 
56
58
  this.element.children('input[type=file]').change(function()
57
59
  {
@@ -64,26 +66,34 @@
64
66
 
65
67
  else // use Flash uploader
66
68
  {
67
- var flashObject = this.element.children('object').get(0);
69
+ var flashObject = this.element.children('object.flash_uploader').get(0);
68
70
  var fileField = this.element.children('input[type=file]');
69
71
 
70
72
  $(flashObject).css("height", fileField.height()+10 + "px").css("width", fileField.width() + "px");
71
73
  $(flashObject).css("position", "relative").css("left", "-" + fileField.width() + "px").css("top", "6px");
74
+
75
+ this.initExternalInterface();
72
76
  }
73
77
  };
74
78
 
75
79
  UniversalS3Uploader.prototype.initExternalInterface = function()
76
80
  {
77
- if (!supportFormData)
78
- {
79
- var flashObject = this.element.children('object').get(0);
81
+ var elem = this.element;
82
+ var flashObject = this.element.children('object.flash_uploader').get(0);
80
83
 
81
- flashObject.sendDivId(this.element.attr('id'));
82
- this.element.children('div').each(function ()
84
+ var interval = setInterval(function()
85
+ {
86
+ if (flashObject.sendFormData)
83
87
  {
84
- flashObject.sendFormData(this.className, $(this).data('value'));
85
- });
86
- }
88
+ clearInterval(interval);
89
+
90
+ flashObject.sendDivId(elem.attr('id'));
91
+ elem.children('div').each(function ()
92
+ {
93
+ flashObject.sendFormData(this.className, $(this).data('value'));
94
+ });
95
+ }
96
+ }, 100);
87
97
  };
88
98
 
89
99
  UniversalS3Uploader.prototype.submit = function()
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: universal_s3_uploader
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dohan Kim