vanilla ckeditor-3.6.3

[ckeditor.git] / _source / core / dom / event.js

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