fixing autoresizing, cleaning up js, and fixed hearting on a protip view

mdeiters · mdeiters · commit 93c66a912389 · 2016-02-17T18:53:17.000-08:00
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
@@ -17,27 +17,20 @@
 #= require react_ujs
 #= require_tree .
 
-@promptUserSignInOn401 = (xhr) ->
-  if xhr.status == 401
-    window.location.replace('/signin')
-  return
-
 $ ->
   $.ajaxSetup error: (xhr, status, err) ->
     promptUserSignInOn401(xhr)
     return
 
-  # $.ajaxSetup statusCode: 401: ->
-  # window.location.replace('/signin')
-  # return
+  $('textarea').on 'input', resizeTextAreaForContent
 
-  # $(document).bind "ajax:error", (event, jqXHR, ajaxSettings, thrownError) ->
-  #   if jqXHR.status == 401 # thrownError is 'Unauthorized'
-  #     window.location.replace('/signin')
+@promptUserSignInOn401 = (xhr) ->
+  if xhr.status == 401
+    window.location.replace('/signin')
+  return
 
-  # resize text areas to adjust for space
-  $('textarea').on 'input', ->
-    textarea_to_resize = this
-    textarea_new_hight = textarea_to_resize.scrollHeight
-    textarea_to_resize.style.cssText = 'height:auto;'
-    textarea_to_resize.style.cssText = 'height:' + textarea_new_hight + 'px'
+@resizeTextAreaForContent = ->
+  textarea_to_resize = this
+  textarea_new_hight = textarea_to_resize.scrollHeight
+  textarea_to_resize.style.cssText = 'height:auto;'
+  textarea_to_resize.style.cssText = 'height:' + textarea_new_hight + 'px'
diff --git a/app/assets/javascripts/components/ProtipHeart.es6.jsx b/app/assets/javascripts/components/ProtipHeart.es6.jsx
@@ -8,7 +8,7 @@ class ProtipHeart extends React.Component {
   }
 
   componentDidMount() {
-    const userLikes = JSON.parse($('#signed-in-user-liked-payload').html() || '[]')
+    const userLikes = JSON.parse($('#signed-in-user-liked-payload').html()) || []
     console.log(userLikes)
     if (userLikes.indexOf(this.props.id) > -1) {
       this.setState({hearted: true})
diff --git a/app/views/protips/show.html.haml b/app/views/protips/show.html.haml
@@ -3,7 +3,7 @@
 
 -if signed_in?
   #signed-in-user-liked-payload.hide=current_user.likes?(@protip) && [dom_id(@protip)]
-
+-# .hide
 -# - meta description: protip_summary
 -# - meta og: { description: protip_summary }
 -# - meta og: { image: users_image_path(@protip.user) }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class ProtipHeart extends React.Component {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`componentDidMount() {`
`11`		`- const userLikes = JSON.parse($('#signed-in-user-liked-payload').html() \|\| '[]')`
	`11`	`+ const userLikes = JSON.parse($('#signed-in-user-liked-payload').html()) \|\| []`
`12`	`12`	`console.log(userLikes)`
`13`	`13`	`if (userLikes.indexOf(this.props.id) > -1) {`
`14`	`14`	`this.setState({hearted: true})`