Fix JS related issue in ProTips pages

rohitpaulk · rohitpaulk · commit 952e8dd50a53 · 2014-12-29T17:02:18.000+05:30
Move follow-widget UI logic into common file, run initializeProtip() at end.
diff --git a/app/assets/javascripts/backbone/views/ProtipGridView.js.coffee b/app/assets/javascripts/backbone/views/ProtipGridView.js.coffee
@@ -98,20 +98,12 @@ window.ProtipGridView = Backbone.View.extend(
     this.followingUsers = $('#x-following-users').data('users')
     this.followingTeams = $('#x-following-teams').data('teams')
 
-  markFollowings: ->
-    $(follow).addClass('followed') for follow in $('.x-protip-pane .follow') when follow.attributes['data-value'].value in eval('this.following' + $(follow).data('follow-type'))
-
   updateFollowList: (e)->
     list = eval('this.following' + $(e.target).data('follow-type'))
     entity = $(e.target).data('value')
     if $(e.target).hasClass('followed') then (list.filter (val) ->
       val is entity)
     else
-    list.push entity
-    this.markFollowed(e.target)
-
-  markFollowed: (el)->
-    unless $(el).data('follow-type') == 'Network'
-      $(el).toggleClass('followed')
+      list.push entity
 
 )
diff --git a/app/assets/javascripts/protips.js.coffee b/app/assets/javascripts/protips.js.coffee
@@ -1,5 +1,3 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
 # You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
 #= require  marked
 #= require  highlight/highlight
@@ -63,6 +61,7 @@ window.initializeProtip = ->
         handle_redirect(response)
 
     e.preventDefault()
+  markFollowings()
   registerToggles()
   enableSearchBox()
   registerMoreHistory()
@@ -210,6 +209,12 @@ uploadFinished = (i, file, response, time)->
   $('#protip_body').val $('#protip_body').val() + markdown
   $("#dropzone").removeClass 'upload-in-progress'
 
+getFollowings = (type)->
+  $('#x-following-' + type.toLowerCase()).data(type.toLowerCase())
+
+markFollowings = ->
+  $(follow).addClass('followed') for follow in $('.x-protip-pane .follow') when follow.attributes['data-value'].value in getFollowings($(follow).data('follow-type'))
+
 window.registerToggles = ->
   $('.upvote,.small-upvote').on 'click', ->
     if $(@).not('.upvoted').length == 1
@@ -224,9 +229,9 @@ window.registerToggles = ->
   $('.like').on 'click', ->
     $(@).addClass('liked')
     $(@).removeClass('not-liked')
-  $('.follow-user').on 'click', ->
-    $(@).addClass('following-user')
-    $(@).removeClass('follow-user')
+  $('.follow').on 'click', (e)->
+    unless $(e.target).data('follow-type') == 'Network'
+      $(e.target).toggleClass('followed')
 
 enableSearchBox = ->
   $('.slidedown').on 'click', (e)->
@@ -358,4 +363,4 @@ enablePreviewEditing = ->
 
     $('#protip_body').on 'keyup', updatePreview
 
-    updatePreview()
+    updatePreview()
diff --git a/app/views/layouts/protip.html.haml b/app/views/layouts/protip.html.haml
@@ -28,6 +28,10 @@
     %canvas.blur{ src: image_path(users_background_image) }
     = yield
 
+    #x-following-users.hide{'data-users' => current_user.following_users.map(&:username)}
+    #x-following-networks.hide{'data-networks' => current_user.following_networks.map(&:slug)}
+    #x-following-teams.hide{'data-teams' => current_user.teams_being_followed.map(&:name)}
+
     - unless is_admin?
       :javascript
         window.console.log = function(){}
diff --git a/app/views/protips/show.js.erb b/app/views/protips/show.js.erb
@@ -1,6 +1,5 @@
 $('#x-active-preview-pane').append('<%= escape_javascript(render partial: 'cacheable_protip', locals: { protip: @protip, mode: (@mode || params[:mode]), include_comments: true, job: @job }) %> ');
 $('.dark-screen').height($('#x-active-preview-pane').height());
 registerProtipClickOff();
-protipGrid.markFollowings();
-window.initializeProtip();
-hljs.highlightBlock($('#x-active-preview-pane')[0])
+hljs.highlightBlock($('#x-active-preview-pane')[0]);
+window.initializeProtip();
