2011-02-20 Ojan Vafai <ojan@chromium.org>
authorojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Feb 2011 03:38:28 +0000 (03:38 +0000)
committerojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Feb 2011 03:38:28 +0000 (03:38 +0000)
        Reviewed by Adam Barth.

        [codereviewtool] avoid overriding ctrl/cmd + r
        https://bugs.webkit.org/show_bug.cgi?id=54852

        * code-review.js:

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

Websites/bugs.webkit.org/ChangeLog
Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
Websites/bugs.webkit.org/code-review.js

index bae1bd0..b682348 100644 (file)
@@ -1,3 +1,12 @@
+2011-02-20  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [codereviewtool] avoid overriding ctrl/cmd + r
+        https://bugs.webkit.org/show_bug.cgi?id=54852
+
+        * code-review.js:
+
 2011-02-16  Ojan Vafai  <ojan@chromium.org>
 
         Reviewed by Adam Barth.
 2011-02-16  Ojan Vafai  <ojan@chromium.org>
 
         Reviewed by Adam Barth.
index 4c84aa0..6218ae9 100644 (file)
@@ -451,7 +451,7 @@ div:focus {
 }
 </style>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> 
 }
 </style>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> 
-<script src="code-review.js?version=38"></script>
+<script src="code-review.js?version=39"></script>
 EOF
 
     def self.revisionOrDescription(string)
 EOF
 
     def self.revisionOrDescription(string)
index 4bd67fb..b391745 100644 (file)
@@ -1502,6 +1502,10 @@ var CODE_REVIEW_UNITTEST;
     if (e.target.nodeName == 'TEXTAREA')
       return;
 
     if (e.target.nodeName == 'TEXTAREA')
       return;
 
+    // Don't want to override browser shortcuts like ctrl+r.
+    if (e.metaKey || e.ctrlKey)
+      return;
+
     if (handleModifyContextKey(e))
       return;
 
     if (handleModifyContextKey(e))
       return;