Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui

Swap from `ui_opacity` to `panel_disabled`

src/components/views/rooms/ForwardMessage.js

@@ -30,10 +30,9 @@ module.exports = React.createClass({
 
     componentWillMount: function() {
         dis.dispatch({
-            action: 'ui_opacity',
-            leftOpacity: 1.0,
-            rightOpacity: 0.3,
-            middleOpacity: 0.5,
+            action: 'panel_disable',
+            rightDisabled: true,
+            middleDisabled: true,
         });
     },
 
@@ -43,9 +42,9 @@ module.exports = React.createClass({
 
     componentWillUnmount: function() {
         dis.dispatch({
-            action: 'ui_opacity',
-            sideOpacity: 1.0,
-            middleOpacity: 1.0,
+            action: 'panel_disable',
+            sideDisabled: false,
+            middleDisabled: false,
         });
         document.removeEventListener('keydown', this._onKeyDown);
     },

src/components/views/rooms/MessageComposer.js

@@ -371,7 +371,7 @@ export default class MessageComposer extends React.Component {
         );
 
         return (
-            <div className="mx_MessageComposer mx_fadable" style={{ opacity: this.props.opacity }}>
+            <div className="mx_MessageComposer">
                 <div className="mx_MessageComposer_wrapper">
                     <div className="mx_MessageComposer_row">
                         { controls }
@@ -410,9 +410,6 @@ MessageComposer.propTypes = {
     // callback when a file to upload is chosen
     uploadFile: React.PropTypes.func.isRequired,
 
-    // opacity for dynamic UI fading effects
-    opacity: React.PropTypes.number,
-
     // string representing the current room app drawer state
     showApps: React.PropTypes.bool,
 };

src/components/views/rooms/RoomSettings.js

@@ -158,9 +158,9 @@ module.exports = React.createClass({
         });
 
         dis.dispatch({
-            action: 'ui_opacity',
-            sideOpacity: 0.3,
-            middleOpacity: 0.3,
+            action: 'panel_disable',
+            sideDisabled: true,
+            middleDisabled: true,
         });
     },
 
@@ -171,9 +171,9 @@ module.exports = React.createClass({
         }
 
         dis.dispatch({
-            action: 'ui_opacity',
-            sideOpacity: 1.0,
-            middleOpacity: 1.0,
+            action: 'panel_disable',
+            sideDisabled: false,
+            middleDisabled: false,
         });
     },