|
1 | 1 |
|
2 | 2 | /**
|
3 |
| - * Cloudinary's JavaScript library - Version 2.2.1 |
| 3 | + * Cloudinary's JavaScript library - Version 2.3.0 |
4 | 4 | * Copyright Cloudinary
|
5 | 5 | * see https://github.com/cloudinary/cloudinary_js
|
6 | 6 | *
|
@@ -1897,7 +1897,7 @@ var slice = [].slice,
|
1897 | 1897 | * @return {Object} Returns a plain object representing this transformation
|
1898 | 1898 | */
|
1899 | 1899 | this.toOptions || (this.toOptions = function(withChain) {
|
1900 |
| - var key, list, opt, ref, tr, value; |
| 1900 | + var key, list, opt, ref, ref1, tr, value; |
1901 | 1901 | if (withChain == null) {
|
1902 | 1902 | withChain = true;
|
1903 | 1903 | }
|
@@ -1925,9 +1925,15 @@ var slice = [].slice,
|
1925 | 1925 | return results;
|
1926 | 1926 | }).call(this);
|
1927 | 1927 | 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; |
1931 | 1937 | }
|
1932 | 1938 | return opt;
|
1933 | 1939 | });
|
@@ -2173,6 +2179,10 @@ var slice = [].slice,
|
2173 | 2179 | return new value.constructor(value.toOptions());
|
2174 | 2180 | }
|
2175 | 2181 | });
|
| 2182 | + if (options["if"]) { |
| 2183 | + this.set("if", options["if"]); |
| 2184 | + delete options["if"]; |
| 2185 | + } |
2176 | 2186 | for (key in options) {
|
2177 | 2187 | opt = options[key];
|
2178 | 2188 | if (key.match(VAR_NAME_RE)) {
|
@@ -3246,7 +3256,7 @@ var slice = [].slice,
|
3246 | 3256 | Cloudinary = (function() {
|
3247 | 3257 | 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;
|
3248 | 3258 |
|
3249 |
| - VERSION = "2.2.1"; |
| 3259 | + VERSION = "2.3.0"; |
3250 | 3260 |
|
3251 | 3261 | CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
|
3252 | 3262 |
|
@@ -3932,7 +3942,8 @@ var slice = [].slice,
|
3932 | 3942 | imgOptions = new Transformation(imgOptions).toHtmlAttributes();
|
3933 | 3943 | Util.setData(node, 'src-cache', url);
|
3934 | 3944 | node.setAttribute('width', imgOptions.width);
|
3935 |
| - results.push(node.setAttribute('height', imgOptions.height)); |
| 3945 | + node.setAttribute('height', imgOptions.height); |
| 3946 | + results.push(node); |
3936 | 3947 | }
|
3937 | 3948 | return results;
|
3938 | 3949 | }).call(this);
|
@@ -4481,7 +4492,7 @@ var slice = [].slice,
|
4481 | 4492 | TextLayer: TextLayer,
|
4482 | 4493 | SubtitlesLayer: SubtitlesLayer,
|
4483 | 4494 | Cloudinary: Cloudinary,
|
4484 |
| - VERSION: "2.2.1", |
| 4495 | + VERSION: "2.3.0", |
4485 | 4496 | CloudinaryJQuery: CloudinaryJQuery
|
4486 | 4497 | };
|
4487 | 4498 | return cloudinary;
|
|
0 commit comments