blueimp-file-upload-rails 8.5.0 → 8.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/{vendor → app}/assets/images/loading.gif +0 -0
  3. data/{vendor → app}/assets/images/progressbar.gif +0 -0
  4. data/{vendor → app}/assets/javascripts/blueimp-file-upload-basic-plus-ui.js +0 -0
  5. data/{vendor → app}/assets/javascripts/cors/jquery.postmessage-transport.js +0 -0
  6. data/{vendor → app}/assets/javascripts/cors/jquery.xdr-transport.js +0 -0
  7. data/{vendor → app}/assets/javascripts/jquery.fileupload-angular.js +4 -2
  8. data/{vendor → app}/assets/javascripts/jquery.fileupload-audio.js +4 -11
  9. data/{vendor → app}/assets/javascripts/jquery.fileupload-image.js +4 -11
  10. data/{vendor → app}/assets/javascripts/jquery.fileupload-process.js +0 -0
  11. data/{vendor → app}/assets/javascripts/jquery.fileupload-ui.js +0 -0
  12. data/{vendor → app}/assets/javascripts/jquery.fileupload-validate.js +0 -0
  13. data/{vendor → app}/assets/javascripts/jquery.fileupload-video.js +4 -11
  14. data/{vendor → app}/assets/javascripts/jquery.fileupload.js +2 -2
  15. data/{vendor → app}/assets/javascripts/jquery.iframe-transport.js +0 -0
  16. data/{vendor → app}/assets/stylesheets/blueimp-file-upload.css +0 -0
  17. data/{vendor → app}/assets/stylesheets/jquery.fileupload-ui-noscript.css +0 -0
  18. data/{vendor → app}/assets/stylesheets/jquery.fileupload-ui.css.erb +0 -0
  19. data/lib/blueimp-file-upload-rails/version.rb +1 -1
  20. metadata +19 -19
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b724168c1d92965dbcb096ab2f8dd47b7ad1013e
4
- data.tar.gz: fd6d388cf58a4b2342e8526955600d54ed407ee8
3
+ metadata.gz: 5ac4ce577d2cce5ea2da30624a542252ffe0f21d
4
+ data.tar.gz: 5848cd19228a2c8827443fd7c1eb8920d85552f1
5
5
  SHA512:
6
- metadata.gz: 1ca334804763e0de86cecc121e9b28041c95461f1552308c2952229ce17698875ff0797334fa0d6eecfbe225f02f062642f2fb293090755894616aeb90b354a2
7
- data.tar.gz: 4eb64c449e6ab193ea97dcb6176a40c02dbdefafc6dc7c6df57c20941863d4deedcd4d7d54b105af6b2adc4a005bf26bfa2b6480b7200a971d6d0a8e13d6fec8
6
+ metadata.gz: f45b95954d0979c02ea82201f0d4f47404daa6921c95b58c45864f0a63765a2719843abfbacd1562f45fc985c7439751ee9b748089d3b7607d099ce96cb46194
7
+ data.tar.gz: fdd80cb2e371bd4ff370357951cb5ee26fff27929c79f19007172dd032483f7d943e1a074c67e55e1e6b26e1f26a690f2c525cae67785e5f58d8d6019d0341cd
data/{vendor → app}/assets/javascripts/jquery.fileupload-angular.js RENAMED
@@ -1,5 +1,5 @@
1
1
  /*
2
- * jQuery File Upload AngularJS Plugin 1.4.0
2
+ * jQuery File Upload AngularJS Plugin 1.4.1
3
3
  * https://github.com/blueimp/jQuery-File-Upload
4
4
  *
5
5
  * Copyright 2013, Sebastian Tschan
@@ -296,7 +296,9 @@
296
296
  'fileuploadprocessalways',
297
297
  'fileuploadprocessstop'
298
298
  ].join(' '), function (e, data) {
299
- $scope.$emit(e.type, data);
299
+ if ($scope.$emit(e.type, data).defaultPrevented) {
300
+ e.preventDefault();
301
+ }
300
302
  }).on('remove', function () {
301
303
  // Remove upload methods from the scope,
302
304
  // when the widget is removed:
data/{vendor → app}/assets/javascripts/jquery.fileupload-audio.js RENAMED
@@ -1,5 +1,5 @@
1
1
  /*
2
- * jQuery File Upload Audio Preview Plugin 1.0.2
2
+ * jQuery File Upload Audio Preview Plugin 1.0.3
3
3
  * https://github.com/blueimp/jQuery-File-Upload
4
4
  *
5
5
  * Copyright 2013, Sebastian Tschan
@@ -35,9 +35,6 @@
35
35
  $.blueimp.fileupload.prototype.options.processQueue.unshift(
36
36
  {
37
37
  action: 'loadAudio',
38
- // Always trigger this action,
39
- // even if the previous action was rejected:
40
- always: true,
41
38
  // Use the action as prefix for the "@" options:
42
39
  prefix: true,
43
40
  fileTypes: '@',
@@ -73,9 +70,7 @@
73
70
  if (options.disabled) {
74
71
  return data;
75
72
  }
76
- var that = this,
77
- file = data.files[data.index],
78
- dfd = $.Deferred(),
73
+ var file = data.files[data.index],
79
74
  url,
80
75
  audio;
81
76
  if (this._audioElement.canPlayType &&
@@ -90,12 +85,10 @@
90
85
  audio.src = url;
91
86
  audio.controls = true;
92
87
  data.audio = audio;
93
- dfd.resolveWith(that, [data]);
94
- return dfd.promise();
88
+ return data;
95
89
  }
96
90
  }
97
- dfd.rejectWith(that, [data]);
98
- return dfd.promise();
91
+ return data;
99
92
  },
100
93
 
101
94
  // Sets the audio element as a property of the file object:
data/{vendor → app}/assets/javascripts/jquery.fileupload-image.js RENAMED
@@ -1,5 +1,5 @@
1
1
  /*
2
- * jQuery File Upload Image Preview & Resize Plugin 1.2.2
2
+ * jQuery File Upload Image Preview & Resize Plugin 1.2.3
3
3
  * https://github.com/blueimp/jQuery-File-Upload
4
4
  *
5
5
  * Copyright 2013, Sebastian Tschan
@@ -39,9 +39,6 @@
39
39
  $.blueimp.fileupload.prototype.options.processQueue.unshift(
40
40
  {
41
41
  action: 'loadImageMetaData',
42
- // Always trigger this action,
43
- // even if the previous action was rejected:
44
- always: true,
45
42
  disableImageHead: '@',
46
43
  disableExif: '@',
47
44
  disableExifThumbnail: '@',
@@ -79,9 +76,6 @@
79
76
  },
80
77
  {
81
78
  action: 'resizeImage',
82
- // Always trigger this action,
83
- // even if the previous action was rejected:
84
- always: true,
85
79
  // Use "preview" as prefix for the "@" options:
86
80
  prefix: 'preview',
87
81
  maxWidth: '@',
@@ -154,15 +148,14 @@
154
148
  !loadImage(
155
149
  file,
156
150
  function (img) {
157
- if (!img.src) {
158
- return dfd.rejectWith(that, [data]);
151
+ if (img.src) {
152
+ data.img = img;
159
153
  }
160
- data.img = img;
161
154
  dfd.resolveWith(that, [data]);
162
155
  },
163
156
  options
164
157
  )) {
165
- dfd.rejectWith(that, [data]);
158
+ return data;
166
159
  }
167
160
  return dfd.promise();
168
161
  },
data/{vendor → app}/assets/javascripts/jquery.fileupload-video.js RENAMED
@@ -1,5 +1,5 @@
1
1
  /*
2
- * jQuery File Upload Video Preview Plugin 1.0.2
2
+ * jQuery File Upload Video Preview Plugin 1.0.3
3
3
  * https://github.com/blueimp/jQuery-File-Upload
4
4
  *
5
5
  * Copyright 2013, Sebastian Tschan
@@ -35,9 +35,6 @@
35
35
  $.blueimp.fileupload.prototype.options.processQueue.unshift(
36
36
  {
37
37
  action: 'loadVideo',
38
- // Always trigger this action,
39
- // even if the previous action was rejected:
40
- always: true,
41
38
  // Use the action as prefix for the "@" options:
42
39
  prefix: true,
43
40
  fileTypes: '@',
@@ -73,9 +70,7 @@
73
70
  if (options.disabled) {
74
71
  return data;
75
72
  }
76
- var that = this,
77
- file = data.files[data.index],
78
- dfd = $.Deferred(),
73
+ var file = data.files[data.index],
79
74
  url,
80
75
  video;
81
76
  if (this._videoElement.canPlayType &&
@@ -90,12 +85,10 @@
90
85
  video.src = url;
91
86
  video.controls = true;
92
87
  data.video = video;
93
- dfd.resolveWith(that, [data]);
94
- return dfd.promise();
88
+ return data;
95
89
  }
96
90
  }
97
- dfd.rejectWith(that, [data]);
98
- return dfd.promise();
91
+ return data;
99
92
  },
100
93
 
101
94
  // Sets the video element as a property of the file object:
data/{vendor → app}/assets/javascripts/jquery.fileupload.js RENAMED
@@ -1,5 +1,5 @@
1
1
  /*
2
- * jQuery File Upload Plugin 5.32.0
2
+ * jQuery File Upload Plugin 5.32.1
3
3
  * https://github.com/blueimp/jQuery-File-Upload
4
4
  *
5
5
  * Copyright 2010, Sebastian Tschan
@@ -32,7 +32,7 @@
32
32
  $.support.fileInput = !(new RegExp(
33
33
  // Handle devices which give false positives for the feature detection:
34
34
  '(Android (1\\.[0156]|2\\.[01]))' +
35
- '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)' +
35
+ '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
36
36
  '|(w(eb)?OSBrowser)|(webOS)' +
37
37
  '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
38
38
  ).test(window.navigator.userAgent) ||
data/lib/blueimp-file-upload-rails/version.rb CHANGED
@@ -5,7 +5,7 @@ module Blueimp
5
5
  class Version
6
6
  class << self
7
7
  def to_s
8
- "8.5.0"
8
+ "8.6.1"
9
9
  end
10
10
  end
11
11
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: blueimp-file-upload-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.5.0
4
+ version: 8.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sebastian Tschan
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-07-11 00:00:00.000000000 Z
12
+ date: 2013-07-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
@@ -112,23 +112,23 @@ extra_rdoc_files: []
112
112
  files:
113
113
  - lib/blueimp-file-upload-rails.rb
114
114
  - lib/blueimp-file-upload-rails/version.rb
115
- - vendor/assets/images/loading.gif
116
- - vendor/assets/images/progressbar.gif
117
- - vendor/assets/javascripts/blueimp-file-upload-basic-plus-ui.js
118
- - vendor/assets/javascripts/cors/jquery.postmessage-transport.js
119
- - vendor/assets/javascripts/cors/jquery.xdr-transport.js
120
- - vendor/assets/javascripts/jquery.fileupload-angular.js
121
- - vendor/assets/javascripts/jquery.fileupload-audio.js
122
- - vendor/assets/javascripts/jquery.fileupload-image.js
123
- - vendor/assets/javascripts/jquery.fileupload-process.js
124
- - vendor/assets/javascripts/jquery.fileupload-ui.js
125
- - vendor/assets/javascripts/jquery.fileupload-validate.js
126
- - vendor/assets/javascripts/jquery.fileupload-video.js
127
- - vendor/assets/javascripts/jquery.fileupload.js
128
- - vendor/assets/javascripts/jquery.iframe-transport.js
129
- - vendor/assets/stylesheets/blueimp-file-upload.css
130
- - vendor/assets/stylesheets/jquery.fileupload-ui-noscript.css
131
- - vendor/assets/stylesheets/jquery.fileupload-ui.css.erb
115
+ - app/assets/images/loading.gif
116
+ - app/assets/images/progressbar.gif
117
+ - app/assets/javascripts/blueimp-file-upload-basic-plus-ui.js
118
+ - app/assets/javascripts/cors/jquery.postmessage-transport.js
119
+ - app/assets/javascripts/cors/jquery.xdr-transport.js
120
+ - app/assets/javascripts/jquery.fileupload-angular.js
121
+ - app/assets/javascripts/jquery.fileupload-audio.js
122
+ - app/assets/javascripts/jquery.fileupload-image.js
123
+ - app/assets/javascripts/jquery.fileupload-process.js
124
+ - app/assets/javascripts/jquery.fileupload-ui.js
125
+ - app/assets/javascripts/jquery.fileupload-validate.js
126
+ - app/assets/javascripts/jquery.fileupload-video.js
127
+ - app/assets/javascripts/jquery.fileupload.js
128
+ - app/assets/javascripts/jquery.iframe-transport.js
129
+ - app/assets/stylesheets/blueimp-file-upload.css
130
+ - app/assets/stylesheets/jquery.fileupload-ui-noscript.css
131
+ - app/assets/stylesheets/jquery.fileupload-ui.css.erb
132
132
  - app/models/blueimp/file_upload/file.rb
133
133
  - app/views/blueimp/_file_upload.html.erb
134
134
  - app/views/blueimp/_file_upload_templates.html.erb