wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 10:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add OO.ui.Element.getDir

Browse source 
Stop using this.$.frame.dir - a horrible hack made of duct tape
and bubble gum.

Or perhaps rather, masking tape and post-it-notes...

Change-Id: I53690e4485974b95edbdd255c0b96c2f639c5261
This commit is contained in:
Trevor Parscal 2013-11-01 15:43:09 -07:00 committed by Roan Kattouw
parent db9f941fa6
commit 4c3a49dfc0
3 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
modules/oojs-ui/OO.ui.Element.js
View file

@ -82,22 +82,22 @@ OO.ui.Element.getJQuery = function ( context, frame ) {
* Get the document of an element.
*
* @static
* @param {jQuery|HTMLElement|HTMLDocument|Window} context Context to bind the function to
* @param {jQuery|HTMLElement|HTMLDocument|Window} obj Object to get the document for
* @returns {HTMLDocument} Document object
* @throws {Error} If context is invalid
*/
OO.ui.Element.getDocument = function ( context ) {
OO.ui.Element.getDocument = function ( obj ) {
var doc =
// jQuery - selections created "offscreen" won't have a context, so .context isn't reliable
( context[0] && context[0].ownerDocument ) ||
( obj[0] && obj[0].ownerDocument ) ||
// Empty jQuery selections might have a context
context.context ||
obj.context ||
// HTMLElement
context.ownerDocument ||
obj.ownerDocument ||
// Window
context.document ||
obj.document ||
// HTMLDocument
( context.nodeType === 9 && context );
( obj.nodeType === 9 && obj );
if ( doc ) {
return doc;
@ -110,14 +110,38 @@ OO.ui.Element.getDocument = function ( context ) {
* Get the window of an element or document.
*
* @static
* @param {jQuery|HTMLElement|HTMLDocument|Window} context Context to bind the function to
* @param {jQuery|HTMLElement|HTMLDocument|Window} obj Context to get the window for
* @returns {Window} Window object
*/
OO.ui.Element.getWindow = function ( context ) {
var doc = this.getDocument( context );
OO.ui.Element.getWindow = function ( obj ) {
var doc = this.getDocument( obj );
return doc.parentWindow || doc.defaultView;
};
/**
* Get the direction of an element or document.
*
* @static
* @param {jQuery|HTMLElement|HTMLDocument|Window} obj Context to get the direction for
* @returns {string} Text direction, either `ltr` or `rtl`
*/
OO.ui.Element.getDir = function ( obj ) {
var isDoc, isWin;
if ( obj instanceof jQuery ) {
obj = obj[0];
}
isDoc = obj.nodeType === 9;
isWin = obj.document !== undefined;
if ( isDoc || isWin ) {
if ( isWin ) {
obj = obj.document;
}
obj = obj.body;
}
return $( obj ).css( 'direction' );
};
/**
* Get the offset between two frames.
*

2
modules/oojs-ui/layouts/OO.ui.GridLayout.js
View file

@ -139,7 +139,7 @@ OO.ui.GridLayout.prototype.update = function () {
'top': Math.round( top * 100 ) + '%'
};
// If RTL, reverse:
if ( this.$.frame.dir === 'rtl' ) {
if ( OO.ui.Element.getDir( this.$.context ) === 'rtl' ) {
dimensions.right = Math.round( left * 100 ) + '%';
} else {
dimensions.left = Math.round( left * 100 ) + '%';

2
modules/oojs-ui/layouts/OO.ui.PanelLayout.js
View file

@ -34,7 +34,7 @@ OO.ui.PanelLayout = function OoUiPanelLayout( config ) {
}
// Add directionality class:
this.$element.addClass( 'oo-ui-' + this.$.frame.dir );
this.$element.addClass( 'oo-ui-' + OO.ui.Element.getDir( this.$.context ) );
};
/* Inheritance */