Logical order fixes

I made some fixes with ternary operator with or which are connected with this issue https://github.com/wenzhixin/bootstrap-table/issues/316 and also with previous https://github.com/wenzhixin/bootstrap-table/issues/314