codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some merge conflicts

Browse source
This commit is contained in:
Robin Ward 2013-03-15 16:57:53 -04:00
parent 1a60301a17
commit 67f0de4b8b
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/discourse/controllers/composer_controller.js
View file

@ -93,7 +93,6 @@ Discourse.ComposerController = Discourse.Controller.extend({
});
},
<<<<<<< HEAD
closeEducation: function() {
this.set('educationClosed', true);
},

7
app/assets/javascripts/discourse/views/composer_view.js
View file

@ -85,13 +85,12 @@ Discourse.ComposerView = Discourse.View.extend({
$('.composer-popup').css('bottom', sizePx);
},
focusIn: (function() {
focusIn: function() {
var controller = this.get('controller');
if(controller) controller.resetDraftStatus();
}),
},
resize: (function() {
resize: function() {
// this still needs to wait on animations, need a clean way to do that
return Em.run.next(null, function() {
var replyControl = $('#reply-control');