Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn

src/components/structures/RoomSubList.js

@@ -417,7 +417,7 @@ var RoomSubList = React.createClass({
         if (this.props.incomingCall) {
             var self = this;
             // Check if the incoming call is for this section
-            var incomingCallRoom = this.state.sortedList.filter(function(room) {
+            var incomingCallRoom = this.props.list.filter(function(room) {
                 return self.props.incomingCall.roomId === room.roomId;
             });
 

src/components/views/context_menus/MessageContextMenu.js

@@ -62,11 +62,14 @@ module.exports = React.createClass({
     },
 
     onRedactClick: function() {
+        const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
+        Modal.createDialog(ConfirmRedactDialog, {
+            onFinished: (proceed) => {
+                if (!proceed) return;
+
                 MatrixClientPeg.get().redactEvent(
                     this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
-        ).done(function() {
+                ).catch(function(e) {
-            // message should disappear by itself
-        }, function(e) {
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     // display error message stating you couldn't delete this.
                     var code = e.errcode || e.statusCode;
@@ -74,7 +77,9 @@ module.exports = React.createClass({
                         title: "Error",
                         description: "You cannot delete this message. (" + code + ")"
                     });
-        });
+                }).done();
+            },
+        }, 'mx_Dialog_confirmredact');
         if (this.props.onFinished) this.props.onFinished();
     },
 
@@ -121,7 +126,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (!eventStatus) { // sent
+        if (!eventStatus && !this.props.mxEvent.isRedacted()) { // sent and not redacted
             redactButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
                     Redact

src/components/views/context_menus/RoomTileContextMenu.js

@@ -24,7 +24,7 @@ import sdk from 'matrix-react-sdk';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import dis from 'matrix-react-sdk/lib/dispatcher';
 import DMRoomMap from 'matrix-react-sdk/lib/utils/DMRoomMap';
-import Rooms from 'matrix-react-sdk/lib/Rooms';
+import * as Rooms from 'matrix-react-sdk/lib/Rooms';
 import * as RoomNotifs from 'matrix-react-sdk/lib/RoomNotifs';
 import Modal from 'matrix-react-sdk/lib/Modal';
 

src/components/views/elements/ImageView.js

@@ -23,6 +23,8 @@ var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var DateUtils = require('matrix-react-sdk/lib/DateUtils');
 var filesize = require('filesize');
 var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
+const Modal = require('matrix-react-sdk/lib/Modal');
+const sdk = require('matrix-react-sdk');
 
 module.exports = React.createClass({
     displayName: 'ImageView',
@@ -62,12 +64,14 @@ module.exports = React.createClass({
     },
 
     onRedactClick: function() {
+        const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
+        Modal.createDialog(ConfirmRedactDialog, {
+            onFinished: (proceed) => {
+                if (!proceed) return;
                 var self = this;
                 MatrixClientPeg.get().redactEvent(
                     this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
-        ).done(function() {
+                ).catch(function(e) {
-            if (self.props.onFinished) self.props.onFinished();
-        }, function(e) {
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     // display error message stating you couldn't delete this.
                     var code = e.errcode || e.statusCode;
@@ -75,6 +79,8 @@ module.exports = React.createClass({
                         title: "Error",
                         description: "You cannot delete this image. (" + code + ")"
                     });
+                }).done();
+            }
         });
     },
 

src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss

@@ -130,14 +130,13 @@ limitations under the License.
     color: $event-notsent-color;
 }
 
-.mx_EventTile_redacted {
+.mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody {
-    padding-top: 0px;
+    display: block;
-}
+    width: 100%;
-
+    max-width: 300px;
-.mx_EventTile_redacted .mx_EventTile_line,
+    height: 24px;
-.mx_EventTile_redacted:hover .mx_EventTile_line,
+    border-radius: 4px;
-.mx_EventTile_redacted.menu .mx_EventTile_line {
+    background-color: black;
-    background-color: $primary-fg-color;
 }
 
 .mx_EventTile_highlight,