Merge pull request #8190 from RocketChat/scroll

[FIX] Scrollbar not using new style
RocketChat · Sep 20, 2017 · 62aad03 · 62aad03
2 parents 9fc4540 + 2ea5466
commit 62aad03
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 10 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -176,3 +176,4 @@ yasinuslu:blaze-meta
 deepwell:bootstrap-datepicker2
 rocketchat:postcss
 [email protected]
+keepnox:perfect-scrollbar
diff --git a/.meteor/versions b/.meteor/versions
@@ -63,6 +63,7 @@ jparker:[email protected]
 [email protected]
 kadira:[email protected]
 kadira:[email protected]
+keepnox:[email protected]
 konecty:[email protected]
 konecty:[email protected]
 konecty:[email protected]_3

diff --git a/packages/rocketchat-lib/client/lib/settings.js b/packages/rocketchat-lib/client/lib/settings.js
@@ -60,7 +60,7 @@ Meteor.startup(function() {
 		}
 		Meteor.setTimeout(function() {
 			const currentUrl = location.origin + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
-			if (__meteor_runtime_config__.ROOT_URL !== currentUrl) {
+			if (__meteor_runtime_config__.ROOT_URL.replace(/\/$/, '') !== currentUrl) {
 				swal({
 					type: 'warning',
 					title: t('Warning'),

diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -1,7 +1,7 @@
 .message-actions {
 	position: absolute;
 	top: 2px;
-	right: 2px;
+	right: 0.4rem;
 
 	display: none;
 

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -1,6 +1,7 @@
 
 
 .rooms-list {
+	position: relative;
 	overflow-y: scroll;
 
 	height: 100%;

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -9,7 +9,7 @@
 
 	height: var(--sidebar-item-height);
 
-	margin: 0 0 0 8px;
+	margin: 0 8px;
 
 	padding: 0 calc(var(--sidebar-default-padding) - 8px);
 

diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
@@ -109,3 +109,11 @@ button {
 
 	vertical-align: -0.15em;
 }
+
+.ps-scrollbar-y-rail {
+	background: transparent !important;
+}
+
+.ps-scrollbar-y {
+	width: 4px !important;
+}
diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js
@@ -4,6 +4,10 @@ Template.accountFlex.events({
 	}
 });
 
+Template.accountFlex.onRendered(function() {
+	$(this.find('.rooms-list')).perfectScrollbar();
+});
+
 Template.accountFlex.helpers({
 	allowUserProfileChange() {
 		return RocketChat.settings.get('Accounts_AllowUserProfileChange');

diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js
@@ -14,6 +14,10 @@ const label = function() {
 	return TAPi18n.__(this.i18nLabel || this._id);
 };
 
+Template.adminFlex.onRendered(function() {
+	$(this.find('.rooms-list')).perfectScrollbar();
+});
+
 Template.adminFlex.helpers({
 	groups() {
 		const filter = Template.instance().settingsFilter.get();

diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
@@ -367,9 +367,11 @@ Template.message.onViewRendered = function(context) {
 			if (!templateInstance) {
 				return;
 			}
+
 			if (currentNode.classList.contains('own') === true) {
-				return (templateInstance.atBottom = true);
+				templateInstance.atBottom = true;
 			}
+			templateInstance.sendToBottomIfNecessary();
 		}
 	});
 };
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
@@ -364,9 +364,9 @@ Template.messageBox.events({
 			// fixes https://github.com/RocketChat/Rocket.Chat/issues/3037
 			// at this point, the input is cleared and ready for autogrow
 			input.updateAutogrow();
-			return instance.isMessageFieldEmpty.set(chatMessages[this._id].isEmpty());
+			instance.isMessageFieldEmpty.set(chatMessages[this._id].isEmpty());
+			return input.focus();
 		});
-		return input.focus();
 	},
 	'keyup .js-input-message'(event, instance) {
 		chatMessages[this._id].keyup(this._id, event, instance);

diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js
@@ -76,6 +76,10 @@ Template.roomList.helpers({
 	}
 });
 
+Template.roomList.onRendered(function() {
+	$(this.firstNode.parentElement).perfectScrollbar();
+});
+
 Template.roomList.events({
 	'click .more'(e, t) {
 		if (t.data.identifier === 'p') {

diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
@@ -800,6 +800,7 @@ Template.room.onDestroyed(function() {
 });
 
 Template.room.onRendered(function() {
+	$(this.find('.messages-box .wrapper')).perfectScrollbar();
 	const rid = Session.get('openedRoom');
 	if (!window.chatMessages[rid]) {
 		window.chatMessages[rid] = new ChatMessages;
@@ -816,8 +817,10 @@ Template.room.onRendered(function() {
 	const messageBox = $('.messages-box');
 
 	template.isAtBottom = function(scrollThreshold) {
-		if ((scrollThreshold == null)) { scrollThreshold = 0; }
-		if ((wrapper.scrollTop + scrollThreshold) >= (wrapper.scrollHeight - wrapper.clientHeight)) {
+		if (scrollThreshold == null) {
+			scrollThreshold = 0;
+		}
+		if (wrapper.scrollTop + scrollThreshold >= wrapper.scrollHeight - wrapper.clientHeight) {
 			newMessage.className = 'new-message background-primary-action-color color-content-background-color not';
 			return true;
 		}
@@ -836,8 +839,7 @@ Template.room.onRendered(function() {
 	};
 
 	template.sendToBottomIfNecessary = function() {
-
-		if ((template.atBottom === true) && (template.isAtBottom() !== true)) {
+		if (template.atBottom === true && template.isAtBottom() !== true) {
 			return template.sendToBottom();
 		}
 	};

diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
@@ -414,8 +414,10 @@ describe('[Administration]', () => {
 
 		describe('[General Settings]', () => {
 			before(() => {
+				admin.settingsSearch.setValue('general');
 				admin.generalLink.waitForVisible(5000);
 				admin.generalLink.click();
+				admin.settingsSearch.setValue('');
 				admin.generalSiteUrl.waitForVisible(5000);
 			});
 

diff --git a/tests/pageobjects/administration.page.js b/tests/pageobjects/administration.page.js
@@ -3,6 +3,7 @@ import Page from './Page';
 class Administration extends Page {
 	get flexNav() { return browser.element('.flex-nav'); }
 	get flexNavContent() { return browser.element('.flex-nav'); }
+	get settingsSearch() { return browser.element('[name=settings-search]'); }
 	get layoutLink() { return browser.element('.flex-nav [href="/admin/Layout"]'); }
 	get infoLink() { return browser.element('.flex-nav [href="/admin/info"]'); }
 	get roomsLink() { return browser.element('.flex-nav [href="/admin/rooms"]'); }