Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57260
Change subject: Update jquery.ime from upstream
......................................................................
Update jquery.ime from upstream
Fixes the positioning of the menu if there is not enough space
in the left side.
Bug: 41738
Change-Id: I64d40acb41559b0b6376c03a4076d17dcedbc466
---
M lib/jquery.ime/css/jquery.ime.css
M lib/jquery.ime/jquery.ime.js
M lib/jquery.ime/rules/mni/mni-inscript2.js
M lib/jquery.ime/rules/my/my-xkb.js
M lib/jquery.ime/rules/ur/ur-phonetic.js
5 files changed, 42 insertions(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/60/57260/1
diff --git a/lib/jquery.ime/css/jquery.ime.css
b/lib/jquery.ime/css/jquery.ime.css
index 3506912..7ded2c2 100644
--- a/lib/jquery.ime/css/jquery.ime.css
+++ b/lib/jquery.ime/css/jquery.ime.css
@@ -112,6 +112,10 @@
text-align: left;
}
+.imeselector-menu.right {
+ right: auto;
+}
+
.imeselector-menu ul {
width: 100%;
padding: 0;
@@ -131,6 +135,11 @@
top: -7px;
}
+.imeselector-menu.right:before {
+ right: auto;
+ left: 9px;
+}
+
.imeselector-menu:after {
border-bottom: 6px solid #FFFFFF;
border-left: 6px solid transparent;
@@ -142,6 +151,12 @@
top: -6px;
}
+
+.imeselector-menu.right:after {
+ right: auto;
+ left: 10px;
+}
+
.imeselector-menu.position-top:before {
border-bottom: 0 none;
border-top: 7px solid #888;
diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 974f353..159e5cb 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0 - 2013-03-13
+/*! jquery.ime - v0.1.0 - 2013-04-03
* https://github.com/wikimedia/jquery.ime
* Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */
( function ( $ ) {
@@ -681,13 +681,14 @@
left = position.left + this.$element.outerWidth()
- this.$imeSetting.outerWidth();
room = $( window ).height() - top;
+
if ( room < this.$imeSetting.outerHeight() ) {
top = position.top -
this.$imeSetting.outerHeight();
this.$menu.css( 'top',
- - (
this.$menu.outerHeight() +
-
this.$imeSetting.outerHeight()
- ) )
+ - ( this.$menu.outerHeight() +
+ this.$imeSetting.outerHeight() )
+ )
.addClass( 'position-top' );
}
@@ -698,10 +699,16 @@
}
} );
- this.$imeSetting.css({
+ this.$imeSetting.css( {
top: top,
left: left
- });
+ } );
+
+ if ( parseInt( this.$menu.css( 'min-width' ) ) > left )
{
+ this.$menu
+ .css( { left: position.left } )
+ .addClass( 'right' );
+ }
},
/**
@@ -1631,10 +1638,6 @@
autonym: 'भोजपुरी',
inputmethods: [ 'hi-transliteration' ]
},
- 'ber': {
- autonym: 'ⵜⵉⴼⵉⵏⴰⵖ',
- inputmethods: [ 'ber-tfng' ]
- },
'bn': {
autonym: 'বাংলা',
inputmethods: [ 'bn-avro', 'bn-inscript', 'bn-nkb',
'bn-probhat', 'bn-inscript2' ]
@@ -1739,6 +1742,10 @@
autonym: 'कॉशुर / کٲشُر',
inputmethods: [ 'ks-inscript', 'ks-kbd' ]
},
+ 'kab': {
+ autonym: 'ⵜⴰⵇⴱⴰⵢⵍⵉⵜ',
+ inputmethods: [ 'ber-tfng' ]
+ },
'kok': {
autonym: 'कोंकणी',
inputmethods: [ 'kok-inscript2' ]
@@ -1808,7 +1815,7 @@
inputmethods: [ 'pa-transliteration', 'pa-inscript',
'pa-phonetic', 'pa-inscript2', 'pa-jhelum' ]
},
'rif': {
- autonym: 'ⵜⵉⴼⵉⵏⴰⵖ',
+ autonym: 'ⵜⴰⵔⵉⴼⵉⵜ',
inputmethods: [ 'ber-tfng' ]
},
'ru': {
@@ -1836,7 +1843,7 @@
inputmethods: [ 'se-normforms' ]
},
'shi': {
- autonym: 'ⵜⵉⴼⵉⵏⴰⵖ',
+ autonym: 'ⵜⴰⵛⵍⵃⵉⵜ',
inputmethods: [ 'ber-tfng' ]
},
'si': {
@@ -1875,6 +1882,10 @@
autonym: 'цӀаӀхна миз',
inputmethods: [ 'cyrl-palochka' ]
},
+ 'tzm': {
+ autonym: 'ⵜⴰⵎⴰⵣⵉⵖⵜ',
+ inputmethods: [ 'ber-tfng' ]
+ },
'uk': {
autonym: 'Українська',
inputmethods: [ 'uk-kbd' ]
diff --git a/lib/jquery.ime/rules/mni/mni-inscript2.js
b/lib/jquery.ime/rules/mni/mni-inscript2.js
index 473b356..a80b3ba 100644
--- a/lib/jquery.ime/rules/mni/mni-inscript2.js
+++ b/lib/jquery.ime/rules/mni/mni-inscript2.js
@@ -93,7 +93,7 @@
['w', 'ৈ'],
['x', 'ং'],
['y', 'ব']
- ],
+ ],
patterns_x: [
['\\!', '৴'],
['1', ''],
diff --git a/lib/jquery.ime/rules/my/my-xkb.js
b/lib/jquery.ime/rules/my/my-xkb.js
index 67521c8..2959b00 100644
--- a/lib/jquery.ime/rules/my/my-xkb.js
+++ b/lib/jquery.ime/rules/my/my-xkb.js
@@ -108,7 +108,7 @@
['\\>', '\u104B'],
['/', '/'],
['\\?', '?']
- ],
+ ],
patterns_x: [
['`', '`'],
['\\~', '~'],
diff --git a/lib/jquery.ime/rules/ur/ur-phonetic.js
b/lib/jquery.ime/rules/ur/ur-phonetic.js
index d8511cd..d0d0235 100644
--- a/lib/jquery.ime/rules/ur/ur-phonetic.js
+++ b/lib/jquery.ime/rules/ur/ur-phonetic.js
@@ -10,7 +10,7 @@
license: 'GPLv3',
version: '1.0',
patterns: [
- ['!', '!'],
+ ['!', '!'],
['1', '۱'],
['\\@', ''],
['2', '۲'],
@@ -104,7 +104,7 @@
['\\^', 'ۖ'],
['\\&', 'ٔ'],
['\\*', 'ٌ']]
- };
+ };
$.ime.register( urPhonetic );
}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/57260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64d40acb41559b0b6376c03a4076d17dcedbc466
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
