3.7 regression: Fix the width of captioned images inserted into the visual editor.

Pulls some arithmetic outside of some string concatenation to avoid a nasty uglify.js regression: https://github.com/mishoo/UglifyJS2/pull/330.

Merges [25921] to the 3.7 branch.

props LucP.
fixes #25700.

Built from https://develop.svn.wordpress.org/branches/3.7@25922


git-svn-id: http://core.svn.wordpress.org/branches/3.7@25881 1a063a9b-81f0-0310-95a4-ce76da25c4cd