Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NEW] Enable read only channel creation #8260

Merged
merged 1 commit into from
Sep 23, 2017
Merged

[NEW] Enable read only channel creation #8260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@
"All_channels": "All channels",
"All_logs": "All logs",
"All_messages": "All messages",
"All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages",
"Allow_Invalid_SelfSigned_Certs": "Allow Invalid Self-Signed Certs",
"Allow_Invalid_SelfSigned_Certs_Description": "Allow invalid and self-signed SSL certificate's for link validation and previews.",
"Allow_switching_departments": "Allow visitor to switch departments",
Expand Down Expand Up @@ -1223,6 +1224,7 @@
"Offline_unavailable": "Offline unavailable",
"On": "On",
"Online": "Online",
"Only_authorized_users_can_write_new_messages": "Only authorized users can write new messages",
"Only_On_Desktop": "Desktop mode (only sends with enter on desktop)",
"Only_you_can_see_this_message": "Only you can see this message",
"Oops!": "Oops",
Expand Down
18 changes: 5 additions & 13 deletions packages/rocketchat-theme/client/imports/components/modal/create-channel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
}

& .rc-switch {
width: 50%;
width: 100%;

&:not(:last-child) {
margin-bottom: 2rem;
}
}

& .rc-input__icon-svg {
Expand All @@ -48,15 +52,3 @@
opacity: 1;
}
}

@media (width <= 400px) {
.create-channel {
& .rc-switch {
width: 100%;

&:not(:last-child) {
margin-bottom: 2rem;
}
}
}
}
3 changes: 2 additions & 1 deletion packages/rocketchat-ui/client/views/app/createChannel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ <h1 class="create-channel__title">{{_ "Create_A_New_Channel"}}</h1>
</div>
<div class="rc-switch">
<label class="rc-switch__label">
<input type="checkbox" class="rc-switch__input" name="readOnly" {{readOnlyIsDisabled}}>
<input type="checkbox" class="rc-switch__input" name="readOnly">
<span class="rc-switch__button">
<span class="rc-switch__button-inside"></span>
</span>
<span class="rc-switch__text">
{{_ "Read_only_channel"}}
</span>
</label>
<span class="rc-switch__description">{{readOnlyDescription}}</span>
</div>
</div>
<div class="create-channel__inputs">
Expand Down
32 changes: 18 additions & 14 deletions packages/rocketchat-ui/client/views/app/createChannel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const acEvents = {
'click .rc-popup-list__item'(e, t) {
t.ac.onItemClick(this, e);
},
'keydown [name=users]'(e, t) {
'keydown [name="users"]'(e, t) {
if ([8, 46].includes(e.keyCode) && e.target.value === '') {
const users = t.selectedUsers;
const usersArr = users.get();
Expand All @@ -12,13 +12,13 @@ const acEvents = {

t.ac.onKeyDown(e);
},
'keyup [name=users]'(e, t) {
'keyup [name="users"]'(e, t) {
t.ac.onKeyUp(e);
},
'focus [name=users]'(e, t) {
'focus [name="users"]'(e, t) {
t.ac.onFocus(e);
},
'blur [name=users]'(e, t) {
'blur [name="users"]'(e, t) {
t.ac.onBlur(e);
}
};
Expand Down Expand Up @@ -74,14 +74,14 @@ Template.createChannel.helpers({
const inUse = instance.inUse.get();
return invalid || inUse;
},
readOnlyIsDisabled() {
return 'disabled';
},
typeLabel() {
return t(Template.instance().type.get() === 'p' ? t('Private_Channel') : t('Public_Channel'));
},
typeDescription() {
return t(Template.instance().type.get() === 'p' ? t('Just_invited_people_can_access_this_channel'): t('Everyone_can_access_this_channel'));
return t(Template.instance().type.get() === 'p' ? t('Just_invited_people_can_access_this_channel') : t('Everyone_can_access_this_channel'));
},
readOnlyDescription() {
return t(Template.instance().readOnly.get() ? t('Only_authorized_users_can_write_new_messages') : t('All_users_in_the_channel_can_write_new_messages'));
},
createIsDisabled() {
const instance = Template.instance();
Expand All @@ -105,10 +105,13 @@ Template.createChannel.events({
const {username} = Blaze.getData(target);
t.selectedUsers.set(t.selectedUsers.get().filter(user => user.username !== username));
},
'change [name=type]'(e, t) {
'change [name="type"]'(e, t) {
t.type.set(e.target.checked ? e.target.value : 'd');
},
'input [name=users]'(e, t) {
'change [name="readOnly"]'(e, t) {
t.readOnly.set(e.target.checked);
},
'input [name="users"]'(e, t) {
const input = e.target;
const position = input.selectionEnd || input.selectionStart;
const length = input.value.length;
Expand All @@ -118,7 +121,7 @@ Template.createChannel.events({

t.userFilter.set(modified);
},
'input [name=name]'(e, t) {
'input [name="name"]'(e, t) {
const input = e.target;
const position = input.selectionEnd || input.selectionStart;
const length = input.value.length;
Expand All @@ -138,8 +141,8 @@ Template.createChannel.events({
e.stopPropagation();
const name = e.target.name.value;
const type = instance.type.get();
const readOnly = instance.readOnly.get();
const isPrivate = type === 'p';
const readOnly = false;//instance.find('#channel-ro').checked;

if (instance.invalid.get() || instance.inUse.get()) {
return e.target.name.focus();
Expand Down Expand Up @@ -169,8 +172,8 @@ Template.createChannel.events({
Template.createChannel.onRendered(function() {
const users = this.selectedUsers;

this.firstNode.querySelector('[name=name]').focus();
this.ac.element = this.firstNode.querySelector('[name=users]');
this.firstNode.querySelector('[name="name"]').focus();
this.ac.element = this.firstNode.querySelector('[name="users"]');
this.ac.$element = $(this.ac.element);
this.ac.$element.on('autocompleteselect', function(e, {item}) {
const usersArr = users.get();
Expand All @@ -190,6 +193,7 @@ Template.createChannel.onCreated(function() {

this.name = new ReactiveVar('');
this.type = new ReactiveVar('p');
this.readOnly = new ReactiveVar(false);
this.inUse = new ReactiveVar(undefined);
this.invalid = new ReactiveVar(false);
this.userFilter = new ReactiveVar('');
Expand Down