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

Commit 5bdf5af

Browse files
author
Amir Tocker
committed
Version 2.1.8
1 parent d7a69f6 commit 5bdf5af

8 files changed

+74
-42
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cloudinary-core",
3-
"version": "2.1.7",
3+
"version": "2.1.8",
44
"homepage": "http://cloudinary.com",
55
"authors": [
66
{

‎cloudinary-core-shrinkwrap.js‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
/**
3-
* Cloudinary's JavaScript library - Version 2.1.7
3+
* Cloudinary's JavaScript library - Version 2.1.8
44
* Copyright Cloudinary
55
* see https://github.com/cloudinary/cloudinary_js
66
*
@@ -5075,22 +5075,38 @@ var slice = [].slice,
50755075
*/
50765076

50775077
Configuration.prototype.fromEnvironment = function() {
5078-
var cloudinary_url, k, ref1, ref2, uri, v;
5078+
var cloudinary_url, j, k, len, query, ref1, ref2, ref3, uri, uriRegex, v, value;
50795079
cloudinary_url = typeof process !== "undefined" && process !== null ? (ref1 = process.env) != null ? ref1.CLOUDINARY_URL : void 0 : void 0;
50805080
if (cloudinary_url != null) {
5081-
uri = require('url').parse(cloudinary_url, true);
5082-
this.configuration = {
5083-
cloud_name: uri.host,
5084-
api_key: uri.auth && uri.auth.split(":")[0],
5085-
api_secret: uri.auth && uri.auth.split(":")[1],
5086-
private_cdn: uri.pathname != null,
5087-
secure_distribution: uri.pathname && uri.pathname.substring(1)
5088-
};
5089-
if (uri.query != null) {
5090-
ref2 = uri.query;
5091-
for (k in ref2) {
5092-
v = ref2[k];
5093-
this.configuration[k] = v;
5081+
uriRegex = /cloudinary:\/\/(?:(\w+)(?:\:(\w+))?@)?([\w\.-]+)(?:\/([^?]*))?(?:\?(.+))?/;
5082+
uri = uriRegex.exec(cloudinary_url);
5083+
if (uri) {
5084+
if (uri[3] != null) {
5085+
this.configuration['cloud_name'] = uri[3];
5086+
}
5087+
if (uri[1] != null) {
5088+
this.configuration['api_key'] = uri[1];
5089+
}
5090+
if (uri[2] != null) {
5091+
this.configuration['api_secret'] = uri[2];
5092+
}
5093+
if (uri[4] != null) {
5094+
this.configuration['private_cdn'] = uri[4] != null;
5095+
}
5096+
if (uri[4] != null) {
5097+
this.configuration['secure_distribution'] = uri[4];
5098+
}
5099+
query = uri[5];
5100+
if (query != null) {
5101+
ref2 = query.split('&');
5102+
for (j = 0, len = ref2.length; j < len; j++) {
5103+
value = ref2[j];
5104+
ref3 = value.split('='), k = ref3[0], v = ref3[1];
5105+
if (v == null) {
5106+
v = true;
5107+
}
5108+
this.configuration[k] = v;
5109+
}
50945110
}
50955111
}
50965112
}
@@ -6503,7 +6519,7 @@ var slice = [].slice,
65036519
Cloudinary = (function() {
65046520
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;
65056521

6506-
VERSION = "2.1.7";
6522+
VERSION = "2.1.8";
65076523

65086524
CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
65096525

@@ -7343,7 +7359,7 @@ var slice = [].slice,
73437359
TextLayer: TextLayer,
73447360
SubtitlesLayer: SubtitlesLayer,
73457361
Cloudinary: Cloudinary,
7346-
VERSION: "2.1.7"
7362+
VERSION: "2.1.8"
73477363
};
73487364
return cloudinary;
73497365
});

‎cloudinary-core-shrinkwrap.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloudinary-core-shrinkwrap.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloudinary-core.js‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
/**
3-
* Cloudinary's JavaScript library - Version 2.1.7
3+
* Cloudinary's JavaScript library - Version 2.1.8
44
* Copyright Cloudinary
55
* see https://github.com/cloudinary/cloudinary_js
66
*
@@ -1580,22 +1580,38 @@ var slice = [].slice,
15801580
*/
15811581

15821582
Configuration.prototype.fromEnvironment = function() {
1583-
var cloudinary_url, k, ref1, ref2, uri, v;
1583+
var cloudinary_url, j, k, len, query, ref1, ref2, ref3, uri, uriRegex, v, value;
15841584
cloudinary_url = typeof process !== "undefined" && process !== null ? (ref1 = process.env) != null ? ref1.CLOUDINARY_URL : void 0 : void 0;
15851585
if (cloudinary_url != null) {
1586-
uri = require('url').parse(cloudinary_url, true);
1587-
this.configuration = {
1588-
cloud_name: uri.host,
1589-
api_key: uri.auth && uri.auth.split(":")[0],
1590-
api_secret: uri.auth && uri.auth.split(":")[1],
1591-
private_cdn: uri.pathname != null,
1592-
secure_distribution: uri.pathname && uri.pathname.substring(1)
1593-
};
1594-
if (uri.query != null) {
1595-
ref2 = uri.query;
1596-
for (k in ref2) {
1597-
v = ref2[k];
1598-
this.configuration[k] = v;
1586+
uriRegex = /cloudinary:\/\/(?:(\w+)(?:\:(\w+))?@)?([\w\.-]+)(?:\/([^?]*))?(?:\?(.+))?/;
1587+
uri = uriRegex.exec(cloudinary_url);
1588+
if (uri) {
1589+
if (uri[3] != null) {
1590+
this.configuration['cloud_name'] = uri[3];
1591+
}
1592+
if (uri[1] != null) {
1593+
this.configuration['api_key'] = uri[1];
1594+
}
1595+
if (uri[2] != null) {
1596+
this.configuration['api_secret'] = uri[2];
1597+
}
1598+
if (uri[4] != null) {
1599+
this.configuration['private_cdn'] = uri[4] != null;
1600+
}
1601+
if (uri[4] != null) {
1602+
this.configuration['secure_distribution'] = uri[4];
1603+
}
1604+
query = uri[5];
1605+
if (query != null) {
1606+
ref2 = query.split('&');
1607+
for (j = 0, len = ref2.length; j < len; j++) {
1608+
value = ref2[j];
1609+
ref3 = value.split('='), k = ref3[0], v = ref3[1];
1610+
if (v == null) {
1611+
v = true;
1612+
}
1613+
this.configuration[k] = v;
1614+
}
15991615
}
16001616
}
16011617
}
@@ -3008,7 +3024,7 @@ var slice = [].slice,
30083024
Cloudinary = (function() {
30093025
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;
30103026

3011-
VERSION = "2.1.7";
3027+
VERSION = "2.1.8";
30123028

30133029
CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
30143030

@@ -3848,7 +3864,7 @@ var slice = [].slice,
38483864
TextLayer: TextLayer,
38493865
SubtitlesLayer: SubtitlesLayer,
38503866
Cloudinary: Cloudinary,
3851-
VERSION: "2.1.7"
3867+
VERSION: "2.1.8"
38523868
};
38533869
return cloudinary;
38543870
});

‎cloudinary-core.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloudinary-core.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cloudinary-core",
3-
"version": "2.1.7",
3+
"version": "2.1.8",
44
"description": "Cloudinary Client Side JS library. Cloudinary streamlines your web application’s image manipulation needs. Cloudinary's cloud-based servers automate image uploading, resizing, cropping, optimizing, sprite generation and more.",
55
"main": "cloudinary-core.js",
66
"repository": {

0 commit comments

Comments
 (0)