Merge "Update jquery.ime from upstream"

This commit is contained in:
jenkins-bot
2013-04-03 23:26:46 +00:00
committed by Gerrit Code Review
5 changed files with 42 additions and 16 deletions

View File

@@ -112,6 +112,10 @@ span.ime-disable-shortcut {
text-align: left; text-align: left;
} }
.imeselector-menu.right {
right: auto;
}
.imeselector-menu ul { .imeselector-menu ul {
width: 100%; width: 100%;
padding: 0; padding: 0;
@@ -131,6 +135,11 @@ span.ime-disable-shortcut {
top: -7px; top: -7px;
} }
.imeselector-menu.right:before {
right: auto;
left: 9px;
}
.imeselector-menu:after { .imeselector-menu:after {
border-bottom: 6px solid #FFFFFF; border-bottom: 6px solid #FFFFFF;
border-left: 6px solid transparent; border-left: 6px solid transparent;
@@ -142,6 +151,12 @@ span.ime-disable-shortcut {
top: -6px; top: -6px;
} }
.imeselector-menu.right:after {
right: auto;
left: 10px;
}
.imeselector-menu.position-top:before { .imeselector-menu.position-top:before {
border-bottom: 0 none; border-bottom: 0 none;
border-top: 7px solid #888; border-top: 7px solid #888;

View File

@@ -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 * https://github.com/wikimedia/jquery.ime
* Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */
( function ( $ ) { ( function ( $ ) {
@@ -681,13 +681,14 @@
left = position.left + this.$element.outerWidth() left = position.left + this.$element.outerWidth()
- this.$imeSetting.outerWidth(); - this.$imeSetting.outerWidth();
room = $( window ).height() - top; room = $( window ).height() - top;
if ( room < this.$imeSetting.outerHeight() ) { if ( room < this.$imeSetting.outerHeight() ) {
top = position.top - this.$imeSetting.outerHeight(); top = position.top - this.$imeSetting.outerHeight();
this.$menu.css( 'top', this.$menu.css( 'top',
- ( this.$menu.outerHeight() + - ( this.$menu.outerHeight() +
this.$imeSetting.outerHeight() this.$imeSetting.outerHeight() )
) ) )
.addClass( 'position-top' ); .addClass( 'position-top' );
} }
@@ -698,10 +699,16 @@
} }
} ); } );
this.$imeSetting.css({ this.$imeSetting.css( {
top: top, top: top,
left: left left: left
}); } );
if ( parseInt( this.$menu.css( 'min-width' ) ) > left ) {
this.$menu
.css( { left: position.left } )
.addClass( 'right' );
}
}, },
/** /**
@@ -1631,10 +1638,6 @@
autonym: 'भोजपुरी', autonym: 'भोजपुरी',
inputmethods: [ 'hi-transliteration' ] inputmethods: [ 'hi-transliteration' ]
}, },
'ber': {
autonym: 'ⵜⵉⴼⵉⵏⴰⵖ',
inputmethods: [ 'ber-tfng' ]
},
'bn': { 'bn': {
autonym: 'বাংলা', autonym: 'বাংলা',
inputmethods: [ 'bn-avro', 'bn-inscript', 'bn-nkb', 'bn-probhat', 'bn-inscript2' ] inputmethods: [ 'bn-avro', 'bn-inscript', 'bn-nkb', 'bn-probhat', 'bn-inscript2' ]
@@ -1739,6 +1742,10 @@
autonym: 'कॉशुर / کٲشُر', autonym: 'कॉशुर / کٲشُر',
inputmethods: [ 'ks-inscript', 'ks-kbd' ] inputmethods: [ 'ks-inscript', 'ks-kbd' ]
}, },
'kab': {
autonym: 'ⵜⴰⵇⴱⴰⵢⵍⵉⵜ',
inputmethods: [ 'ber-tfng' ]
},
'kok': { 'kok': {
autonym: 'कोंकणी', autonym: 'कोंकणी',
inputmethods: [ 'kok-inscript2' ] inputmethods: [ 'kok-inscript2' ]
@@ -1808,7 +1815,7 @@
inputmethods: [ 'pa-transliteration', 'pa-inscript', 'pa-phonetic', 'pa-inscript2', 'pa-jhelum' ] inputmethods: [ 'pa-transliteration', 'pa-inscript', 'pa-phonetic', 'pa-inscript2', 'pa-jhelum' ]
}, },
'rif': { 'rif': {
autonym: 'ⵜⵉⴼⵉⵏⴰⵖ', autonym: 'ⵜⴰⵔⵉⴼⵉ',
inputmethods: [ 'ber-tfng' ] inputmethods: [ 'ber-tfng' ]
}, },
'ru': { 'ru': {
@@ -1836,7 +1843,7 @@
inputmethods: [ 'se-normforms' ] inputmethods: [ 'se-normforms' ]
}, },
'shi': { 'shi': {
autonym: 'ⵜⵉⴼⵉⵏⴰⵖ', autonym: 'ⵜⴰⵛⵍⵃⵉⵜ',
inputmethods: [ 'ber-tfng' ] inputmethods: [ 'ber-tfng' ]
}, },
'si': { 'si': {
@@ -1875,6 +1882,10 @@
autonym: 'цӀаӀхна миз', autonym: 'цӀаӀхна миз',
inputmethods: [ 'cyrl-palochka' ] inputmethods: [ 'cyrl-palochka' ]
}, },
'tzm': {
autonym: 'ⵜⴰⵎⴰⵣⵉⵖⵜ',
inputmethods: [ 'ber-tfng' ]
},
'uk': { 'uk': {
autonym: 'Українська', autonym: 'Українська',
inputmethods: [ 'uk-kbd' ] inputmethods: [ 'uk-kbd' ]