From 76e5124df273ceafbd27f434c2c24de9866334e9 Mon Sep 17 00:00:00 2001
From: Evandro Junior <evandrojr@gmail.com>
Date: Thu, 30 Apr 2015 11:19:52 -0300
Subject: [PATCH] Fix oauth and merge

---
 js/main.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/js/main.js b/js/main.js
index d734253..ac8dff3 100644
--- a/js/main.js
+++ b/js/main.js
@@ -34,6 +34,10 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
   // Load data from localhost when it is dev env.
   var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + private_token + '&fields=id,children,categories,abstract,title,image,url,setting';
 
+  window.oauthPluginHandleLoginResult = function(loggedIn, token) {
+    loginCallback(loggedIn, token);
+  }
+
   $.getJSON(noosferoAPI)
     .done(function( data ) {
       data.host = host;
@@ -135,8 +139,7 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
       $( '.proposal-selection' ).change(function(e){
         e.preventDefault();
 
-        // Update URL and Navigate
-        Main.updateHash('#/programas/' + this.value);
+        Main.display_proposal('proposal-item-' + this.value);
       });
 
       var availableTags = [ ];
@@ -306,9 +309,6 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
               loginButton.siblings('.login-container').show();
             }
           },
-          oauthPluginHandleLoginResult: function(loggedIn, token) {
-            loginCallback(loggedIn, token);
-          },
           guid: function() {
             function s4() {
               return Math.floor((1 + Math.random()) * 0x10000)
@@ -355,7 +355,6 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
             $('.results-container .results-content').hide();
             $('.experience-proposal-container').show();
             $('.talk-proposal-container').show();
-            $('.calendar').slick();
             var topic_id = proposal_id.split('-').pop();
             this.loadRandomProposal(topic_id, private_token);
           },
@@ -371,11 +370,11 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
             $('.results-container').hide();
             $('.experience-proposal-container').hide();
             $('.talk-proposal-container').hide();
-            $('#proposal-item-' + proposal_id + ' .body').show();
+            $('.body').show();
 
             var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
             $.getJSON(url).done(function( data ) {
-              $('#proposal-item-' + proposal_id + ' .body-content').replaceWith(data.article.body);
+              $('.body-content').replaceWith(data.article.body);
             })
             .fail(function( jqxhr, textStatus, error ) {
               var err = textStatus + ', ' + error;
--
libgit2 0.21.2