fix eslint ternary operator error

[nkovacs]

eslint's operator-linebreak rule now supports the ternary operator (eslint/eslint#3274).

Changed the rule to match the code, and fixed the single instance
in the code that was different.

[nkovacs]

I don't know what's going on on circleci, it installed eslint 1.3.1, which supports this, and it works on my computer with eslint 1.3.1 (which is how I ran into this issue in the first place).

[yyx990803]

It's a bit tricky here because the build setup currently uses grunt-eslint which depends on eslint ^1.1.0. So if we update the root eslint to 1.3.1, npm will install a separate copy of eslint under grunt-eslint.

I will likely update the build setup to get rid of grunt-eslint later, but for now let's stay away from altering the build setup to avoid rebase headaches from the alpha/beta branches. Thanks for raising the issue.

[nkovacs]

Won't grunt-eslint's ^1.1.0 install 1.3.1 though? it did that on my computer.

[yyx990803]

Ha, looks like it's because CircleCI used a cached version of eslint.