Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.6.6
[ckeditor.git]
/
_source
/
core
/
ui.js
diff --git
a/_source/core/ui.js
b/_source/core/ui.js
index
0a66c2e
..
005dc13
100644
(file)
--- a/
_source/core/ui.js
+++ b/
_source/core/ui.js
@@
-1,5
+1,5
@@
/*
\r
/*
\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
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
\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
// Add reference inside command object.
\r
if ( command )
\r
command.uiItems.push( result );
\r
@@
-91,6
+94,8
@@
CKEDITOR.ui.prototype =
}
\r
};
\r
\r
}
\r
};
\r
\r
+CKEDITOR.event.implementOn( CKEDITOR.ui );
\r
+
\r
/**
\r
* (Virtual Class) Do not call this constructor. This class is not really part
\r
* of the API. It just illustrates the features of hanlder objects to be
\r
/**
\r
* (Virtual Class) Do not call this constructor. This class is not really part
\r
* of the API. It just illustrates the features of hanlder objects to be
\r
@@
-114,3
+119,10
@@
CKEDITOR.ui.prototype =
* }
\r
* });
\r
*/
\r
* }
\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