From 0a8f5b6223b1ba81669e1726a7d312b5cb0bc5b7 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 26 Nov 2015 14:51:30 +0000
Subject: [PATCH] Move ImageView
---
.../views/atoms => components/views/elements}/ImageView.js | 5 +++--
src/skins/vector/skindex.js | 4 ++--
src/skins/vector/views/molecules/MImageTile.js | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
rename src/{skins/vector/views/atoms => components/views/elements}/ImageView.js (98%)
diff --git a/src/skins/vector/views/atoms/ImageView.js b/src/components/views/elements/ImageView.js
similarity index 98%
rename from src/skins/vector/views/atoms/ImageView.js
rename to src/components/views/elements/ImageView.js
index a842f7c8..f068c74e 100644
--- a/src/skins/vector/views/atoms/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -20,7 +20,7 @@ var React = require('react');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-var DateUtils = require('../../../../DateUtils');
+var DateUtils = require('../../../DateUtils');
var filesize = require('filesize');
module.exports = React.createClass({
@@ -30,7 +30,8 @@ module.exports = React.createClass({
onFinished: React.PropTypes.func.isRequired
},
- // XXX: keyboard shortcuts for managing dialogs should be done by the modal dialog base class somehow, surely...
+ // XXX: keyboard shortcuts for managing dialogs should be done by the modal
+ // dialog base class somehow, surely...
componentDidMount: function() {
document.addEventListener("keydown", this.onKeyDown);
},
diff --git a/src/skins/vector/skindex.js b/src/skins/vector/skindex.js
index 66e07061..ed409c04 100644
--- a/src/skins/vector/skindex.js
+++ b/src/skins/vector/skindex.js
@@ -25,16 +25,16 @@ var skin = {};
// Vector-specific stuff
skin['elements.Spinner'] = require('../../components/views/elements/Spinner');
+skin['elements.ImageView'] = require('../../components/views/elements/ImageView');
skin['messages.MessageTimestamp'] = require('../../components/views/messages/MessageTimestamp');
-// TODO: Fix this so matrix-react-sdk stuff is in react SDK skindex
+// TODO: Fix this so matrix-react-sdk stuff is in react SDK skindex?
skin['avatars.RoomAvatar'] = require('matrix-react-sdk/lib/components/views/avatars/RoomAvatar');
skin['avatars.MemberAvatar'] = require('matrix-react-sdk/lib/components/views/avatars/MemberAvatar');
// Old style stuff
skin['atoms.EditableText'] = require('./views/atoms/EditableText');
skin['atoms.EnableNotificationsButton'] = require('./views/atoms/EnableNotificationsButton');
-skin['atoms.ImageView'] = require('./views/atoms/ImageView');
skin['atoms.create_room.CreateRoomButton'] = require('./views/atoms/create_room/CreateRoomButton');
skin['atoms.create_room.Presets'] = require('./views/atoms/create_room/Presets');
skin['atoms.create_room.RoomAlias'] = require('./views/atoms/create_room/RoomAlias');
diff --git a/src/skins/vector/views/molecules/MImageTile.js b/src/skins/vector/views/molecules/MImageTile.js
index febf3899..3aff8e64 100644
--- a/src/skins/vector/views/molecules/MImageTile.js
+++ b/src/skins/vector/views/molecules/MImageTile.js
@@ -53,7 +53,7 @@ module.exports = React.createClass({
ev.preventDefault();
var content = this.props.mxEvent.getContent();
var httpUrl = MatrixClientPeg.get().mxcUrlToHttp(content.url);
- var ImageView = sdk.getComponent("atoms.ImageView");
+ var ImageView = sdk.getComponent("elements.ImageView");
Modal.createDialog(ImageView, {
src: httpUrl,
width: content.info.w,