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

Jump to bottom

Display error/warning for too large input #72 #168

Merged
merged 24 commits into from
Mar 22, 2019
Merged

Display error/warning for too large input #72 #168

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
47c0081
err msg for qr code that are too long
ongspxm Mar 7, 2019
8f250b3
rethrowing error
ongspxm Mar 7, 2019
6a5ec8c
make kjua throw the same kind of error
ongspxm Mar 8, 2019
26e2503
shift err messags to localized form
ongspxm Mar 8, 2019
342c5f3
Update src/_locales/en/messages.json
rugk Mar 10, 2019
99c99a1
make error non dismissable
ongspxm Mar 10, 2019
6afc6f1
wip. adding err
ongspxm Mar 11, 2019
2c85bab
using qrError
ongspxm Mar 11, 2019
b18ce75
indentation
ongspxm Mar 11, 2019
d33af1a
updated naming system
ongspxm Mar 11, 2019
455f1e0
Merge remote-tracking branch 'upstream/master' into toolong
ongspxm Mar 12, 2019
62deaac
Merge branch 'master' into toolong
ongspxm Mar 18, 2019
e1b537e
updated kjua lib
ongspxm Mar 18, 2019
ad4396d
Update src/popup/modules/UserInterface.js
rugk Mar 18, 2019
67513dc
eslint
ongspxm Mar 18, 2019
0e49fbe
Merge branch 'toolong' of github.com:ongspxm/offline-qr-code into too…
ongspxm Mar 18, 2019
a594aab
Change file name of kjua lib
rugk Mar 19, 2019
d283ee3
Update src/popup/modules/QrLib/QrError.js
rugk Mar 19, 2019
0df9d0a
update error
ongspxm Mar 19, 2019
76399a7
Update src/_locales/en/messages.json
rugk Mar 20, 2019
45731be
Update src/popup/modules/UserInterface.js
rugk Mar 20, 2019
95c87dc
update code style
ongspxm Mar 20, 2019
f0123fd
Merge branch 'toolong' of github.com:ongspxm/offline-qr-code into too…
ongspxm Mar 20, 2019
f91faad
Update src/popup/modules/QrLib/QrError.js
rugk Mar 20, 2019
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
11 changes: 9 additions & 2 deletions src/popup/modules/UserInterface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,15 @@ const refreshQrCode = throttle(() => {
CommonMessages.hideError();
}

QrCreator.setTextInternal(text);
QrCreator.generate();
try {
QrCreator.setTextInternal(text);
QrCreator.generate();
} catch (e) {
if (e === "Data too long") {
rugk marked this conversation as resolved.
Show resolved Hide resolved
CommonMessages.showError("Cannot generate Qr Code, data size too big.");
ongspxm marked this conversation as resolved.
Show resolved Hide resolved
Logger.logError("Data exceeds maximum size:", text.length);
ongspxm marked this conversation as resolved.
Show resolved Hide resolved
}
rugk marked this conversation as resolved.
Show resolved Hide resolved
}
}, QR_CODE_REFRESH_TIMEOUT);

/**
Expand Down