Skip to content
Permalink
Browse files

Merge branch 't/9829' into major

  • Loading branch information...
Reinmar committed Feb 13, 2013
2 parents 87e128d + 0249356 commit 0b94e097956cd63d86e2717a2470d328529c2cef
@@ -43,8 +43,12 @@ CKEDITOR.command = function( editor, commandDefinition ) {
if ( this.state == CKEDITOR.TRISTATE_DISABLED )
return false;

// Test if this command is allowed.
if ( !editor.filter.checkFeature( this ) )
return false;

if ( this.editorFocus ) // Give editor focus if necessary (#4355).
editor.focus();
editor.focus();

if ( this.fire( 'exec' ) === false )
return true;
@@ -302,7 +302,7 @@ CKEDITOR.replaceClass = 'ckeditor';

// Get the HTML for the predefined spaces.
var topHtml = editor.fire( 'uiSpace', { space: 'top', html: '' } ).html;
var bottomHtml = editor.fireOnce( 'uiSpace', { space: 'bottom', html: '' } ).html;
var bottomHtml = editor.fire( 'uiSpace', { space: 'bottom', html: '' } ).html;

if ( !themedTpl ) {
themedTpl = CKEDITOR.addTemplate( 'maincontainer', '<{outerEl}' +
@@ -325,6 +325,7 @@
function initComponents( editor ) {
// Documented in dataprocessor.js.
editor.dataProcessor = new CKEDITOR.htmlDataProcessor( editor );
editor.filter = new CKEDITOR.filter( editor );
loadSkin( editor );
}

@@ -941,6 +942,16 @@
else
delete keystrokes[ keystroke ];
}
},

/**
* Shorthand for {@link CKEDITOR.filter#addFeature}.
*
* @param feature See {@link CKEDITOR.filter#addFeature}.
* @returns {Boolean} See {@link CKEDITOR.filter#addFeature}.
*/
addFeature: function( feature ) {
return this.filter.addFeature( feature );
}
});
})();
Oops, something went wrong.

0 comments on commit 0b94e09

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