Bug #825293 reorganized number of nodes & currentDisplayed comparision r=timdream

indent fix
Merge pull request #7286 from michalbe/non-selectable-card

Bug #825293 reorganized number of nodes & currentDisplayed comparision, r=timdream, a=blocking-basecamp
Auto-merge from branch 'master'