From 28cebab9a3e428576ff153ac98303dc52b374cc6 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 15 Jul 2015 14:35:04 +0100
Subject: [PATCH] Add voip subdirectory.

---
 skins/base/views/atoms/{ => voip}/VideoFeed.js     | 2 +-
 skins/base/views/molecules/{ => voip}/VideoView.js | 8 ++++----
 skins/base/views/organisms/RoomView.js             | 2 +-
 src/ComponentBroker.js                             | 5 +++--
 src/controllers/atoms/{ => voip}/VideoFeed.js      | 0
 src/controllers/molecules/{ => voip}/VideoView.js  | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename skins/base/views/atoms/{ => voip}/VideoFeed.js (90%)
 rename skins/base/views/molecules/{ => voip}/VideoView.js (79%)
 rename src/controllers/atoms/{ => voip}/VideoFeed.js (100%)
 rename src/controllers/molecules/{ => voip}/VideoView.js (96%)

diff --git a/skins/base/views/atoms/VideoFeed.js b/skins/base/views/atoms/voip/VideoFeed.js
similarity index 90%
rename from skins/base/views/atoms/VideoFeed.js
rename to skins/base/views/atoms/voip/VideoFeed.js
index 71681b99eb..7fbee43699 100644
--- a/skins/base/views/atoms/VideoFeed.js
+++ b/skins/base/views/atoms/voip/VideoFeed.js
@@ -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',
diff --git a/skins/base/views/molecules/VideoView.js b/skins/base/views/molecules/voip/VideoView.js
similarity index 79%
rename from skins/base/views/molecules/VideoView.js
rename to skins/base/views/molecules/voip/VideoView.js
index be594142ce..954ad3648f 100644
--- a/skins/base/views/molecules/VideoView.js
+++ b/skins/base/views/molecules/voip/VideoView.js
@@ -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',
diff --git a/skins/base/views/organisms/RoomView.js b/skins/base/views/organisms/RoomView.js
index c7eb1474ce..fcafb945e2 100644
--- a/skins/base/views/organisms/RoomView.js
+++ b/skins/base/views/organisms/RoomView.js
@@ -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");
 
diff --git a/src/ComponentBroker.js b/src/ComponentBroker.js
index 9bb54fa612..7004da1575 100644
--- a/src/ComponentBroker.js
+++ b/src/ComponentBroker.js
@@ -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');
+
 
 }
diff --git a/src/controllers/atoms/VideoFeed.js b/src/controllers/atoms/voip/VideoFeed.js
similarity index 100%
rename from src/controllers/atoms/VideoFeed.js
rename to src/controllers/atoms/voip/VideoFeed.js
diff --git a/src/controllers/molecules/VideoView.js b/src/controllers/molecules/voip/VideoView.js
similarity index 96%
rename from src/controllers/molecules/VideoView.js
rename to src/controllers/molecules/voip/VideoView.js
index 245f8bb9d6..83b2328ab1 100644
--- a/src/controllers/molecules/VideoView.js
+++ b/src/controllers/molecules/voip/VideoView.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 'use strict';
 
-var dis = require("../../dispatcher");
+var dis = require("../../../dispatcher");
 
 module.exports = {