OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Add voip subdirectory.

pull/1/head
Kegan Dougal 2015-07-15 14:35:04 +01:00
parent 7cbb43fddb
commit 28cebab9a3
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skins/base/views/atoms/VideoFeed.js → skins/base/views/atoms/voip/VideoFeed.js
View File

@ -18,7 +18,7 @@ limitations under the License.
var React = require('react');
var VideoFeedController = require("../../../../src/controllers/atoms/VideoFeed");
var VideoFeedController = require("../../../../../src/controllers/atoms/voip/VideoFeed");
module.exports = React.createClass({
displayName: 'VideoFeed',

8
skins/base/views/molecules/VideoView.js → skins/base/views/molecules/voip/VideoView.js
View File

@ -18,10 +18,10 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var ComponentBroker = require('../../../../src/ComponentBroker');
var VideoViewController = require("../../../../src/controllers/molecules/VideoView");
var VideoFeed = ComponentBroker.get('atoms/VideoFeed');
var MatrixClientPeg = require("../../../../../src/MatrixClientPeg");
var ComponentBroker = require('../../../../../src/ComponentBroker');
var VideoViewController = require("../../../../../src/controllers/molecules/voip/VideoView");
var VideoFeed = ComponentBroker.get('atoms/voip/VideoFeed');
module.exports = React.createClass({
displayName: 'VideoView',

2
skins/base/views/organisms/RoomView.js
View File

@ -26,7 +26,7 @@ var classNames = require("classnames");
var MessageTile = ComponentBroker.get('molecules/MessageTile');
var RoomHeader = ComponentBroker.get('molecules/RoomHeader');
var MessageComposer = ComponentBroker.get('molecules/MessageComposer');
var VideoView = ComponentBroker.get("molecules/VideoView");
var VideoView = ComponentBroker.get("molecules/voip/VideoView");
var RoomViewController = require("../../../../src/controllers/organisms/RoomView");

5
src/ComponentBroker.js
View File

@ -61,7 +61,6 @@ if (0) {
require('../skins/base/views/atoms/LogoutButton');
require('../skins/base/views/atoms/EnableNotificationsButton');
require('../skins/base/views/atoms/MessageTimestamp');
require('../skins/base/views/atoms/VideoFeed');
require('../skins/base/views/atoms/create_room/CreateRoomButton');
require('../skins/base/views/atoms/create_room/RoomNameTextbox');
require('../skins/base/views/atoms/create_room/Presets');
@ -95,6 +94,8 @@ require('../skins/base/views/organisms/RightPanel');
require('../skins/base/views/molecules/RoomCreate');
require('../skins/base/views/molecules/RoomDropTarget');
require('../skins/base/views/molecules/DirectoryMenu');
require('../skins/base/views/molecules/VideoView');
require('../skins/base/views/atoms/voip/VideoFeed');
require('../skins/base/views/molecules/voip/VideoView');
}

0
src/controllers/atoms/VideoFeed.js → src/controllers/atoms/voip/VideoFeed.js
View File

2
src/controllers/molecules/VideoView.js → src/controllers/molecules/voip/VideoView.js
View File

@ -16,7 +16,7 @@ limitations under the License.
'use strict';
var dis = require("../../dispatcher");
var dis = require("../../../dispatcher");
module.exports = {