FIX: use the application's showLogin function to show login modal

discourse · Jul 25, 2018 · 1aeac94 · 1aeac94
1 parent b52597b
commit 1aeac94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...javascripts/discourse/templates/connectors/topic-above-post-stream/topic-title-voting.hbs b/...javascripts/discourse/templates/connectors/topic-above-post-stream/topic-title-voting.hbs
@@ -2,7 +2,9 @@
   {{#if model.postStream.loaded}}
     {{#if model.postStream.firstPostPresent}}
       <div class="voting title-voting">
-        {{mount-widget widget="vote-box" args=model}}
+        {{mount-widget widget="vote-box" args=model
+          showLogin=(route-action "showLogin")
+        }}
       </div>
     {{/if}}
   {{/if}}

diff --git a/assets/javascripts/discourse/widgets/vote-button.js.es6 b/assets/javascripts/discourse/widgets/vote-button.js.es6
@@ -1,5 +1,4 @@
 import { createWidget } from 'discourse/widgets/widget';
-import showModal from 'discourse/lib/show-modal';
 
 export default createWidget('vote-button', {
   tagName: 'div.vote-button',
@@ -56,7 +55,9 @@ export default createWidget('vote-button', {
 
   click(){
     if (!this.currentUser){
-      showModal('login');
+      this.sendWidgetAction("showLogin");
+      $.cookie("destination_url", window.location.href);
+      return;
     }
     if (!this.attrs.closed && this.parentWidget.state.allowClick && !this.attrs.user_voted){
       this.parentWidget.state.allowClick = false;