Merge pull request #7942 from RocketChat/firefox-createchannel

[FIX] Create channel button on Firefox
RocketChat · Aug 30, 2017 · 5568591 · 5568591
1 parent 641474a
commit 5568591
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/packages/rocketchat-theme/server/colors.less b/packages/rocketchat-theme/server/colors.less
@@ -287,8 +287,8 @@ textarea {
 	background-color: mix(contrast(@content-background-color), @content-background-color, 20%);
 }
 
-input[type="button"],
-input[type="submit"] {
+.rc-old input[type="button"],
+.rc-old input[type="submit"] {
 	color: @primary-font-color;
 	background: mix(contrast(@content-background-color), @content-background-color, 10%);
 	border-color: mix(contrast(@content-background-color), @content-background-color, 10%);

diff --git a/packages/rocketchat-ui/client/views/app/createChannel.html b/packages/rocketchat-ui/client/views/app/createChannel.html
@@ -77,7 +77,7 @@ <h1 class="create-channel__title">{{_ "Create_A_New_Channel"}}</h1>
 					</label>
 				</div>
 			</div>
-			<button class="rc-button rc-button--primary" type='submit' data-button="create" {{createIsDisabled}}>{{_ "Create"}}</button>
+			<input class="rc-button rc-button--primary" type="submit" data-button="create" {{createIsDisabled}} value="{{_ "Create"}}">
 		</form>
 	</section>
 </template>

diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js
@@ -155,6 +155,7 @@ Template.createChannel.events({
 				}
 				return;
 			}
+
 			if (!isPrivate) {
 				RocketChat.callbacks.run('aftercreateCombined', { _id: result.rid, name: result.name });
 			}

diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
@@ -5,7 +5,7 @@ class SideNav extends Page {
 	get channelType() { return browser.element('.create-channel__content .rc-switch__button'); }
 	get channelReadOnly() { return browser.elements('.create-channel__switches .rc-switch__button').value[1]; }
 	get channelName() { return browser.element('.create-channel__content input[name="name"]'); }
-	get saveChannelBtn() { return browser.element('.create-channel__content button[data-button="create"]'); }
+	get saveChannelBtn() { return browser.element('.create-channel__content [data-button="create"]'); }
 
 	// Account box
 	get accountBoxUserName() { return browser.element('.sidebar__account-username'); }
@@ -101,7 +101,7 @@ class SideNav extends Page {
 		this.channelName.setValue(channelName);
 
 		browser.waitUntil(function() {
-			return browser.isEnabled('.create-channel__content button[data-button="create"]');
+			return browser.isEnabled('.create-channel__content [data-button="create"]');
 		}, 5000);
 
 		this.channelType.waitForVisible(10000);