summaryrefslogtreecommitdiffstats
path: root/web/react/components/view_image.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-07-21 16:47:08 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-07-21 16:47:08 +0500
commit4b7fda14ba76fc4244204f8d2b95753f4b46ea22 (patch)
tree555920daad269f5105ebadf17e36ed34b6a4c933 /web/react/components/view_image.jsx
parenta820b67468a13f83098d5d441e524aa7dc70e6e3 (diff)
downloadchat-4b7fda14ba76fc4244204f8d2b95753f4b46ea22.tar.gz
chat-4b7fda14ba76fc4244204f8d2b95753f4b46ea22.tar.bz2
chat-4b7fda14ba76fc4244204f8d2b95753f4b46ea22.zip
mm-1631 - Fixing image previewer bug
Diffstat (limited to 'web/react/components/view_image.jsx')
-rw-r--r--web/react/components/view_image.jsx9
1 files changed, 6 insertions, 3 deletions
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index 38f439946..2274f3f2e 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -25,7 +25,11 @@ module.exports = React.createClass({
this.setState({ imgId: nextProps.startId });
},
loadImage: function(id) {
- if (this.state.loaded[id] || this.state.images[id]) return;
+ var imgHeight = $(window).height()-100;
+ if (this.state.loaded[id] || this.state.images[id]){
+ $('.modal .modal-image .image-wrapper img').css("max-height",imgHeight);
+ return;
+ };
var src = "";
if (this.props.imgCount > 0) {
@@ -48,6 +52,7 @@ module.exports = React.createClass({
var loaded = self.state.loaded;
loaded[imgid] = true;
self.setState({ loaded: loaded });
+ $(self.refs.image.getDOMNode()).css("max-height",imgHeight);
};
}(id);
var images = this.state.images;
@@ -56,10 +61,8 @@ module.exports = React.createClass({
},
componentDidUpdate: function() {
if (this.refs.image) {
- var height = $(window).height()-100;
if (this.state.loaded[this.state.imgId]) {
$(this.refs.imageWrap.getDOMNode()).removeClass("default");
- $(this.refs.image.getDOMNode()).css("max-height",height);
}
}
},