imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge develop

Browse source
This commit is contained in:
Matthew Hodgson 2015-10-27 23:28:34 +00:00
parent aac00db16b
commit cbaf134625
17 changed files with 30 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/skins/vector/views/atoms/ImageView.js
View file

@ -18,13 +18,11 @@ limitations under the License.
var React = require('react');
var ImageViewController = require('../../../../controllers/atoms/ImageView')
var DateUtils = require('../../../../DateUtils');
var filesize = require('filesize');
module.exports = React.createClass({
displayName: 'ImageView',
mixins: [ImageViewController],
// XXX: keyboard shortcuts for managing dialogs should be done by the modal dialog base class omehow, surely...
componentDidMount: function() {