Skip to content

Commit

Permalink
Merges branch 'master' of github.com:pepyatka/pepyatka-html
Browse files Browse the repository at this point in the history
# Conflicts:
#	public/js/app/fields/CreateCommentView.js
  • Loading branch information
epicmonkey committed Jun 8, 2015
2 parents 1fafb4d + 2ff412d commit 5447690
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion public/js/app/fields/CreateCommentView.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ define(["app/app", "ember"], function(App, Ember) {
},

becomeFocused: function() {
if (this.get('parentView.templateName') != 'post')
if (this.get('parentView.templateName') != 'post') {
this.$().focus()
}
}.on('didInsertElement')
})
})

0 comments on commit 5447690

Please sign in to comment.