Skip to content

Commit

Permalink
Revert "Fix Rocket.Chat.Cordova issue #15."
Browse files Browse the repository at this point in the history
This reverts commit df525d6.
  • Loading branch information
marceloschmidt committed Nov 26, 2015
1 parent 1ed9834 commit 432fb74
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
1 change: 0 additions & 1 deletion packages/rocketchat-lib/client/lib/openRoom.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ currentTracker = undefined
if roomDom.classList.contains('room-container')
roomDom.querySelector('.messages-box > .wrapper').scrollTop = roomDom.oldScrollTop

RocketChat.TabBar.setTemplate ''
Session.set 'openedRoom', room._id

Session.set 'editRoomTitle', false
Expand Down
10 changes: 4 additions & 6 deletions packages/rocketchat-ui/views/app/room.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,8 @@ <h2>
{{> messageBox}}
</footer>
</section>
{{#if flexTemplate}}
<section class="flex-tab">
{{> Template.dynamic template=flexTemplate data=flexData}}
</section>
{{/if}}
<section class="flex-tab">
{{> Template.dynamic template=flexTemplate data=flexData}}
</section>
</div>
</template>
</template>

0 comments on commit 432fb74

Please sign in to comment.