use data- prefix, fix width and height

width and height changed to data-width and data-height

width and height now saved for each span

probably needs testing for srcDefault