vanilla ckeditor-3.6.6.1

[ckeditor.git] / _source / core / ui.js

diff --git a/_source/core/ui.js b/_source/core/ui.js
index 2fdbde9..005dc13 100644 (file)
--- a/_source/core/ui.js
+++ b/_source/core/ui.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -71,6 +71,9 @@ CKEDITOR.ui.prototype =
 \r
                var result = handler && handler.create.apply( this, item.args );\r
 \r
+               // Allow overrides from skin ui definitions..\r
+               item && ( result = CKEDITOR.tools.extend( result, this._.editor.skin[ item.type ], true ) );\r
+\r
                // Add reference inside command object.\r
                if ( command )\r
                        command.uiItems.push( result );\r
@@ -116,3 +119,10 @@ CKEDITOR.event.implementOn( CKEDITOR.ui );
  *         }\r
  *     });\r
  */\r
+\r
+/**\r
+ * Internal event fired when a new UI element is ready\r
+ * @name CKEDITOR.ui#ready\r
+ * @event\r
+ * @param {Object} element The new element\r
+ */\r