1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
|
--- dropzone.5.1.1.js 2020-06-30 15:56:05.557790000 +0100
+++ dropzone.exiffixes.js 2020-06-30 16:40:22.794951100 +0100
@@ -26,7 +26,7 @@
*/
(function() {
- var Dropzone, Emitter, ExifRestore, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, noop, without,
+ var Dropzone, Emitter, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, noop, without,
slice = [].slice,
extend1 = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
hasProp = {}.hasOwnProperty;
@@ -1123,7 +1123,7 @@
};
Dropzone.prototype.resizeImage = function(file, width, height, resizeMethod, callback) {
- return this.createThumbnail(file, width, height, resizeMethod, false, (function(_this) {
+ return this.createThumbnail(file, width, height, resizeMethod, true, (function(_this) {
return function(dataUrl, canvas) {
var resizeMimeType, resizedDataURL;
if (canvas === null) {
@@ -1134,9 +1134,6 @@
resizeMimeType = file.type;
}
resizedDataURL = canvas.toDataURL(resizeMimeType, _this.options.resizeQuality);
- if (resizeMimeType === 'image/jpeg' || resizeMimeType === 'image/jpg') {
- resizedDataURL = ExifRestore.restore(file.dataURL, resizedDataURL);
- }
return callback(Dropzone.dataURItoBlob(resizedDataURL));
}
};
@@ -1164,23 +1161,17 @@
Dropzone.prototype.createThumbnailFromUrl = function(file, width, height, resizeMethod, fixOrientation, callback, crossOrigin) {
var img;
img = document.createElement("img");
+
+ // FixOrientation not needed anymore with browsers handling imageOrientation
+ fixOrientation = (getComputedStyle(document.body)['imageOrientation'] == 'from-image') ? false : fixOrientation;
+
if (crossOrigin) {
img.crossOrigin = crossOrigin;
}
img.onload = (function(_this) {
return function() {
- var loadExif;
- loadExif = function(callback) {
- return callback(1);
- };
- if ((typeof EXIF !== "undefined" && EXIF !== null) && fixOrientation) {
- loadExif = function(callback) {
- return EXIF.getData(img, function() {
- return callback(EXIF.getTag(this, 'Orientation'));
- });
- };
- }
- return loadExif(function(orientation) {
+ var orientation = fixOrientation ? EXIF.getData(img) : 1;
+
var canvas, ctx, ref, ref1, ref2, ref3, resizeInfo, thumbnail;
file.width = img.width;
file.height = img.height;
@@ -1212,23 +1203,23 @@
break;
case 6:
ctx.rotate(0.5 * Math.PI);
- ctx.translate(0, -canvas.height);
+ ctx.translate(0, -canvas.width);
break;
case 7:
ctx.rotate(0.5 * Math.PI);
- ctx.translate(canvas.width, -canvas.height);
+ ctx.translate(canvas.height, -canvas.width);
ctx.scale(-1, 1);
break;
case 8:
ctx.rotate(-0.5 * Math.PI);
- ctx.translate(-canvas.width, 0);
+ ctx.translate(-canvas.height, 0);
}
drawImageIOSFix(ctx, img, (ref = resizeInfo.srcX) != null ? ref : 0, (ref1 = resizeInfo.srcY) != null ? ref1 : 0, resizeInfo.srcWidth, resizeInfo.srcHeight, (ref2 = resizeInfo.trgX) != null ? ref2 : 0, (ref3 = resizeInfo.trgY) != null ? ref3 : 0, resizeInfo.trgWidth, resizeInfo.trgHeight);
thumbnail = canvas.toDataURL("image/png");
if (callback != null) {
return callback(thumbnail, canvas);
}
- });
+
};
})(this);
if (callback != null) {
@@ -1601,7 +1592,7 @@
return results;
};
- Dropzone.blacklistedBrowsers = [/opera.*Macintosh.*version\/12/i];
+ Dropzone.blacklistedBrowsers = [/opera.*(Windows Phone|Macintosh).*version\/12/i];
Dropzone.isBrowserSupported = function() {
var capableBrowser, j, len, ref, regex;
@@ -1828,161 +1819,6 @@
return ctx.drawImage(img, sx, sy, sw, sh, dx, dy, dw, dh / vertSquashRatio);
};
- ExifRestore = (function() {
- function ExifRestore() {}
-
- ExifRestore.KEY_STR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-
- ExifRestore.encode64 = function(input) {
- var chr1, chr2, chr3, enc1, enc2, enc3, enc4, i, output;
- output = '';
- chr1 = void 0;
- chr2 = void 0;
- chr3 = '';
- enc1 = void 0;
- enc2 = void 0;
- enc3 = void 0;
- enc4 = '';
- i = 0;
- while (true) {
- chr1 = input[i++];
- chr2 = input[i++];
- chr3 = input[i++];
- enc1 = chr1 >> 2;
- enc2 = (chr1 & 3) << 4 | chr2 >> 4;
- enc3 = (chr2 & 15) << 2 | chr3 >> 6;
- enc4 = chr3 & 63;
- if (isNaN(chr2)) {
- enc3 = enc4 = 64;
- } else if (isNaN(chr3)) {
- enc4 = 64;
- }
- output = output + this.KEY_STR.charAt(enc1) + this.KEY_STR.charAt(enc2) + this.KEY_STR.charAt(enc3) + this.KEY_STR.charAt(enc4);
- chr1 = chr2 = chr3 = '';
- enc1 = enc2 = enc3 = enc4 = '';
- if (!(i < input.length)) {
- break;
- }
- }
- return output;
- };
-
- ExifRestore.restore = function(origFileBase64, resizedFileBase64) {
- var image, rawImage, segments;
- if (!origFileBase64.match('data:image/jpeg;base64,')) {
- return resizedFileBase64;
- }
- rawImage = this.decode64(origFileBase64.replace('data:image/jpeg;base64,', ''));
- segments = this.slice2Segments(rawImage);
- image = this.exifManipulation(resizedFileBase64, segments);
- return 'data:image/jpeg;base64,' + this.encode64(image);
- };
-
- ExifRestore.exifManipulation = function(resizedFileBase64, segments) {
- var aBuffer, exifArray, newImageArray;
- exifArray = this.getExifArray(segments);
- newImageArray = this.insertExif(resizedFileBase64, exifArray);
- aBuffer = new Uint8Array(newImageArray);
- return aBuffer;
- };
-
- ExifRestore.getExifArray = function(segments) {
- var seg, x;
- seg = void 0;
- x = 0;
- while (x < segments.length) {
- seg = segments[x];
- if (seg[0] === 255 & seg[1] === 225) {
- return seg;
- }
- x++;
- }
- return [];
- };
-
- ExifRestore.insertExif = function(resizedFileBase64, exifArray) {
- var array, ato, buf, imageData, mae, separatePoint;
- imageData = resizedFileBase64.replace('data:image/jpeg;base64,', '');
- buf = this.decode64(imageData);
- separatePoint = buf.indexOf(255, 3);
- mae = buf.slice(0, separatePoint);
- ato = buf.slice(separatePoint);
- array = mae;
- array = array.concat(exifArray);
- array = array.concat(ato);
- return array;
- };
-
- ExifRestore.slice2Segments = function(rawImageArray) {
- var endPoint, head, length, seg, segments;
- head = 0;
- segments = [];
- while (true) {
- if (rawImageArray[head] === 255 & rawImageArray[head + 1] === 218) {
- break;
- }
- if (rawImageArray[head] === 255 & rawImageArray[head + 1] === 216) {
- head += 2;
- } else {
- length = rawImageArray[head + 2] * 256 + rawImageArray[head + 3];
- endPoint = head + length + 2;
- seg = rawImageArray.slice(head, endPoint);
- segments.push(seg);
- head = endPoint;
- }
- if (head > rawImageArray.length) {
- break;
- }
- }
- return segments;
- };
-
- ExifRestore.decode64 = function(input) {
- var base64test, buf, chr1, chr2, chr3, enc1, enc2, enc3, enc4, i, output;
- output = '';
- chr1 = void 0;
- chr2 = void 0;
- chr3 = '';
- enc1 = void 0;
- enc2 = void 0;
- enc3 = void 0;
- enc4 = '';
- i = 0;
- buf = [];
- base64test = /[^A-Za-z0-9\+\/\=]/g;
- if (base64test.exec(input)) {
- console.warning('There were invalid base64 characters in the input text.\n' + 'Valid base64 characters are A-Z, a-z, 0-9, \'+\', \'/\',and \'=\'\n' + 'Expect errors in decoding.');
- }
- input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
- while (true) {
- enc1 = this.KEY_STR.indexOf(input.charAt(i++));
- enc2 = this.KEY_STR.indexOf(input.charAt(i++));
- enc3 = this.KEY_STR.indexOf(input.charAt(i++));
- enc4 = this.KEY_STR.indexOf(input.charAt(i++));
- chr1 = enc1 << 2 | enc2 >> 4;
- chr2 = (enc2 & 15) << 4 | enc3 >> 2;
- chr3 = (enc3 & 3) << 6 | enc4;
- buf.push(chr1);
- if (enc3 !== 64) {
- buf.push(chr2);
- }
- if (enc4 !== 64) {
- buf.push(chr3);
- }
- chr1 = chr2 = chr3 = '';
- enc1 = enc2 = enc3 = enc4 = '';
- if (!(i < input.length)) {
- break;
- }
- }
- return buf;
- };
-
- return ExifRestore;
-
- })();
-
-
/*
* contentloaded.js
*
|
