vanilla ckeditor-3.4.3

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

diff --git a/_source/core/dom/element.js b/_source/core/dom/element.js
index b2f9bcc..48b0d26 100644 (file)
--- a/_source/core/dom/element.js
+++ b/_source/core/dom/element.js
@@ -88,7 +88,7 @@ CKEDITOR.dom.element.setMarker = function( database, element, name, value )
 CKEDITOR.dom.element.clearAllMarkers = function( database )\r
 {\r
        for ( var i in database )\r
-               CKEDITOR.dom.element.clearMarkers( database, database[i], true );\r
+               CKEDITOR.dom.element.clearMarkers( database, database[i], 1 );\r
 };\r
 \r
 CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatabase )\r
@@ -613,7 +613,7 @@ CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype,
                        // Cache the lowercased name inside a closure.\r
                        var nodeName = this.$.nodeName.toLowerCase();\r
 \r
-                       if ( CKEDITOR.env.ie )\r
+                       if ( CKEDITOR.env.ie && ! ( document.documentMode > 8 ) )\r
                        {\r
                                var scopeName = this.$.scopeName;\r
                                if ( scopeName != 'HTML' )\r
@@ -721,9 +721,6 @@ CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype,
                        var thisLength = thisAttribs.length,\r
                                otherLength = otherAttribs.length;\r
 \r
-                       if ( !CKEDITOR.env.ie && thisLength != otherLength )\r
-                               return false;\r
-\r
                        for ( var i = 0 ; i < thisLength ; i++ )\r
                        {\r
                                var attribute = thisAttribs[ i ];\r
@@ -789,7 +786,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 +914,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
@@ -1170,13 +1167,13 @@ CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype,
                                function()\r
                                {\r
                                        this.$.style.MozUserSelect = 'none';\r
-                                       this.on( 'dragstart', function (evt) { evt.data.preventDefault(); } );\r
+                                       this.on( 'dragstart', function( evt ) { evt.data.preventDefault(); } );\r
                                }\r
                        : CKEDITOR.env.webkit ?\r
                                function()\r
                                {\r
                                        this.$.style.KhtmlUserSelect = 'none';\r
-                                       this.on( 'dragstart', function (evt) { evt.data.preventDefault(); } );\r
+                                       this.on( 'dragstart', function( evt ) { evt.data.preventDefault(); } );\r
                                }\r
                        :\r
                                function()\r
@@ -1522,5 +1519,43 @@ 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
+                *  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 ) || 0;\r
+                                                       size -= adjustment;\r
+                                               }\r
+                                               this.setStyle( type, size + 'px' );\r
+                                       }\r
+                               };\r
+               })(),\r
+\r
+               /**\r
+                * Gets element's direction. Supports both CSS 'direction' prop and 'dir' attr.\r
+                */\r
+               getDirection : function( useComputed )\r
+               {\r
+                       return useComputed ? this.getComputedStyle( 'direction' ) : this.getStyle( 'direction' ) || this.getAttribute( 'dir' );\r
                }\r
        });\r