Skip to content

Commit e90e1c6

Browse files
chancancodechancancode
committed
Fix rendering of empty content with {{{...}}} in IE11
...or `{{...}}` with `htmlSafe('')` (cherry picked from commit d260f6f)
1 parent d752b94 commit e90e1c6

File tree

3 files changed

+92
-88
lines changed

3 files changed

+92
-88
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### v3.5.0-beta.4 (Unreleased)
44

5-
- [#17003](https://github.com/emberjs/ember.js/pull/17003) [BUGFIX] Fix rendering of empty content with `{{{...}}}` and `htmlSafe`
5+
- [#17003](https://github.com/emberjs/ember.js/pull/17003) / [#17013](https://github.com/emberjs/ember.js/pull/17013) [BUGFIX] Fix rendering of empty content with `{{{...}}}` or `{{...}}` with `htmlSafe('')`
66

77
### v3.5.0-beta.3 (September 24, 2018)
88

@@ -19,9 +19,13 @@
1919
- [#16877](https://github.com/emberjs/ember.js/pull/16877) [CLEANUP] Allow routes to be named "array" and "object"
2020
- [#16907](https://github.com/emberjs/ember.js/pull/16907) Upgrade to TypeScript 3.0
2121

22+
### v3.4.4 (September 27, 2018)
23+
24+
- [#17013](https://github.com/emberjs/ember.js/pull/17013) [BUGFIX] Fix rendering of empty content with `{{{...}}}` or `{{...}}` with `htmlSafe('')` in IE11
25+
2226
### v3.4.3 (September 25, 2018)
2327

24-
- [#17003](https://github.com/emberjs/ember.js/pull/17003) [BUGFIX] Fix rendering of empty content with `{{{...}}}` and `htmlSafe`
28+
- [#17003](https://github.com/emberjs/ember.js/pull/17003) [BUGFIX] Fix rendering of empty content with `{{{...}}}` or `{{...}}` with `htmlSafe('')`
2529

2630
### v3.4.2 (September 24, 2018)
2731

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@
6666
"resolve": "^1.6.0"
6767
},
6868
"devDependencies": {
69-
"@glimmer/compiler": "^0.35.9",
69+
"@glimmer/compiler": "^0.35.10",
7070
"@glimmer/env": "^0.1.7",
71-
"@glimmer/interfaces": "^0.35.9",
72-
"@glimmer/node": "^0.35.9",
73-
"@glimmer/opcode-compiler": "^0.35.9",
74-
"@glimmer/program": "^0.35.9",
75-
"@glimmer/reference": "^0.35.9",
76-
"@glimmer/runtime": "^0.35.9",
71+
"@glimmer/interfaces": "^0.35.10",
72+
"@glimmer/node": "^0.35.10",
73+
"@glimmer/opcode-compiler": "^0.35.10",
74+
"@glimmer/program": "^0.35.10",
75+
"@glimmer/reference": "^0.35.10",
76+
"@glimmer/runtime": "^0.35.10",
7777
"@types/qunit": "^2.5.0",
7878
"@types/rsvp": "^4.0.1",
7979
"amd-name-resolver": "^1.2.0",

‎yarn.lock‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -2,105 +2,105 @@
22
# yarn lockfile v1
33

44

5-
"@glimmer/compiler@^0.35.9":
6-
version "0.35.9"
7-
resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.35.9.tgz#3342f6249826258e1428e0566b21f64f878bce51"
5+
"@glimmer/compiler@^0.35.10":
6+
version "0.35.10"
7+
resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.35.10.tgz#ea830a984ced7fe68dd5e96f21127f76ad22c35c"
88
dependencies:
9-
"@glimmer/interfaces" "^0.35.9"
10-
"@glimmer/syntax" "^0.35.9"
11-
"@glimmer/util" "^0.35.9"
12-
"@glimmer/wire-format" "^0.35.9"
9+
"@glimmer/interfaces" "^0.35.10"
10+
"@glimmer/syntax" "^0.35.10"
11+
"@glimmer/util" "^0.35.10"
12+
"@glimmer/wire-format" "^0.35.10"
1313

14-
"@glimmer/encoder@^0.35.9":
15-
version "0.35.9"
16-
resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.35.9.tgz#4aff747cc62c334eba7ed8918ed86c70b2d4f606"
14+
"@glimmer/encoder@^0.35.10":
15+
version "0.35.10"
16+
resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.35.10.tgz#7f8643a1898ee5361dfb5b9878d19d55ec306bc3"
1717

1818
"@glimmer/env@^0.1.7":
1919
version "0.1.7"
2020
resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
2121

22-
"@glimmer/interfaces@^0.35.9":
23-
version "0.35.9"
24-
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.35.9.tgz#26b4fa0f2acfcab3b4309826068292a9e7a006df"
22+
"@glimmer/interfaces@^0.35.10":
23+
version "0.35.10"
24+
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.35.10.tgz#1ec18cf7bbcbe42547dd2e131b565a2f71234e3c"
2525
dependencies:
26-
"@glimmer/wire-format" "^0.35.9"
26+
"@glimmer/wire-format" "^0.35.10"
2727

28-
"@glimmer/low-level@^0.35.9":
29-
version "0.35.9"
30-
resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.35.9.tgz#9d2e755d39cbdc4161f0110ee55ba59d9245d342"
28+
"@glimmer/low-level@^0.35.10":
29+
version "0.35.10"
30+
resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.35.10.tgz#aca245e36b60f0891d1babe53f580986b38b1ec9"
3131

32-
"@glimmer/node@^0.35.9":
33-
version "0.35.9"
34-
resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.35.9.tgz#1a9cb7333eacd007bc1882b3d5d20e0e575864a5"
32+
"@glimmer/node@^0.35.10":
33+
version "0.35.10"
34+
resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.35.10.tgz#4aaede71958f23fc944f23043c1ad8b20fcc90a4"
3535
dependencies:
36-
"@glimmer/interfaces" "^0.35.9"
37-
"@glimmer/runtime" "^0.35.9"
36+
"@glimmer/interfaces" "^0.35.10"
37+
"@glimmer/runtime" "^0.35.10"
3838
simple-dom "^0.3.0"
3939

40-
"@glimmer/opcode-compiler@^0.35.9":
41-
version "0.35.9"
42-
resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.35.9.tgz#402c8618fc3c84650be8d91d25ab0b25da0177af"
43-
dependencies:
44-
"@glimmer/encoder" "^0.35.9"
45-
"@glimmer/interfaces" "^0.35.9"
46-
"@glimmer/program" "^0.35.9"
47-
"@glimmer/reference" "^0.35.9"
48-
"@glimmer/util" "^0.35.9"
49-
"@glimmer/vm" "^0.35.9"
50-
"@glimmer/wire-format" "^0.35.9"
51-
52-
"@glimmer/program@^0.35.9":
53-
version "0.35.9"
54-
resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.35.9.tgz#57ceda2c5f7b4df64f417880724afa3d321eecde"
55-
dependencies:
56-
"@glimmer/encoder" "^0.35.9"
57-
"@glimmer/interfaces" "^0.35.9"
58-
"@glimmer/util" "^0.35.9"
59-
60-
"@glimmer/reference@^0.35.9":
61-
version "0.35.9"
62-
resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.35.9.tgz#10e2ca42ef1b92ad195ce4d6b305bf256325fbb6"
63-
dependencies:
64-
"@glimmer/util" "^0.35.9"
65-
66-
"@glimmer/runtime@^0.35.9":
67-
version "0.35.9"
68-
resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.35.9.tgz#d2358046e9d13c983180ff79734ac5d0d39fe310"
69-
dependencies:
70-
"@glimmer/interfaces" "^0.35.9"
71-
"@glimmer/low-level" "^0.35.9"
72-
"@glimmer/program" "^0.35.9"
73-
"@glimmer/reference" "^0.35.9"
74-
"@glimmer/util" "^0.35.9"
75-
"@glimmer/vm" "^0.35.9"
76-
"@glimmer/wire-format" "^0.35.9"
77-
78-
"@glimmer/syntax@^0.35.9":
79-
version "0.35.9"
80-
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.35.9.tgz#9710e3418d60436ce368acb4d3e9c7802defa6ca"
81-
dependencies:
82-
"@glimmer/interfaces" "^0.35.9"
83-
"@glimmer/util" "^0.35.9"
40+
"@glimmer/opcode-compiler@^0.35.10":
41+
version "0.35.10"
42+
resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.35.10.tgz#ac86d7a98af7d64cb362d9bd00200257d65ecc95"
43+
dependencies:
44+
"@glimmer/encoder" "^0.35.10"
45+
"@glimmer/interfaces" "^0.35.10"
46+
"@glimmer/program" "^0.35.10"
47+
"@glimmer/reference" "^0.35.10"
48+
"@glimmer/util" "^0.35.10"
49+
"@glimmer/vm" "^0.35.10"
50+
"@glimmer/wire-format" "^0.35.10"
51+
52+
"@glimmer/program@^0.35.10":
53+
version "0.35.10"
54+
resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.35.10.tgz#2fda7954b0bb4df6e2e0038a36a820bda9f84e1c"
55+
dependencies:
56+
"@glimmer/encoder" "^0.35.10"
57+
"@glimmer/interfaces" "^0.35.10"
58+
"@glimmer/util" "^0.35.10"
59+
60+
"@glimmer/reference@^0.35.10":
61+
version "0.35.10"
62+
resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.35.10.tgz#663e5f825c9a75b78c40a0d85f93277193bebaec"
63+
dependencies:
64+
"@glimmer/util" "^0.35.10"
65+
66+
"@glimmer/runtime@^0.35.10":
67+
version "0.35.10"
68+
resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.35.10.tgz#a4085568dcdf65a3029386537d6683788c35f428"
69+
dependencies:
70+
"@glimmer/interfaces" "^0.35.10"
71+
"@glimmer/low-level" "^0.35.10"
72+
"@glimmer/program" "^0.35.10"
73+
"@glimmer/reference" "^0.35.10"
74+
"@glimmer/util" "^0.35.10"
75+
"@glimmer/vm" "^0.35.10"
76+
"@glimmer/wire-format" "^0.35.10"
77+
78+
"@glimmer/syntax@^0.35.10":
79+
version "0.35.10"
80+
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.35.10.tgz#8f50dfd841487c469ad5d94cd01b425a51a9ab32"
81+
dependencies:
82+
"@glimmer/interfaces" "^0.35.10"
83+
"@glimmer/util" "^0.35.10"
8484
handlebars "^4.0.6"
8585
simple-html-tokenizer "^0.5.5"
8686

87-
"@glimmer/util@^0.35.9":
88-
version "0.35.9"
89-
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.35.9.tgz#59e8bbfb2bb7a764d0098be49d083c200d113a61"
87+
"@glimmer/util@^0.35.10":
88+
version "0.35.10"
89+
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.35.10.tgz#2a25fa5c3d2b6114bbb07fd57c6e52abd9d088c3"
9090

91-
"@glimmer/vm@^0.35.9":
92-
version "0.35.9"
93-
resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.35.9.tgz#8c54c675a625384f7ff0539b47841d877acf6b9f"
91+
"@glimmer/vm@^0.35.10":
92+
version "0.35.10"
93+
resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.35.10.tgz#169bbceeee9cebb477090ac7b09b2ecee4c894a3"
9494
dependencies:
95-
"@glimmer/interfaces" "^0.35.9"
96-
"@glimmer/program" "^0.35.9"
97-
"@glimmer/util" "^0.35.9"
95+
"@glimmer/interfaces" "^0.35.10"
96+
"@glimmer/program" "^0.35.10"
97+
"@glimmer/util" "^0.35.10"
9898

99-
"@glimmer/wire-format@^0.35.9":
100-
version "0.35.9"
101-
resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.35.9.tgz#96f0c302583da3311303458ae9634b7fc72db9f4"
99+
"@glimmer/wire-format@^0.35.10":
100+
version "0.35.10"
101+
resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.35.10.tgz#8445d51923ccbc6a923d2a911f37c82cc390c2e6"
102102
dependencies:
103-
"@glimmer/util" "^0.35.9"
103+
"@glimmer/util" "^0.35.10"
104104

105105
"@types/acorn@^4.0.3":
106106
version "4.0.3"

0 commit comments

Comments
 (0)