Merge #268

prose · Mar 25, 2013 · e4aec7f · e4aec7f
2 parents 456366c + 9c8bc0b
commit e4aec7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/_includes/templates/post._ b/_includes/templates/post._
@@ -12,7 +12,7 @@
     </div>
 
     <div class="fr menu-item save-state">
-      <input type="text" class="commit-message" value="Updated."/>
+      <input type="text" class="commit-message" value=""/>
       <div class="state fl">
         <% if (writeable) { %><a class='toggle-options button' href='#'>&nbsp;</a><% } %>
 

diff --git a/_includes/views/post.js b/_includes/views/post.js
@@ -57,7 +57,7 @@ views.Post = Backbone.View.extend({
 
   _toggleCommit: function() {
     if (!this.$('.document-menu').hasClass('commit')) {
-      this.$('.commit-message').val("Updated "+$('input.filepath').val());
+      this.$('.commit-message').attr( 'placeholder', "Updated "+$('input.filepath').val());
     }
 
     this.hideMeta();
@@ -69,6 +69,7 @@ views.Post = Backbone.View.extend({
     this.showDiff();
     this.$('.surface').toggle();
     this.$('.diff-wrapper').toggle();
+    this.$('.commit-message').focus();  
 
     return false;
   },
@@ -306,7 +307,7 @@ views.Post = Backbone.View.extend({
         filepath = $('input.filepath').val(),
         filename = _.extractFilename(filepath)[1],
         filecontent = this.serialize(),
-        message = this.$('.commit-message').val(),
+        message = this.$('.commit-message').val() || this.$('.commit-message').attr('placeholder'),
         method = this.model.writeable ? this.saveFile : this.sendPatch;
 
     // Update content