vanilla ckeditor-3.4.2

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

diff --git a/_source/core/dom/element.js b/_source/core/dom/element.js
index 77031f0..6c62613 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
@@ -1170,13 +1170,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
@@ -1545,12 +1545,20 @@ CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype,
                                                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
+                                                       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
+               /**\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