http://www.mediawiki.org/wiki/Special:Code/MediaWiki/86853
Revision: 86853
Author: janpaul123
Date: 2011-04-25 12:26:20 +0000 (Mon, 25 Apr 2011)
Log Message:
-----------
Fixes bug 24088: WikiEditor toolbar RTL icons
Modified Paths:
--------------
trunk/extensions/WikiEditor/modules/images/toolbar/button-sprite.png
trunk/extensions/WikiEditor/modules/jquery.wikiEditor.js
trunk/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
Added Paths:
-----------
trunk/extensions/WikiEditor/modules/images/toolbar/format-indent-rtl.png
trunk/extensions/WikiEditor/modules/images/toolbar/format-olist-rtl.png
trunk/extensions/WikiEditor/modules/images/toolbar/format-ulist-rtl.png
trunk/extensions/WikiEditor/modules/images/toolbar/insert-redirect-rtl.png
Modified: trunk/extensions/WikiEditor/modules/images/toolbar/button-sprite.png
===================================================================
(Binary files differ)
Added: trunk/extensions/WikiEditor/modules/images/toolbar/format-indent-rtl.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/WikiEditor/modules/images/toolbar/format-indent-rtl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/extensions/WikiEditor/modules/images/toolbar/format-olist-rtl.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/WikiEditor/modules/images/toolbar/format-olist-rtl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/extensions/WikiEditor/modules/images/toolbar/format-ulist-rtl.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/WikiEditor/modules/images/toolbar/format-ulist-rtl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added:
trunk/extensions/WikiEditor/modules/images/toolbar/insert-redirect-rtl.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/WikiEditor/modules/images/toolbar/insert-redirect-rtl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/extensions/WikiEditor/modules/jquery.wikiEditor.js
===================================================================
--- trunk/extensions/WikiEditor/modules/jquery.wikiEditor.js 2011-04-25
12:19:16 UTC (rev 86852)
+++ trunk/extensions/WikiEditor/modules/jquery.wikiEditor.js 2011-04-25
12:26:20 UTC (rev 86853)
@@ -149,14 +149,16 @@
},
/**
* Provides a way to extract a property of an object in a certain
language, falling back on the property keyed as
- * 'default'. If such key doesn't exist, the object itself is
considered the actual value, which should ideally
- * be the case so that you may use a string or object of any number of
strings keyed by language with a default.
+ * 'default' or 'default-rtl'. If such key doesn't exist, the object
itself is considered the actual value, which
+ * should ideally be the case so that you may use a string or object of
any number of strings keyed by language
+ * with a default.
*
* @param object Object to extract property from
* @param lang Language code, defaults to wgUserLanguage
*/
'autoLang': function( object, lang ) {
- return object[lang || wgUserLanguage] || object['default'] ||
object;
+ var defaultKey = $( 'body' ).hasClass( 'rtl' ) ? 'default-rtl'
: 'default';
+ return object[lang || wgUserLanguage] || object[defaultKey] ||
object['default'] || object;
},
/**
* Provides a way to extract the path of an icon in a certain language,
automatically appending a version number for
Modified:
trunk/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
===================================================================
--- trunk/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
2011-04-25 12:19:16 UTC (rev 86852)
+++ trunk/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
2011-04-25 12:26:20 UTC (rev 86853)
@@ -261,8 +261,14 @@
'ulist': {
'labelMsg':
'wikieditor-toolbar-tool-ulist',
'type': 'button',
- 'icon':
'format-ulist.png',
- 'offset': [2, -1366],
+ 'icon': {
+ 'default':
'format-ulist.png',
+ 'default-rtl':
'format-ulist-rtl.png'
+ },
+ 'offset': {
+ 'default': [2,
-1366],
+ 'default-rtl':
[-70, -286]
+ },
'action': {
'type':
'encapsulate',
'options': {
@@ -277,8 +283,14 @@
'olist': {
'labelMsg':
'wikieditor-toolbar-tool-olist',
'type': 'button',
- 'icon':
'format-olist.png',
- 'offset': [2, -1078],
+ 'icon': {
+ 'default':
'format-olist.png',
+ 'default-rtl':
'format-olist-rtl.png'
+ },
+ 'offset': {
+ 'default': [2,
-1078],
+ 'default-rtl':
[-70, -358]
+ },
'action': {
'type':
'encapsulate',
'options': {
@@ -293,8 +305,14 @@
'indent': {
'labelMsg':
'wikieditor-toolbar-tool-indent',
'type': 'button',
- 'icon':
'format-indent.png',
- 'offset': [2, -646],
+ 'icon': {
+ 'default':
'format-indent.png',
+ 'default-rtl':
'format-indent-rtl.png'
+ },
+ 'offset': {
+ 'default': [2,
-646],
+ 'default-rtl':
[-70, -430]
+ },
'action': {
'type':
'encapsulate',
'options': {
@@ -433,8 +451,14 @@
'redirect': {
'labelMsg':
'wikieditor-toolbar-tool-redirect',
'type': 'button',
- 'icon':
'insert-redirect.png',
- 'offset': [-70, -142],
+ 'icon': {
+ 'default':
'insert-redirect.png',
+ 'default-rtl':
'insert-redirect-rtl.png'
+ },
+ 'offset': {
+ 'default':
[-70, -142],
+ 'default-rtl':
[-70, -502],
+ },
'action': {
'type':
'encapsulate',
'options': {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
