Skip to content

Make managers aware of artwork overwrite property #368

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

Merged
merged 3 commits into from
Dec 16, 2020
Merged

Make managers aware of artwork overwrite property #368

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddca25e
Make managers aware of artwork overwrite property
crokita Dec 15, 2020
5bfa293
Apply suggestions from code review
crokita Dec 16, 2020
cf0eed9
Update lib/js/src/manager/screen/_SoftButtonManagerBase.js
crokita Dec 16, 2020
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
Prev Previous commit
Update lib/js/src/manager/screen/_SoftButtonManagerBase.js 
Co-authored-by: renonick87 <[email protected]>
  • Loading branch information
@crokita @renonick87
crokita and renonick87 authored Dec 16, 2020
commit cf0eed97e87a963fe15c575c23862f8d83204eb9
4 changes: 2 additions & 2 deletions lib/js/src/manager/screen/_SoftButtonManagerBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ class _SoftButtonManagerBase extends _SubManagerBase {
}
if (initialState !== null && Array.isArray(softButtonObject.getStates())) {
for (const softButtonState of softButtonObject.getStates()) {
if (softButtonState !== null && softButtonState.getName() !== null &&
this._fileManager !== null && this._fileManager !== undefined &&
if (softButtonState !== null && softButtonState.getName() !== null &&
this._fileManager !== null && this._fileManager !== undefined &&
this._fileManager.fileNeedsUpload(softButtonState.getArtwork()) && this._softButtonImagesSupported()) {
if (softButtonState.getName() === initialState.getName()) {
initialStatesToBeUploaded.push(softButtonObject.getCurrentState().getArtwork());
Expand Down