|
1 | 1 |
|
2 | 2 | /**
|
3 |
| - * Cloudinary's JavaScript library - Version 2.1.7 |
| 3 | + * Cloudinary's JavaScript library - Version 2.1.8 |
4 | 4 | * Copyright Cloudinary
|
5 | 5 | * see https://github.com/cloudinary/cloudinary_js
|
6 | 6 | *
|
@@ -342,7 +342,7 @@ var slice = [].slice,
|
342 | 342 | /**
|
343 | 343 | * @class Util
|
344 | 344 | */
|
345 |
| - Util = $.extend(BaseUtil, { |
| 345 | + Util = jQuery.extend(BaseUtil, { |
346 | 346 | hasClass: hasClass,
|
347 | 347 | addClass: addClass,
|
348 | 348 | getAttribute: getAttribute,
|
@@ -1469,22 +1469,38 @@ var slice = [].slice,
|
1469 | 1469 | */
|
1470 | 1470 |
|
1471 | 1471 | Configuration.prototype.fromEnvironment = function() {
|
1472 |
| - var cloudinary_url, k, ref1, ref2, uri, v; |
| 1472 | + var cloudinary_url, j, k, len, query, ref1, ref2, ref3, uri, uriRegex, v, value; |
1473 | 1473 | cloudinary_url = typeof process !== "undefined" && process !== null ? (ref1 = process.env) != null ? ref1.CLOUDINARY_URL : void 0 : void 0;
|
1474 | 1474 | if (cloudinary_url != null) {
|
1475 |
| - uri = require('url').parse(cloudinary_url, true); |
1476 |
| - this.configuration = { |
1477 |
| - cloud_name: uri.host, |
1478 |
| - api_key: uri.auth && uri.auth.split(":")[0], |
1479 |
| - api_secret: uri.auth && uri.auth.split(":")[1], |
1480 |
| - private_cdn: uri.pathname != null, |
1481 |
| - secure_distribution: uri.pathname && uri.pathname.substring(1) |
1482 |
| - }; |
1483 |
| - if (uri.query != null) { |
1484 |
| - ref2 = uri.query; |
1485 |
| - for (k in ref2) { |
1486 |
| - v = ref2[k]; |
1487 |
| - this.configuration[k] = v; |
| 1475 | + uriRegex = /cloudinary:\/\/(?:(\w+)(?:\:(\w+))?@)?([\w\.-]+)(?:\/([^?]*))?(?:\?(.+))?/; |
| 1476 | + uri = uriRegex.exec(cloudinary_url); |
| 1477 | + if (uri) { |
| 1478 | + if (uri[3] != null) { |
| 1479 | + this.configuration['cloud_name'] = uri[3]; |
| 1480 | + } |
| 1481 | + if (uri[1] != null) { |
| 1482 | + this.configuration['api_key'] = uri[1]; |
| 1483 | + } |
| 1484 | + if (uri[2] != null) { |
| 1485 | + this.configuration['api_secret'] = uri[2]; |
| 1486 | + } |
| 1487 | + if (uri[4] != null) { |
| 1488 | + this.configuration['private_cdn'] = uri[4] != null; |
| 1489 | + } |
| 1490 | + if (uri[4] != null) { |
| 1491 | + this.configuration['secure_distribution'] = uri[4]; |
| 1492 | + } |
| 1493 | + query = uri[5]; |
| 1494 | + if (query != null) { |
| 1495 | + ref2 = query.split('&'); |
| 1496 | + for (j = 0, len = ref2.length; j < len; j++) { |
| 1497 | + value = ref2[j]; |
| 1498 | + ref3 = value.split('='), k = ref3[0], v = ref3[1]; |
| 1499 | + if (v == null) { |
| 1500 | + v = true; |
| 1501 | + } |
| 1502 | + this.configuration[k] = v; |
| 1503 | + } |
1488 | 1504 | }
|
1489 | 1505 | }
|
1490 | 1506 | }
|
@@ -2897,7 +2913,7 @@ var slice = [].slice,
|
2897 | 2913 | Cloudinary = (function() {
|
2898 | 2914 | 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;
|
2899 | 2915 |
|
2900 |
| - VERSION = "2.1.7"; |
| 2916 | + VERSION = "2.1.8"; |
2901 | 2917 |
|
2902 | 2918 | CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
|
2903 | 2919 |
|
@@ -4132,7 +4148,7 @@ var slice = [].slice,
|
4132 | 4148 | TextLayer: TextLayer,
|
4133 | 4149 | SubtitlesLayer: SubtitlesLayer,
|
4134 | 4150 | Cloudinary: Cloudinary,
|
4135 |
| - VERSION: "2.1.7", |
| 4151 | + VERSION: "2.1.8", |
4136 | 4152 | CloudinaryJQuery: CloudinaryJQuery
|
4137 | 4153 | };
|
4138 | 4154 | return cloudinary;
|
|
0 commit comments