Skip to content
This repository was archived by the owner on Feb 17, 2021. It is now read-only.

Commit 3afc6bb

Browse files
author
Amir Tocker
committed
Version 2.3.0
1 parent 28b71a6 commit 3afc6bb

8 files changed

+2679
-17
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cloudinary-jquery-file-upload",
3-
"version": "2.2.1",
3+
"version": "2.3.0",
44
"homepage": "http://cloudinary.com",
55
"authors": [
66
{

cloudinary-jquery-file-upload.js

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
/**
3-
* Cloudinary's JavaScript library - Version 2.2.1
3+
* Cloudinary's JavaScript library - Version 2.3.0
44
* Copyright Cloudinary
55
* see https://github.com/cloudinary/cloudinary_js
66
*
@@ -1897,7 +1897,7 @@ var slice = [].slice,
18971897
* @return {Object} Returns a plain object representing this transformation
18981898
*/
18991899
this.toOptions || (this.toOptions = function(withChain) {
1900-
var key, list, opt, ref, tr, value;
1900+
var key, list, opt, ref, ref1, tr, value;
19011901
if (withChain == null) {
19021902
withChain = true;
19031903
}
@@ -1925,9 +1925,15 @@ var slice = [].slice,
19251925
return results;
19261926
}).call(this);
19271927
list.push(opt);
1928-
opt = {
1929-
transformation: list
1930-
};
1928+
opt = {};
1929+
ref1 = this.otherOptions;
1930+
for (key in ref1) {
1931+
value = ref1[key];
1932+
if (value !== void 0) {
1933+
opt[key] = value;
1934+
}
1935+
}
1936+
opt.transformation = list;
19311937
}
19321938
return opt;
19331939
});
@@ -2173,6 +2179,10 @@ var slice = [].slice,
21732179
return new value.constructor(value.toOptions());
21742180
}
21752181
});
2182+
if (options["if"]) {
2183+
this.set("if", options["if"]);
2184+
delete options["if"];
2185+
}
21762186
for (key in options) {
21772187
opt = options[key];
21782188
if (key.match(VAR_NAME_RE)) {
@@ -3246,7 +3256,7 @@ var slice = [].slice,
32463256
Cloudinary = (function() {
32473257
var AKAMAI_SHARED_CDN, CF_SHARED_CDN, DEFAULT_POSTER_OPTIONS, DEFAULT_VIDEO_SOURCE_TYPES, OLD_AKAMAI_SHARED_CDN, SHARED_CDN, VERSION, absolutize, applyBreakpoints, cdnSubdomainNumber, closestAbove, cloudinaryUrlPrefix, defaultBreakpoints, finalizeResourceType, findContainerWidth, maxWidth, updateDpr;
32483258

3249-
VERSION = "2.2.1";
3259+
VERSION = "2.3.0";
32503260

32513261
CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
32523262

@@ -3932,7 +3942,8 @@ var slice = [].slice,
39323942
imgOptions = new Transformation(imgOptions).toHtmlAttributes();
39333943
Util.setData(node, 'src-cache', url);
39343944
node.setAttribute('width', imgOptions.width);
3935-
results.push(node.setAttribute('height', imgOptions.height));
3945+
node.setAttribute('height', imgOptions.height);
3946+
results.push(node);
39363947
}
39373948
return results;
39383949
}).call(this);
@@ -4481,7 +4492,7 @@ var slice = [].slice,
44814492
TextLayer: TextLayer,
44824493
SubtitlesLayer: SubtitlesLayer,
44834494
Cloudinary: Cloudinary,
4484-
VERSION: "2.2.1",
4495+
VERSION: "2.3.0",
44854496
CloudinaryJQuery: CloudinaryJQuery
44864497
};
44874498
return cloudinary;

cloudinary-jquery-file-upload.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cloudinary-jquery-file-upload.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)