Minimal code changes

RocketChat · Sep 27, 2018 · e406332 · e406332
1 parent c7eb0b8
commit e406332
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 14 deletions.
diff --git a/packages/rocketchat-file-upload/ufs/Webdav/server.js b/packages/rocketchat-file-upload/ufs/Webdav/server.js
@@ -12,7 +12,6 @@ export class WebdavStore extends UploadFS.Store {
 
 		super(options);
 
-
 		const client = new Webdav(
 			options.connection.credentials.server,
 			options.connection.credentials.username,
@@ -127,7 +126,6 @@ export class WebdavStore extends UploadFS.Store {
 			writeStream.pipe(webdavStream);
 			return writeStream;
 		};
-
 	}
 }
 

diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/packages/rocketchat-ui-account/client/accountFlex.html
@@ -18,13 +18,11 @@ <h1 class="sidebar-flex__title">{{_ "My_Account"}}</h1>
 
 				{{> sidebarItem menuItem "Security" "lock" "account" "security" }}
 
-
 				{{> sidebarItem menuItem "Integrations" "code" "account" "integrations" }}
 
 				{{#if accessTokensEnabled}}
 					{{> sidebarItem menuItem "Personal_Access_Tokens" "key" "account" "tokens" }}
 				{{/if}}
-
 			</ul>
 		</div>
 	</aside>

diff --git a/packages/rocketchat-ui-account/package.js b/packages/rocketchat-ui-account/package.js
@@ -24,7 +24,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/accountIntegrations.html', 'client');
 	api.addFiles('client/accountPreferences.html', 'client');
 	api.addFiles('client/accountProfile.html', 'client');
-
 	api.addFiles('client/avatar/avatar.html', 'client');
 	api.addFiles('client/avatar/prompt.html', 'client');
 

diff --git a/packages/rocketchat-webdav/client/actionButton.js b/packages/rocketchat-webdav/client/actionButton.js
@@ -23,7 +23,7 @@ Meteor.startup(function() {
 			const [, message] = this._arguments;
 			const [attachment] = message.attachments;
 			const { file } = message;
-			const url = Meteor.absoluteUrl().concat(attachment.title_link.substring(1));
+			const url = RocketChat.getURL(attachment.title_link, { full: true });
 			modal.open({
 				data: {
 					message,

diff --git a/packages/rocketchat-webdav/client/addWebdavAccount.js b/packages/rocketchat-webdav/client/addWebdavAccount.js
@@ -58,7 +58,7 @@ const validate = function() {
 	}
 	Object.entries(validationObj).forEach(([key, value]) => {
 		form.find(`input[name=${ key }], select[name=${ key }]`).addClass('error');
-		form.find(` input[name=${ key }]~.input-error, select[name=${ key }]~.input-error`).text(value);
+		form.find(`input[name=${ key }]~.input-error, select[name=${ key }]~.input-error`).text(value);
 	});
 	this.loading.set(false);
 	return false;

diff --git a/packages/rocketchat-webdav/client/selectWebdavAccount.js b/packages/rocketchat-webdav/client/selectWebdavAccount.js
@@ -30,7 +30,7 @@ Template.selectWebdavAccount.events({
 					if (!response.success) {
 						return toastr.error(t(response.message));
 					}
-					return toastr.success(t('Success_Webdav_Upload'));
+					return toastr.success(t('File_uploaded'));
 				});
 			}
 		};

diff --git a/packages/rocketchat-webdav/client/webdavFilePicker.html b/packages/rocketchat-webdav/client/webdavFilePicker.html
@@ -1,13 +1,13 @@
 <template name="webdavFilePicker">
 	<div class="webdav-container">
 		<ul class="attachments">
-			{{#unless equals webdavCurrentFolder '/'}}
+			{{#if $neq webdavCurrentFolder '/'}}
 				<li class="attachments__item" id="webdav-go-back">
 					<div class="attachments__thumb attachments__file">
 						{{>icon icon='go-back'}}
 					</div>
 				</li>
-			{{/unless}}
+			{{/if}}
 			{{#each webdavNodes}}
 				<li class="attachments__item webdav_{{this.type}}">
 					{{#with iconType}}

diff --git a/packages/rocketchat-webdav/client/webdavFilePicker.js b/packages/rocketchat-webdav/client/webdavFilePicker.js
@@ -46,9 +46,6 @@ Template.webdavFilePicker.helpers({
 		}
 		return { icon, type, extension };
 	},
-	equals(a, b) {
-		return a === b;
-	},
 	webdavNodes() {
 		return Session.get('webdavNodes');
 	},

diff --git a/packages/rocketchat-webdav/startup/settings.js b/packages/rocketchat-webdav/startup/settings.js
@@ -1,4 +1,4 @@
-RocketChat.settings.addGroup('WebdavIntegration', function() {
+RocketChat.settings.addGroup('Webdav Integration', function() {
 	this.add('Webdav_Integration_Enabled', false, {
 		type: 'boolean',
 		public: true,