/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
styleName;\r
\r
// Put all styles into an Array.\r
- for ( var i = 0 ; i < stylesDefinitions.length ; i++ )\r
+ for ( var i = 0, count = stylesDefinitions.length ; i < count ; i++ )\r
{\r
var styleDefinition = stylesDefinitions[ i ];\r
\r
// Loop over the Array, adding all items to the\r
// combo.\r
var lastType;\r
- for ( var i = 0 ; i < stylesList.length ; i++ )\r
+ for ( var i = 0, count = stylesList.length ; i < count ; i++ )\r
{\r
style = stylesList[ i ];\r
styleName = style._name;\r
\r
var elementPath = new CKEDITOR.dom.elementPath( selection.getStartElement() );\r
\r
- if ( style.type == CKEDITOR.STYLE_INLINE && style.checkActive( elementPath ) )\r
- style.remove( editor.document );\r
- else if ( style.type == CKEDITOR.STYLE_OBJECT && style.checkActive( elementPath ) )\r
- style.remove( editor.document );\r
- else\r
- style.apply( editor.document );\r
+ style[ style.checkActive( elementPath ) ? 'remove' : 'apply' ]( editor.document );\r
\r
editor.fire( 'saveSnapshot' );\r
},\r
elements = elementPath.elements;\r
\r
// For each element into the elements path.\r
- for ( var i = 0, element ; i < elements.length ; i++ )\r
+ for ( var i = 0, count = elements.length, element ; i < count ; i++ )\r
{\r
element = elements[i];\r
\r
if ( CKEDITOR.env.ie || CKEDITOR.env.webkit )\r
editor.focus();\r
\r
- var selection = editor.getSelection();\r
-\r
- var element = selection.getSelectedElement(),\r
+ var selection = editor.getSelection(),\r
+ element = selection.getSelectedElement(),\r
elementPath = new CKEDITOR.dom.elementPath( element || selection.getStartElement() );\r
\r
var counter = [ 0, 0, 0, 0 ];\r