Fixing explore actions & slice controller interactions (#1292)

* Fixing explore actions & slice controller interactions

* Addressing a comment

caravel/assets/javascripts/explore/components/EmbedCodeButton.jsx

@@ -12,7 +12,6 @@ export default class EmbedCodeButton extends React.Component {
     this.state = {
       height: '400',
       width: '600',
-      srcLink: window.location.origin + props.slice.data.standalone_endpoint,
     };
     this.handleInputChange = this.handleInputChange.bind(this);
   }
@@ -26,11 +25,15 @@ export default class EmbedCodeButton extends React.Component {
   }
 
   generateEmbedHTML() {
-    const { width, height, srcLink } = this.state;
+    const srcLink = window.location.origin + this.props.slice.data.standalone_endpoint;
     /* eslint max-len: 0 */
-    const embedHTML =
-      `<iframe src="${srcLink}" width="${width}" height="${height}" seamless frameBorder="0" scrolling="no"></iframe>`;
-    return embedHTML;
+    return `
+      <iframe
+        src="${srcLink}"
+        width="${this.state.width}"
+        height="${this.state.height}"
+        seamless frameBorder="0" scrolling="no">
+      </iframe>`;
   }
 
   renderPopover() {

caravel/assets/javascripts/explore/components/ExploreActionButtons.jsx

@@ -13,7 +13,6 @@ export default function ExploreActionButtons({ canDownload, slice }) {
   const exportToCSVClasses = cx('btn btn-default btn-sm', {
     'disabled disabledButton': !canDownload,
   });
-
   return (
     <div className="btn-group results" role="group">
       <URLShortLinkButton slice={slice} />

caravel/assets/javascripts/explore/components/URLShortLinkButton.jsx

@@ -13,8 +13,6 @@ export default class URLShortLinkButton extends React.Component {
     this.state = {
       shortUrl: '',
     };
-
-    this.getShortUrl();
   }
 
   getShortUrl() {
@@ -22,7 +20,7 @@ export default class URLShortLinkButton extends React.Component {
       type: 'POST',
       url: '/r/shortner/',
       data: {
-        data: '/' + window.location.pathname + this.props.slice.querystring(),
+        data: '/' + window.location.pathname + window.location.search,
       },
       success: (data) => {
         this.setState({
@@ -51,16 +49,15 @@ export default class URLShortLinkButton extends React.Component {
   }
 
   render() {
-    const shortUrl = this.state.shortUrl;
-    const isDisabled = shortUrl === '';
     return (
       <OverlayTrigger
         trigger="click"
         rootClose
         placement="left"
+        onEnter={this.getShortUrl.bind(this)}
         overlay={this.renderPopover()}
       >
-        <span className="btn btn-default btn-sm" disabled={isDisabled}>
+        <span className="btn btn-default btn-sm">
           <i className="fa fa-link"></i>&nbsp;
         </span>
       </OverlayTrigger>