fix($uploader.basic): Fix merge conflict with lint

A merge conflict between 1a9ee7fa059bc047073f52610a77b8dc52d4acea and
i831c786ad475f4c99642366c16f4ae9aa0b0620e resulted in a lot of changes
accidentally lost. Those changes (revolving around image validation)
are resolved here.