s3ff 0.12.2 → 0.12.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/s3ff.js +1 -9
- data/lib/s3ff/version.rb +1 -1
- data/lib/s3ff/view_helper.rb +22 -15
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 48e8fc85ab97060f57da6eb99097d6320185cd43
|
|
4
|
+
data.tar.gz: e17daa611e46f8776c1b901390d876383eb75b34
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 262a2e9c5fc3e7a4e7013dd8a68029b51e2ea8e7413f657391d5f925ec19548d13a42beca819e1de55ed5f0ea07d534a0dc82ca3f9d8be10597deb234f32b1e5
|
|
7
|
+
data.tar.gz: 1c94bae49e17879e566e968623e23dc4588bd2d6b0d085d9b2a6890f7fc53f3d5d63f9af41c2abe238328750125ee687a9940d232d07831b7f254afbb41b45b9
|
|
@@ -10,14 +10,6 @@ $(function() {
|
|
|
10
10
|
}
|
|
11
11
|
if (! iCanHasCORSRequest()) return;
|
|
12
12
|
|
|
13
|
-
function makeArray(value) {
|
|
14
|
-
if (Array.isArray(value)) {
|
|
15
|
-
return value;
|
|
16
|
-
} else {
|
|
17
|
-
return Array(value);
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
|
|
21
13
|
$(document).on('page:change', function() {
|
|
22
14
|
if (!window.s3ff) {
|
|
23
15
|
window.s3ff = {
|
|
@@ -27,7 +19,7 @@ $(function() {
|
|
|
27
19
|
|
|
28
20
|
var that = $(this).addClass('s3ff_enabled');
|
|
29
21
|
var multi = that.attr('multiple');
|
|
30
|
-
var placeholders = makeArray(that.data('placeholder'));
|
|
22
|
+
var placeholders = $.makeArray(that.data('placeholder'));
|
|
31
23
|
var obj = that.data('s3ff') || placeholders;
|
|
32
24
|
function assign_matching_placeholder(i) { this.placeholder = (placeholders[i] || (placeholders[0] && {})); };
|
|
33
25
|
$.each(obj, assign_matching_placeholder);
|
data/lib/s3ff/version.rb
CHANGED
data/lib/s3ff/view_helper.rb
CHANGED
|
@@ -32,24 +32,31 @@ module S3FF
|
|
|
32
32
|
<button class="close" data-dismiss="alert" data-unique_id="{{:unique_id}}" data-target="#upload-{{:unique_id}}" style="margin-left:1em;" type="button">
|
|
33
33
|
<span aria-hidden="true">×</span><span class="sr-only">Remove</span>
|
|
34
34
|
</button>
|
|
35
|
-
<span class="
|
|
36
|
-
|
|
35
|
+
<span class="filename">
|
|
36
|
+
<span class="fa fa-file-o"></span>
|
|
37
|
+
{^{:result.filename}}
|
|
38
|
+
</span>
|
|
37
39
|
</div>
|
|
38
40
|
</div>
|
|
39
41
|
{^{else}}
|
|
40
|
-
{^{if
|
|
41
|
-
{^{if placeholder
|
|
42
|
-
|
|
43
|
-
{
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
<
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
42
|
+
{^{if !progress_pct}}
|
|
43
|
+
{^{if placeholder}}
|
|
44
|
+
{^{if placeholder.url || placeholder.filename}}
|
|
45
|
+
<div class="thumbnail" id="upload-{{:placeholder.id}}">
|
|
46
|
+
{^{if placeholder.url}}
|
|
47
|
+
<img data-link="src{:placeholder.url}">
|
|
48
|
+
{{/if}}
|
|
49
|
+
{^{if placeholder.filename}}
|
|
50
|
+
<div class="caption">
|
|
51
|
+
{^{:placeholder.remove_existing_link}}
|
|
52
|
+
<span class="filename">
|
|
53
|
+
<span class="fa fa-file-o"></span>
|
|
54
|
+
{^{:placeholder.filename}}
|
|
55
|
+
</span>
|
|
56
|
+
</div>
|
|
57
|
+
{{/if}}
|
|
58
|
+
</div>
|
|
59
|
+
{{/if}}
|
|
53
60
|
{{/if}}
|
|
54
61
|
{{/if}}
|
|
55
62
|
{{/if}}
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: s3ff
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.12.
|
|
4
|
+
version: 0.12.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chew Choon Keat
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-01-
|
|
11
|
+
date: 2015-01-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: s3_file_field
|
|
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
103
103
|
version: '0'
|
|
104
104
|
requirements: []
|
|
105
105
|
rubyforge_project:
|
|
106
|
-
rubygems_version: 2.4.
|
|
106
|
+
rubygems_version: 2.4.5
|
|
107
107
|
signing_key:
|
|
108
108
|
specification_version: 4
|
|
109
109
|
summary: Direct S3 upload using CORS with s3_file_field + paperclip
|