Merge branch 't/9829' into major

ckeditor · Feb 13, 2013 · 0b94e09 · 0b94e09
2 parents 87e128d + 0249356
commit 0b94e09
Show file tree

Hide file tree

Showing 39 changed files with 1,906 additions and 297 deletions.
diff --git a/core/command.js b/core/command.js
@@ -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;

diff --git a/core/creators/themedui.js b/core/creators/themedui.js
@@ -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}' +

diff --git a/core/editor.js b/core/editor.js
@@ -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 );
 		}
 	});
 })();