Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Bugfix. Move to a different TextEncoder/Decoder #4613

Merged
merged 2 commits into from
Sep 12, 2018
Merged

UI: Bugfix. Move to a different TextEncoder/Decoder #4613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fd8d57
UI: Bugfix. Move to a different TextEncoder/Decoder
Aug 29, 2018
2b95344
ui: Comment cleanup
Sep 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ui-v2/app/utils/atob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import TextEncoderLite from 'npm:text-encoder-lite';
import TextEncoding from 'npm:text-encoding';
import base64js from 'npm:base64-js';
export default function(str, encoding = 'utf-8') {
// str = String(str).trim();
//decode
// decode
const bytes = base64js.toByteArray(str);
return new (TextDecoder || TextEncoderLite)(encoding).decode(bytes);
return new ('TextDecoder' in window ? TextDecoder : TextEncoding.TextDecoder)(encoding).decode(
bytes
);
}
4 changes: 2 additions & 2 deletions ui-v2/app/utils/btoa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import TextEncoderLite from 'npm:text-encoder-lite';
import TextEncoding from 'npm:text-encoding';
import base64js from 'npm:base64-js';
export default function(str, encoding = 'utf-8') {
// encode
const bytes = new (TextEncoder || TextEncoderLite)(encoding).encode(str);
const bytes = new ('TextEncoder' in window ? TextEncoder : TextEncoding.TextEncoder)(encoding).encode(str);
return base64js.fromByteArray(bytes);
}
2 changes: 1 addition & 1 deletion ui-v2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"loader.js": "^4.2.3",
"prettier": "^1.10.2",
"svgo": "^1.0.5",
"text-encoder-lite": "^1.0.1"
"text-encoding": "^0.6.4"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
Expand Down
4 changes: 0 additions & 4 deletions ui-v2/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8926,10 +8926,6 @@ testem@^2.0.0:
tap-parser "^5.1.0"
xmldom "^0.1.19"

text-encoder-lite@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/text-encoder-lite/-/text-encoder-lite-1.0.1.tgz#121c5ee74dfeb307037770ec75748c6824ac0518"

text-encoding@0.6.4, text-encoding@^0.6.4:
version "0.6.4"
resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
Expand Down