From bea64082a95bf90a79f898fb82b461b5cc313f46 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Nov 2015 15:44:08 +0000
Subject: [PATCH] put the DragDropContext on LeftPanel rather than MatrixChat
 to allow index.js to continue to abuse MatrixChat by directly invoking the
 showScreen method on it

---
 src/skins/vector/views/organisms/LeftPanel.js | 5 ++++-
 src/skins/vector/views/pages/MatrixChat.js    | 8 ++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/skins/vector/views/organisms/LeftPanel.js b/src/skins/vector/views/organisms/LeftPanel.js
index 668b844a69..e003e87f03 100644
--- a/src/skins/vector/views/organisms/LeftPanel.js
+++ b/src/skins/vector/views/organisms/LeftPanel.js
@@ -17,12 +17,14 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
+var DragDropContext = require('react-dnd').DragDropContext;
+var HTML5Backend = require('react-dnd/modules/backends/HTML5');
 var sdk = require('matrix-react-sdk')
 var dis = require('matrix-react-sdk/lib/dispatcher');
 
 var CallHandler = require("matrix-react-sdk/lib/CallHandler");
 
-module.exports = React.createClass({
+var LeftPanel = React.createClass({
     displayName: 'LeftPanel',
 
     getInitialState: function() {
@@ -114,3 +116,4 @@ module.exports = React.createClass({
     }
 });
 
+module.exports = DragDropContext(HTML5Backend)(LeftPanel);
diff --git a/src/skins/vector/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js
index 2d6a351697..0553c25a1c 100644
--- a/src/skins/vector/views/pages/MatrixChat.js
+++ b/src/skins/vector/views/pages/MatrixChat.js
@@ -17,8 +17,6 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var DragDropContext = require('react-dnd').DragDropContext;
-var HTML5Backend = require('react-dnd/modules/backends/HTML5');
 var sdk = require('matrix-react-sdk')
 
 var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/MatrixChat')
@@ -27,7 +25,7 @@ var dis = require('matrix-react-sdk/lib/dispatcher');
 var Matrix = require("matrix-js-sdk");
 var ContextualMenu = require("../../../../ContextualMenu");
 
-var MatrixChat = React.createClass({
+module.exports = React.createClass({
     displayName: 'MatrixChat',
     mixins: [MatrixChatController],
 
@@ -171,6 +169,4 @@ var MatrixChat = React.createClass({
             );
         }
     }
-});
-
-module.exports = DragDropContext(HTML5Backend)(MatrixChat);
+});
\ No newline at end of file