Fix Rocket.Chat.Cordova issue #15.

RocketChat · Nov 25, 2015 · df525d6 · df525d6
1 parent d63f019
commit df525d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/rocketchat-lib/client/lib/openRoom.coffee b/packages/rocketchat-lib/client/lib/openRoom.coffee
@@ -36,6 +36,7 @@ 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

diff --git a/packages/rocketchat-ui/views/app/room.html b/packages/rocketchat-ui/views/app/room.html
@@ -81,8 +81,10 @@ <h2>
 				{{> messageBox}}
 			</footer>
 		</section>
-		<section class="flex-tab">
-			{{> Template.dynamic template=flexTemplate data=flexData}}
-		</section>
+		{{#if flexTemplate}}
+			<section class="flex-tab">
+				{{> Template.dynamic template=flexTemplate data=flexData}}
+			</section>
+		{{/if}}
 	</div>
-</template>
+</template>