vanilla ckeditor-3.4.2

[ckeditor.git] / _source / plugins / stylescombo / plugin.js

diff --git a/_source/plugins/stylescombo/plugin.js b/_source/plugins/stylescombo/plugin.js
index 8ed7f9b..fb44d5c 100644 (file)
--- a/_source/plugins/stylescombo/plugin.js
+++ b/_source/plugins/stylescombo/plugin.js
@@ -26,7 +26,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        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
@@ -34,6 +34,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                                        style = styles[ styleName ] = new CKEDITOR.style( styleDefinition );\r
                                                        style._name = styleName;\r
+                                                       style._.enterMode = config.enterMode;\r
 \r
                                                        stylesList.push( style );\r
                                                }\r
@@ -70,7 +71,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                // 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
@@ -107,6 +108,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \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
 \r
@@ -123,7 +126,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                        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
@@ -151,9 +154,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                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