From 1415560d52eee7bb4f5bdf8b6d433e591273847a Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 11 Aug 2015 14:58:43 -0700
Subject: get public link now displays in the same window pane on mobile, but
 in a new tab on desktop. Also added proptypes

---
 web/react/components/view_image.jsx | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index dc85b53e5..0bed4eaa4 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -6,6 +6,13 @@ var utils = require('../utils/utils.jsx');
 
 module.exports = React.createClass({
     displayName: 'ViewImageModal',
+    propTypes: {
+        filenames: React.PropTypes.array,
+        modalId: React.PropTypes.string,
+        channelId: React.PropTypes.string,
+        userId: React.PropTypes.string,
+        startId: React.PropTypes.number
+    },
     canSetState: false,
     handleNext: function() {
         var id = this.state.imgId + 1;
@@ -118,7 +125,11 @@ module.exports = React.createClass({
         data.filename = this.props.filenames[this.state.imgId];
         Client.getPublicLink(data,
             function(serverData) {
-                window.open(serverData.public_link);
+                if (utils.isMobile()) {
+                    window.location.href = serverData.public_link;
+                } else {
+                    window.open(serverData.public_link);
+                }
             },
             function() {
             }
@@ -145,7 +156,7 @@ module.exports = React.createClass({
     getInitialState: function() {
         var loaded = [];
         var progress = [];
-        for (var i = 0; i < this.props.filenames.length; i ++) {
+        for (var i = 0; i < this.props.filenames.length; i++) {
             loaded.push(false);
             progress.push(0);
         }
@@ -213,7 +224,7 @@ module.exports = React.createClass({
             content = (
                 <div>
                     <img className='loader-image' src='/static/images/load.gif' />
-                    { percentage > 0 ?
+                    {percentage > 0 ?
                     <span className='loader-percent' >{'Previewing ' + percentage + '%'}</span>
                     : ''}
                 </div>
-- 
cgit v1.2.3-1-g7c22