Skip to content
Permalink
Browse files

Merge branch 't/10864' into major

  • Loading branch information...
Reinmar committed Oct 14, 2013
2 parents 0ddd5f0 + 63dc037 commit 4bafac0091684f4303f3e38df3c53f2454c3e949
Showing with 16 additions and 16 deletions.
  1. +16 −16 plugins/widget/plugin.js
@@ -199,8 +199,6 @@
// Create prototyped copy of original widget definition, so we won't modify it.
widgetDef = CKEDITOR.tools.prototypedCopy( widgetDef );
widgetDef.name = name;
widgetDef.repository = this;
widgetDef.definition = widgetDef;

widgetDef._ = widgetDef._ || {};

@@ -756,6 +754,22 @@
*/
focusedEditable: null,

/**
* The widget definition from which this instance was created.
*
* @readonly
* @property {CKEDITOR.plugins.widget.definition} definition
*/
definition: widgetDef,

/**
* Link to the widget repository which created this instance.
*
* @readonly
* @property {CKEDITOR.plugins.widget.repository} repository
*/
repository: widgetsRepo,

// WAAARNING: Overwrite widgetDef's priv object, because otherwise violent unicorn's gonna visit you.
_: {
downcastFn: ( widgetDef.downcast && typeof widgetDef.downcast == 'string' ) ?
@@ -773,20 +787,6 @@
* @property {Object} parts
*/

/**
* The widget definition from which this instance was created.
*
* @readonly
* @property {CKEDITOR.plugins.widget.definition} definition
*/

/**
* Link to the widget repository which created this instance.
*
* @readonly
* @property {CKEDITOR.plugins.widget.repository} repository
*/

/**
* The template which will be used to create a new widget element (when the widget's command is executed).
* It will be populated with {@link #defaults default values}.

0 comments on commit 4bafac0

Please sign in to comment.
You can’t perform that action at this time.