2011-02-20 Ojan Vafai <ojan@chromium.org>

        Reviewed by Adam Barth.

        [codereviewtool] make escape hide the preview form
        https://bugs.webkit.org/show_bug.cgi?id=54844

        * code-review.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79180 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index b9b4472235b657882fc7a49e27a83a3936b2da3a..ef7c6d0d1f26db118d8e7644964b7d173eee3a98 100644 (file)
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-20  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [codereviewtool] make escape hide the preview form
+        https://bugs.webkit.org/show_bug.cgi?id=54844
+
+        * code-review.js:
+
 2011-02-20  Ojan Vafai  <ojan@chromium.org>
 
         Reviewed by Adam Barth.

diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index 76dc285c3c19b78fd4b8ead00b346c55aab0eca3..8ca365979b7511ce2702d399e887313abc6e3551 100644 (file)
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -70,6 +70,8 @@ var CODE_REVIEW_UNITTEST;
   var WEBKIT_BASE_DIR = "http://svn.webkit.org/repository/webkit/trunk/";
   var SIDE_BY_SIDE_DIFFS_KEY = 'sidebysidediffs';
   var g_displayed_draft_comments = false;
+  var ESCAPE_KEY_CODE = 27;
+
 
   function idForLine(number) {
     return 'line' + number;
@@ -1083,6 +1085,11 @@ var CODE_REVIEW_UNITTEST;
   function handleReviewFormLoad() {
     var review_form_contents = $('#reviewform').contents();
     if (review_form_contents[0].querySelector('#form-controls #flags')) {
+      review_form_contents.bind('keydown', function(e) {
+        if (e.keyCode == ESCAPE_KEY_CODE)
+          hideCommentForm();
+      });
+
       // This is the intial load of the review form iframe.
       var form = review_form_contents.find('form')[0];
       form.addEventListener('submit', eraseDraftComments);
@@ -1393,8 +1400,7 @@ var CODE_REVIEW_UNITTEST;
   }
 
   $('textarea').live('keydown', function(e) {
-    var escape_key_code = 27;
-    if (e.keyCode == escape_key_code)
+    if (e.keyCode == ESCAPE_KEY_CODE)
       handleEscapeKeyDownInTextarea(this);
   });
 
@@ -1471,7 +1477,7 @@ var CODE_REVIEW_UNITTEST;
       return true;
     }
 
-    var lines = focused.hasClass('Line') ? focused : $('.Line', focused);
+    var lines = $('.Line', focused);
     var last = lines.last();
     if (last.attr('data-has-comment')) {
       unfreezeCommentFor(last);
@@ -1723,9 +1729,7 @@ var CODE_REVIEW_UNITTEST;
     return quoted_comments.join('\n');
   }
 
-  $('#comment_form .winter').live('click', function() {
-    $('#comment_form').addClass('inactive');
-  });
+  $('#comment_form .winter').live('click', hideCommentForm);
 
   function fillInReviewForm() {
     var comments_in_context = []
@@ -1763,6 +1767,15 @@ var CODE_REVIEW_UNITTEST;
 
   function showCommentForm() {
     $('#comment_form').removeClass('inactive');
+    $('#reviewform').contents().find('#submitBtn').focus();
+  }
+  
+  function hideCommentForm() {
+    $('#comment_form').addClass('inactive');
+    
+    // Make sure the top document has focus so key events don't keep going to the review form.
+    document.body.tabIndex = -1;
+    document.body.focus();
   }
 
   $('#preview_comments').live('click', function() {