vanilla ckeditor-3.4.1

[ckeditor.git] / _source / core / dom / element.js

diff --git a/_source/core/dom/element.js b/_source/core/dom/element.js
index b2f9bcc..77031f0 100644 (file)
--- a/_source/core/dom/element.js
+++ b/_source/core/dom/element.js
@@ -789,7 +789,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype,
                        {\r
                                var child = children.getItem( i );\r
 \r
-                               if ( child.type == CKEDITOR.NODE_ELEMENT && child.getAttribute( '_fck_bookmark' ) )\r
+                               if ( child.type == CKEDITOR.NODE_ELEMENT && child.getAttribute( '_cke_bookmark' ) )\r
                                        continue;\r
 \r
                                if ( child.type == CKEDITOR.NODE_ELEMENT && !child.isEmptyInlineRemoveable()\r
@@ -917,7 +917,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype,
                                        // queuing them to be moved later. (#5567)\r
                                        var pendingNodes = [];\r
 \r
-                                       while ( sibling.getAttribute( '_fck_bookmark' )\r
+                                       while ( sibling.getAttribute( '_cke_bookmark' )\r
                                                || sibling.isEmptyInlineRemoveable() )\r
                                        {\r
                                                pendingNodes.push( sibling );\r
@@ -1522,5 +1522,35 @@ CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype,
                                        if ( !event.data.getTarget().hasClass( 'cke_enable_context_menu' ) )\r
                                                event.data.preventDefault();\r
                                } );\r
-               }\r
+               },\r
+\r
+               /**\r
+                *  Update the element's size with box model awareness.\r
+                * @name CKEDITOR.dom.element.setSize\r
+                * @param {String} type [width|height]\r
+                * @param {Number} size The length unit in px.\r
+                * @param isBorderBox Apply the {@param width} and {@param height} based on border box model.\r
+                */\r
+               setSize : ( function()\r
+               {\r
+                       var sides = {\r
+                               width : [ "border-left-width", "border-right-width","padding-left", "padding-right" ],\r
+                               height : [ "border-top-width", "border-bottom-width", "padding-top",  "padding-bottom" ]\r
+                       };\r
+\r
+                       return function( type, size, isBorderBox )\r
+                               {\r
+                                       if ( typeof size == 'number' )\r
+                                       {\r
+                                               if ( isBorderBox && !( CKEDITOR.env.ie && CKEDITOR.env.quirks ) )\r
+                                               {\r
+                                                       var     adjustment = 0;\r
+                                                       for ( var i = 0, len = sides [ type ].length; i < len; i++ )\r
+                                                               adjustment += parseInt( this.getComputedStyle( sides [ type ][ i ] ) || 0, 10 );\r
+                                                       size -= adjustment;\r
+                                               }\r
+                                               this.setStyle( type, size + 'px' );\r
+                                       }\r
+                               };\r
+               })()\r
        });\r