Merge branch 'release-0.6.x'

djblets · Jun 13, 2012 · 7ccca50 · 7ccca50
2 parents 82b13c0 + f49584c
commit 7ccca50
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -2,7 +2,6 @@ Lead Developers:
 
 	* Christian Hammond
 	* David Trowbridge
-	* Micah Dowty
 
 
 Contributors:
@@ -18,6 +17,7 @@ Contributors:
 	* Kalil Amlani
 	* Kevin Quinn
 	* Lee Loucks
+	* Micah Dowty
 	* Onkar Shinde
 	* Paolo Borelli
 	* Simon Wu

diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+version 0.6.19 final (11-June-2012):
+	* JavaScript:
+		* inlineEditor no longer bubbles keypress events up. This helps prevent
+		  problems with global key handlers being greedy.
+
+
 version 0.6.18 final (5-June-2012):
 	* djblets.siteconfig:
 		* Settings form rows in the template now have IDs indicating the row

diff --git a/djblets/media/js/jquery.gravy.js b/djblets/media/js/jquery.gravy.js
@@ -358,6 +358,9 @@ $.widget("ui.inlineEditor", {
                         break;
                 }
             })
+            .keypress(function(e) {
+                e.stopPropagation();
+            })
             .keyup(function(e) {
                 self._updateDirtyState();
             });