X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fdom%2Fevent.js;h=618a11035c156d89da83689851e876fd4f111ad3;hb=refs%2Ftags%2Fv3.6.2;hp=765c82c4497fa2480c9a02aece1d150555629e9e;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git

diff --git a/_source/core/dom/event.js b/_source/core/dom/event.js
index 765c82c..618a110 100644
--- a/_source/core/dom/event.js
+++ b/_source/core/dom/event.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -87,13 +87,18 @@ CKEDITOR.dom.event.prototype =
 			$.returnValue = false;
 
 		if ( stopPropagation )
-		{
-			if ( $.stopPropagation )
-				$.stopPropagation();
-			else
-				$.cancelBubble = true;
-		}
+			this.stopPropagation();
 	},
+
+	stopPropagation : function()
+	{
+		var $ = this.$;
+		if ( $.stopPropagation )
+			$.stopPropagation();
+		else
+			$.cancelBubble = true;
+	},
+
 	/**
 	 * Returns the DOM node where the event was targeted to.
 	 * @returns {CKEDITOR.dom.node} The target DOM node.
@@ -115,23 +120,26 @@ CKEDITOR.dom.event.prototype =
 	}
 };
 
+// For the followind constants, we need to go over the Unicode boundaries
+// (0x10FFFF) to avoid collision.
+
 /**
- * CTRL key (1000).
+ * CTRL key (0x110000).
  * @constant
  * @example
  */
-CKEDITOR.CTRL = 1000;
+CKEDITOR.CTRL = 0x110000;
 
 /**
- * SHIFT key (2000).
+ * SHIFT key (0x220000).
  * @constant
  * @example
  */
-CKEDITOR.SHIFT = 2000;
+CKEDITOR.SHIFT = 0x220000;
 
 /**
- * ALT key (4000).
+ * ALT key (0x440000).
  * @constant
  * @example
  */
-CKEDITOR.ALT = 4000;
+CKEDITOR.ALT = 0x440000;