From 7ccfbe9bc8591357d87ed1a06a14f3480c8ab99e Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Fri, 16 Sep 2016 14:15:08 -0300 Subject: [PATCH] Use embedded instead of mini --- client/routes/router.coffee | 2 +- packages/rocketchat-lib/client/lib/Layout.js | 11 +++++++++++ packages/rocketchat-lib/client/lib/openRoom.coffee | 2 +- packages/rocketchat-lib/package.js | 1 + .../rocketchat-theme/assets/stylesheets/base.less | 2 +- packages/rocketchat-ui-master/master/main.coffee | 6 +++--- packages/rocketchat-ui-master/master/main.html | 2 +- packages/rocketchat-ui/lib/chatMessages.coffee | 2 +- packages/rocketchat-ui/views/app/room.coffee | 10 +++++----- packages/rocketchat-ui/views/app/room.html | 2 +- 10 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 packages/rocketchat-lib/client/lib/Layout.js diff --git a/client/routes/router.coffee b/client/routes/router.coffee index 500cf45194c..7bf11499af4 100644 --- a/client/routes/router.coffee +++ b/client/routes/router.coffee @@ -14,7 +14,7 @@ FlowRouter.route '/', name: 'index' action: -> - BlazeLayout.render 'main', { modal: !!FlowRouter.getQueryParam('mini'), center: 'loading' } + BlazeLayout.render 'main', { modal: RocketChat.Layout.isEmbedded(), center: 'loading' } if not Meteor.userId() return FlowRouter.go 'home' diff --git a/packages/rocketchat-lib/client/lib/Layout.js b/packages/rocketchat-lib/client/lib/Layout.js new file mode 100644 index 00000000000..3e231a4d866 --- /dev/null +++ b/packages/rocketchat-lib/client/lib/Layout.js @@ -0,0 +1,11 @@ +RocketChat.Layout = new (class RocketChatLayout { + constructor() { + Tracker.autorun(() => { + this.layout = FlowRouter.getQueryParam('layout'); + }); + } + + isEmbedded() { + return this.layout === 'embedded'; + } +}); diff --git a/packages/rocketchat-lib/client/lib/openRoom.coffee b/packages/rocketchat-lib/client/lib/openRoom.coffee index 2eff0926fed..9d37874376d 100644 --- a/packages/rocketchat-lib/client/lib/openRoom.coffee +++ b/packages/rocketchat-lib/client/lib/openRoom.coffee @@ -6,7 +6,7 @@ currentTracker = undefined Meteor.defer -> currentTracker = Tracker.autorun (c) -> if RoomManager.open(type + name).ready() isnt true - BlazeLayout.render 'main', { modal: !!FlowRouter.getQueryParam('mini'), center: 'loading' } + BlazeLayout.render 'main', { modal: RocketChat.Layout.isEmbedded(), center: 'loading' } return user = Meteor.user() diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js index bd44f269ff2..d51429a1a8d 100644 --- a/packages/rocketchat-lib/package.js +++ b/packages/rocketchat-lib/package.js @@ -149,6 +149,7 @@ Package.onUse(function(api) { api.addFiles('client/lib/settings.coffee', 'client'); api.addFiles('client/lib/roomTypes.coffee', 'client'); api.addFiles('client/lib/userRoles.js', 'client'); + api.addFiles('client/lib/Layout.js', 'client'); // CLIENT METHODS api.addFiles('client/methods/sendMessage.coffee', 'client'); diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less index 724dda4c13b..8a3b8dcae29 100644 --- a/packages/rocketchat-theme/assets/stylesheets/base.less +++ b/packages/rocketchat-theme/assets/stylesheets/base.less @@ -4636,7 +4636,7 @@ a + br.only-after-a { } } -.mini-view { +.embedded-view { .main-content.main-modal { right: 0; } diff --git a/packages/rocketchat-ui-master/master/main.coffee b/packages/rocketchat-ui-master/master/main.coffee index 063cdbd9c50..c15aae04905 100644 --- a/packages/rocketchat-ui-master/master/main.coffee +++ b/packages/rocketchat-ui-master/master/main.coffee @@ -35,7 +35,7 @@ Template.body.onRendered -> e.preventDefault() e.stopPropagation() - if FlowRouter.getQueryParam('mini') + if RocketChat.Layout.isEmbedded() fireGlobalEvent('click-message-link', { link: link.pathname + link.search }) return window.open(link.pathname + link.search) @@ -173,8 +173,8 @@ Template.main.helpers CustomScriptLoggedIn: -> RocketChat.settings.get 'Custom_Script_Logged_In' - miniVersion: -> - return 'mini-view' if FlowRouter.getQueryParam('mini') + embeddedVersion: -> + return 'embedded-view' if RocketChat.Layout.isEmbedded() Template.main.events diff --git a/packages/rocketchat-ui-master/master/main.html b/packages/rocketchat-ui-master/master/main.html index 7132d3e8636..3c6b8f03dd2 100644 --- a/packages/rocketchat-ui-master/master/main.html +++ b/packages/rocketchat-ui-master/master/main.html @@ -64,7 +64,7 @@ {{> spotlight}} {{> videoCall overlay=true}}
-
- {{#unless miniVersion}} + {{#unless embeddedVersion}}
{{> burger}}