Skip to content

Commit f397ab4

Browse files
committed
Merge branch 'master' into angular-5.x
2 parents 6301772 + dce9fc8 commit f397ab4

File tree

9 files changed

+20
-18
lines changed

9 files changed

+20
-18
lines changed

samples/angular-cli-sample/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@angular/platform-browser": "^5.0.0",
2222
"@angular/platform-browser-dynamic": "^5.0.0",
2323
"@angular/router": "^5.0.0",
24-
"@cloudinary/angular-5.x": "^1.0.0",
24+
"@cloudinary/angular-5.x": "^1.0.1",
2525
"cloudinary-core": "^2.3.0",
2626
"core-js": "^2.4.1",
2727
"rxjs": "^5.5.2",

samples/angular-cli-sample/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@
156156
dependencies:
157157
tslib "^1.7.1"
158158

159-
"@cloudinary/angular-5.x@^1.0.0":
160-
version "1.0.0"
161-
resolved "https://registry.yarnpkg.com/@cloudinary/angular-5.x/-/angular-5.x-1.0.0.tgz#2f8c909235f8ccfb811f0ee7c7bc2c095aa0a831"
159+
"@cloudinary/angular-5.x@^1.0.1":
160+
version "1.0.1"
161+
resolved "https://registry.yarnpkg.com/@cloudinary/angular-5.x/-/angular-5.x-1.0.1.tgz#64ca4d1f516c780147c17e3d80d281299c0af79c"
162162

163163
"@ngtools/json-schema@1.1.0", "@ngtools/json-schema@^1.1.0":
164164
version "1.1.0"

samples/angular-universal-sample/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@angular/platform-browser-dynamic": "^5.0.0",
2929
"@angular/platform-server": "^5.0.3",
3030
"@angular/router": "^5.0.0",
31-
"@cloudinary/angular-5.x": "^1.0.0",
31+
"@cloudinary/angular-5.x": "^1.0.1",
3232
"@nguniversal/module-map-ngfactory-loader": "^5.0.0-beta.5",
3333
"cloudinary-core": "^2.3.0",
3434
"core-js": "^2.4.1",

samples/angular-universal-sample/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@
165165
dependencies:
166166
tslib "^1.7.1"
167167

168-
"@cloudinary/angular-5.x@^1.0.0":
169-
version "1.0.0"
170-
resolved "https://registry.yarnpkg.com/@cloudinary/angular-5.x/-/angular-5.x-1.0.0.tgz#2f8c909235f8ccfb811f0ee7c7bc2c095aa0a831"
168+
"@cloudinary/angular-5.x@^1.0.1":
169+
version "1.0.1"
170+
resolved "https://registry.yarnpkg.com/@cloudinary/angular-5.x/-/angular-5.x-1.0.1.tgz#64ca4d1f516c780147c17e3d80d281299c0af79c"
171171

172172
"@ngtools/json-schema@1.1.0", "@ngtools/json-schema@^1.1.0":
173173
version "1.1.0"

samples/photo_album/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@angular/platform-browser-dynamic": "^5.0.1",
1717
"@angular/platform-server": "^5.0.1",
1818
"@angular/router": "^5.0.1",
19-
"@cloudinary/angular-5.x": "^1.0.0",
19+
"@cloudinary/angular-5.x": "^1.0.1",
2020
"cloudinary-core": "^2.3.0",
2121
"core-js": "^2.5.1",
2222
"ng2-file-upload": "^1.2.0",

samples/photo_album/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@
7373
dependencies:
7474
tslib "^1.7.1"
7575

76-
"@cloudinary/angular-5.x@^1.0.0":
77-
version "1.0.0"
78-
resolved "https://registry.yarnpkg.com/@cloudinary/angular-5.x/-/angular-5.x-1.0.0.tgz#2f8c909235f8ccfb811f0ee7c7bc2c095aa0a831"
76+
"@cloudinary/angular-5.x@^1.0.1":
77+
version "1.0.1"
78+
resolved "https://registry.yarnpkg.com/@cloudinary/angular-5.x/-/angular-5.x-1.0.1.tgz#64ca4d1f516c780147c17e3d80d281299c0af79c"
7979

8080
"@types/node@8.0.51":
8181
version "8.0.51"

samples/photo_album_with_jquery/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@angular/platform-browser-dynamic": "^5.0.0",
1717
"@angular/platform-server": "^5.0.0",
1818
"@angular/router": "^5.0.0",
19-
"@cloudinary/angular-5.x": "^1.0.0",
19+
"@cloudinary/angular-5.x": "^1.0.1",
2020
"blueimp-file-upload": "^9.11.2",
2121
"cloudinary-jquery-file-upload": "^2.3.0",
2222
"core-js": "^2.4.1",

samples/photo_album_with_jquery/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@
7373
dependencies:
7474
tslib "^1.7.1"
7575

76-
"@cloudinary/angular-5.x@^1.0.0":
77-
version "1.0.0"
78-
resolved "https://registry.yarnpkg.com/@cloudinary/angular-5.x/-/angular-5.x-1.0.0.tgz#2f8c909235f8ccfb811f0ee7c7bc2c095aa0a831"
76+
"@cloudinary/angular-5.x@^1.0.1":
77+
version "1.0.1"
78+
resolved "https://registry.yarnpkg.com/@cloudinary/angular-5.x/-/angular-5.x-1.0.1.tgz#64ca4d1f516c780147c17e3d80d281299c0af79c"
7979

8080
"@types/jquery@^2.0.34":
8181
version "2.0.48"

src/cloudinary-image.component.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ describe('CloudinaryImage', () => {
102102
<cl-transformation width="300" crop="scale" overlay="text:roboto_35_bold:SDK"></cl-transformation>
103103
<cl-transformation effect="art:hokusai"></cl-transformation>
104104
<cl-transformation fetch-format="auto"></cl-transformation>
105+
<cl-transformation if="initialWidth > 400" effect="grayscale"></cl-transformation>
106+
<cl-transformation if="initialHeight < 200" effect="blur"></cl-transformation>
105107
</cl-image>`
106108
})
107109
class TestComponent { }
@@ -124,7 +126,7 @@ describe('CloudinaryImage', () => {
124126
it('creates an img element which encodes the directive attributes to the URL', () => {
125127
const img = des.children[0].nativeElement as HTMLImageElement;
126128
expect(img.src).toEqual(jasmine.stringMatching
127-
(/c_scale,l_text:roboto_35_bold:SDK,w_300\/e_art:hokusai\/f_auto\/responsive_sample.jpg/));
129+
(/c_scale,l_text:roboto_35_bold:SDK,w_300\/e_art:hokusai\/f_auto\/if_iw_gt_400,e_grayscale\/if_ih_lt_200,e_blur\/responsive_sample.jpg/));
128130
expect(img.attributes.getNamedItem('data-src')).toBeNull();
129131
});
130132

@@ -135,7 +137,7 @@ describe('CloudinaryImage', () => {
135137
const observer = new MutationObserver(() => {
136138
const img = des.children[0].nativeElement as HTMLImageElement;
137139
expect(img.src).toEqual(jasmine.stringMatching
138-
(/c_scale,l_text:roboto_35_bold:SDK,w_300\/e_art:hokusai\/f_auto\/o_50\/responsive_sample.jpg/));
140+
(/c_scale,l_text:roboto_35_bold:SDK,w_300\/e_art:hokusai\/f_auto\/if_iw_gt_400,e_grayscale\/if_ih_lt_200,e_blur\/o_50\/responsive_sample.jpg/));
139141
observer.disconnect();
140142
done();
141143
});

0 commit comments

Comments
 (0)