[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fb91655b3278b20090f42ce4b0116876ce712535
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 22:42:42 2010 +0000

    2010-09-07  Adam Barth  <abarth at webkit.org>
    
            Minor tweaks to the reviewtool UI.
    
            Rename Cancel to Discard to make it more clear what the button does.
            Also, move the style declaration for the focus ring later in the sheet
            so it works.
    
            * PrettyPatch/PrettyPatch.rb:
            * code-review.js:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66918 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/BugsSite/ChangeLog b/BugsSite/ChangeLog
index ebe28ed..00b7c77 100644
--- a/BugsSite/ChangeLog
+++ b/BugsSite/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-07  Adam Barth  <abarth at webkit.org>
+
+        Minor tweaks to the reviewtool UI.
+
+        Rename Cancel to Discard to make it more clear what the button does.
+        Also, move the style declaration for the focus ring later in the sheet
+        so it works.
+
+        * PrettyPatch/PrettyPatch.rb:
+        * code-review.js:
+
 2010-09-06  Adam Barth  <abarth at webkit.org>
 
         Small UI tweak to the reviewtool.  Make the Ok/Cancel buttons a bit
diff --git a/BugsSite/PrettyPatch/PrettyPatch.rb b/BugsSite/PrettyPatch/PrettyPatch.rb
index 2c75809..aee5028 100644
--- a/BugsSite/PrettyPatch/PrettyPatch.rb
+++ b/BugsSite/PrettyPatch/PrettyPatch.rb
@@ -192,10 +192,6 @@ h1 :hover {
   font-style: italic;
 }
 
-.focused {
-  border: 1px solid blue;
-}
-
 .comment {
   position: relative;
 }
@@ -294,9 +290,13 @@ body {
 .comment button {
   width: 6em;
 }
+
+.focused {
+  border: 1px solid blue;
+}
 </style>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> 
-<script src="code-review.js?version=6"></script> 
+<script src="code-review.js?version=7"></script> 
 EOF
 
     def self.revisionOrDescription(string)
diff --git a/BugsSite/code-review.js b/BugsSite/code-review.js
index 4e3a66f..65f7b92 100644
--- a/BugsSite/code-review.js
+++ b/BugsSite/code-review.js
@@ -71,7 +71,7 @@
     line.attr('data-has-comment', 'true');
     line.addClass('commentContext');
 
-    var comment_block = $('<div class="comment"><textarea data-comment-for="' + line.attr('id') + '"></textarea><div class="actions"><button class="ok">Ok</button><button class="cancel">Cancel</button></div></div>');
+    var comment_block = $('<div class="comment"><textarea data-comment-for="' + line.attr('id') + '"></textarea><div class="actions"><button class="ok">Ok</button><button class="discard">Discard</button></div></div>');
     insertCommentFor(line, comment_block);
     comment_block.hide().slideDown('fast', function() {
       $(this).children('textarea').focus();
@@ -191,7 +191,7 @@
     $(document.body).append('<div class="overallComments"><div class="description">Overall comments:</div><textarea></textarea></div>');
   });
 
-  function cancelComment() {
+  function discardComment() {
     var line_id = $(this).parentsUntil('.comment').parent().find('textarea').attr('data-comment-for');
     var line = $('#' + line_id)
     findCommentBlockFor(line).slideUp('fast', function() {
@@ -206,12 +206,12 @@
     $(this).remove();
   }
 
-  $('.comment .cancel').live('click', cancelComment);
+  $('.comment .discard').live('click', discardComment);
 
   $('.comment .ok').live('click', function() {
     var comment_textarea = $(this).parentsUntil('.comment').parent().find('textarea');
     if (comment_textarea.val().trim() == '') {
-      cancelComment.call(this);
+      discardComment.call(this);
       return;
     }
     var line_id = comment_textarea.attr('data-comment-for');

-- 
WebKit Debian packaging