haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editions after rebase

This commit is contained in:
Ilya Daynatovich 2016-12-16 15:42:40 +02:00
parent a99bbe67ab
commit 58b5e1748f
2 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/UI/welcome_page/WelcomePage.js
View File

@ -1,30 +0,0 @@
/* global $ */
function enterRoom() {
const $enterRoomField = $("#enter_room_field");
var val = $enterRoomField.val();
if(!val) {
val = $enterRoomField.data("room-name");
}
if (val) {
window.location.pathname = "/" + val;
}
}
function setupWelcomePage() {
// XXX: We left only going to conference page here because transitions via
// React Router isn't implemented yet.
$("#enter_room_button").click(function() {
enterRoom();
});
$("#enter_room_field").keydown(function (event) {
if (event.keyCode === 13 /* enter */) {
enterRoom();
}
});
}
module.exports = setupWelcomePage;

42
react/features/welcome/components/WelcomePage.web.js
View File

@ -3,8 +3,6 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { Conference } from '../../conference';
import { AbstractWelcomePage, mapStateToProps } from './AbstractWelcomePage'; import { AbstractWelcomePage, mapStateToProps } from './AbstractWelcomePage';
/** /**
@ -128,19 +126,6 @@ class WelcomePage extends AbstractWelcomePage {
}); });
} }
/**
* Overrides the super in order to prevent the dispatching of the Redux
* action SET_ROOM.
*
* @override
* @protected
* @returns {null}
*/
_onJoin() {
// Don't call the super implementation and thus prevent the dispatching
// of the Redux action SET_ROOM.
}
/** /**
* Handles 'keydown' event to initiate joining the room when the * Handles 'keydown' event to initiate joining the room when the
* 'Enter/Return' button is pressed. * 'Enter/Return' button is pressed.
@ -365,33 +350,6 @@ class WelcomePage extends AbstractWelcomePage {
this._updateRoomname(); this._updateRoomname();
} }
/**
* Event handler for changing room name input from web.
*
* @inheritdoc
* @override
* @protected
*/
_onRoomChange() {
super._onRoomChange(this.roomNameInput.value);
}
/**
* Handles 'keydown' event and initiate joining the room if 'return' button
* was pressed.
*
* @param {Event} event - Key down event object.
* @returns {void}
* @private
*/
_onKeyDown(event) {
const RETURN_BUTTON_CODE = 13;
if (event.keyCode === RETURN_BUTTON_CODE) {
this._onJoin();
}
}
/** /**
* Renders the main part of this WelcomePage. * Renders the main part of this WelcomePage.
* *