From 7ac7b6dde452c56c73433b9a40d6158f49d89126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Mon, 11 Apr 2016 14:29:32 +0200 Subject: [PATCH] Update jquery.uls from upstream to 40e67f5 * 20d5e4 Some cleanup to the language filter * bf0c55 Remove unwanted script related code in search method And l10n updates. Change-Id: Iad1bcf4dca611e2004d9fdec776dce14a5f669b2 --- lib/jquery.uls/css/jquery.uls.compact.css | 14 +- lib/jquery.uls/css/jquery.uls.css | 128 +++++++++++------- lib/jquery.uls/i18n/ba.json | 21 +++ lib/jquery.uls/i18n/glk.json | 21 +++ lib/jquery.uls/i18n/gu.json | 2 +- lib/jquery.uls/i18n/sd.json | 21 +++ lib/jquery.uls/src/jquery.uls.core.js | 20 ++- .../src/jquery.uls.languagefilter.js | 38 ++---- 8 files changed, 165 insertions(+), 100 deletions(-) create mode 100644 lib/jquery.uls/i18n/ba.json create mode 100644 lib/jquery.uls/i18n/glk.json create mode 100644 lib/jquery.uls/i18n/sd.json diff --git a/lib/jquery.uls/css/jquery.uls.compact.css b/lib/jquery.uls/css/jquery.uls.compact.css index ca06df8a..c53bf927 100644 --- a/lib/jquery.uls/css/jquery.uls.compact.css +++ b/lib/jquery.uls/css/jquery.uls.compact.css @@ -10,7 +10,7 @@ .uls-compact .uls-search { background: white; border-top: none; - padding: 0.8em 10%; + padding: 5px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #DDD; @@ -31,18 +31,6 @@ height: 20em; } -.uls-compact .uls-search-label { - background-size: 25px; - height: 26px; - width: 26px; - float: right; - opacity: 0.8; -} - -.uls-compact .uls-languagefilter-clear { - margin-left: 0; -} - .uls-compact .uls-title-region a { color: #777; display: inline-block; diff --git a/lib/jquery.uls/css/jquery.uls.css b/lib/jquery.uls/css/jquery.uls.css index f1fde4db..ba300334 100644 --- a/lib/jquery.uls/css/jquery.uls.css +++ b/lib/jquery.uls/css/jquery.uls.css @@ -49,6 +49,16 @@ min-width: 150px; } +/* Leave more space for search input */ +.uls-narrow .uls-search-label { + background-size: 15px; + width: 20px; +} + +.uls-narrow .uls-search-wrapper { + padding-left: 20px; +} + .uls-title-region a { padding-left: 15px; } @@ -116,24 +126,7 @@ div.uls-region { cursor: pointer; } -.uls-menu .uls-languagefilter { - background-color: transparent; - border: 1px solid #c9c9c9; - border-radius: 2px 2px 2px 2px; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset; - color: #333; - display: block; - padding: 6px; - -moz-transition: border 0.15s linear 0s; - -o-transition: border 0.15s linear 0s; - -webkit-transition: border 0.15s linear 0s; - transition: border 0.15s linear 0s; -} -.uls-menu .uls-languagefilter:focus { - border: 1px solid #3366bb; -} -.uls-menu .uls-search { - position: relative; +.uls-search { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#F0F0F0', endColorstr='#FBFBFB'); background: #f8f8f8; background: -webkit-gradient(linear, left top, left bottom, from(#F0F0F0), to(#FBFBFB)); @@ -149,54 +142,87 @@ div.uls-region { border-bottom-style: solid; border-bottom-color: #DDD; } -.uls-menu .uls-search-label { - /* @embed */ + +/* Make space for magnifying class on the front */ +.uls-search-wrapper { + position: relative; + padding-left: 40px; + margin-right: 5px; + height: 32px; +} + +.uls-search-label { background: transparent url('../images/search.png') no-repeat scroll right center; - /* @embed */ background-image: -webkit-linear-gradient(transparent, transparent), url('../images/search.svg'); /* @embed */ background-image: linear-gradient(transparent, transparent), url('../images/search.svg'); background-size: 30px; + background-position: center center; height: 32px; - width: 32px; - float: right; -} - -.uls-menu.uls-narrow .uls-search-label { - background-size: 18px; -} - -.uls-menu .uls-languagefilter-clear { - /* @embed */ - background: transparent url('../images/clear.png') no-repeat scroll left center; - /* @embed */ - background-image: -webkit-linear-gradient(transparent, transparent), url('../images/clear.svg'); - /* @embed */ - background-image: linear-gradient(transparent, transparent), url('../images/clear.svg'); - cursor: pointer; - height: 32px; + width: 40px; + display: block; position: absolute; - width: 32px; - margin-left: -32px; -} -.uls-menu .uls-filterinput { - position: absolute; - top: 0; left: 0; +} + +.uls-search-input-wrapper { + position: relative; +} + +/* There are two input boxes. This class applies to both of them */ +.uls-filterinput { font-size: 14px; height: 32px; width: 100%; - text-align: left; + /* For the custom clear (X) icon */ + padding: 6px 25px 6px 6px; + border-width: 1px; + + display: block; + position: absolute; + top: 0; + left: 0; } -.uls-menu .uls-filtersuggestion { - padding: 6px; + +/* This is the actual input */ +.uls-languagefilter { + background-color: transparent; + border: 1px solid #c9c9c9; + border-radius: 2px 2px 2px 2px; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset; + color: #333; + -moz-transition: border 0.15s linear 0s; + -o-transition: border 0.15s linear 0s; + -webkit-transition: border 0.15s linear 0s; + transition: border 0.15s linear 0s; +} + +.uls-languagefilter:focus { + border: 1px solid #3366bb; +} + +/* This is the shadow input box showing completion suggestions */ +.uls-filtersuggestion { background-color: white; color: #888; - border: 1px transparent; border-radius: 2px 2px 2px 2px; box-shadow: 0 1px 2px transparent inset; - left: 1px; } -.uls-menu .uls-search-input-block { - position: relative; + +.uls-languagefilter-clear { + background: transparent url('../images/clear.png') no-repeat scroll left center; + background-image: -webkit-linear-gradient(transparent, transparent), url('../images/clear.svg'); + /* @embed */ + background-image: linear-gradient(transparent, transparent), url('../images/clear.svg'); + background-size: 15px; + cursor: pointer; + height: 15px; + width: 15px; + + /* Vertical margins: (32 - 15) / 2 */ + margin: 8.5px 5px; + position: absolute; + right: 0; + /* Make it appear above the input boxes */ + z-index: 1; } diff --git a/lib/jquery.uls/i18n/ba.json b/lib/jquery.uls/i18n/ba.json new file mode 100644 index 00000000..10fbf777 --- /dev/null +++ b/lib/jquery.uls/i18n/ba.json @@ -0,0 +1,21 @@ +{ + "@metadata": { + "authors": [ + "Sagan" + ] + }, + "uls-select-language": "Тел һайлау:", + "uls-region-WW": "Бөтә донъя", + "uls-region-SP": "Махсус", + "uls-region-AM": "Америка", + "uls-region-AF": "Африка", + "uls-region-EU": "Европа", + "uls-region-AS": "Азия", + "uls-region-ME": "Яҡын Көнсығыш", + "uls-region-PA": "Океания", + "uls-no-results-found": "Бер нимә лә табылманы", + "uls-common-languages": "Уртаҡ телдәр", + "uls-no-results-suggestion-title": "Бәлки, ошо телдәрҙе һайларһығыҙ:", + "uls-search-help": "Телдең исеме, яҙмаһы, ISO коды йәки регионы буйынса эҙләй алаһығыҙ.", + "uls-search-placeholder": "Эҙләү теле" +} diff --git a/lib/jquery.uls/i18n/glk.json b/lib/jquery.uls/i18n/glk.json new file mode 100644 index 00000000..1de4dd0f --- /dev/null +++ b/lib/jquery.uls/i18n/glk.json @@ -0,0 +1,21 @@ +{ + "@metadata": { + "authors": [ + "شیخ" + ] + }, + "uls-select-language": "زوانه دؤجئن", + "uls-region-WW": "دۊنىا سرتاسرˇ ميئن", + "uls-region-SP": "خاص", + "uls-region-AM": "آمريکا", + "uls-region-AF": "آفريقا", + "uls-region-EU": "اۊرۊپا", + "uls-region-AS": "آسيا", + "uls-region-ME": "مئني خۊرتؤ", + "uls-region-PA": "اۊقيانۊسˇ آرؤم", + "uls-no-results-found": "نتيجه-اي وامۊته نۊبؤ", + "uls-common-languages": "راىجˇ زوانؤن", + "uls-no-results-suggestion-title": "مۊمکنه خۊش بدأرين:", + "uls-search-help": "شۊمۊ تؤنين زوانˇ نؤمˇ أمرأ، رسم الخط، زوانˇ ايزؤ کؤد ىا شيمي سامؤنˇ أمرأ وامجين.", + "uls-search-placeholder": "زوانˇ وامج" +} diff --git a/lib/jquery.uls/i18n/gu.json b/lib/jquery.uls/i18n/gu.json index 3d88d1b4..25c1efc6 100644 --- a/lib/jquery.uls/i18n/gu.json +++ b/lib/jquery.uls/i18n/gu.json @@ -19,6 +19,6 @@ "uls-no-results-found": "કોઈ પરિણામ મળ્યા નહી", "uls-common-languages": "સામાન્ય ભાષાઓ", "uls-no-results-suggestion-title": "તમને આમાં રસ હોઈ શકે છે:", - "uls-search-help": "તમે ભાષા નામ, સ્ક્રિપ્ટ નામ, ભાષા ISO કોડ દ્વારા શોધી શકો છે અથવા તમે પ્રદેશ દ્વારા શોધી કરી શકો છો.", + "uls-search-help": "તમે ભાષા નામ, સ્ક્રિપ્ટ નામ, ભાષા ISO કોડ દ્વારા શોધ કરી શકો છે અથવા તમે પ્રદેશ દ્વારા શોધ કરી શકો છો.", "uls-search-placeholder": "ભાષા શોધ" } diff --git a/lib/jquery.uls/i18n/sd.json b/lib/jquery.uls/i18n/sd.json new file mode 100644 index 00000000..b51bdb70 --- /dev/null +++ b/lib/jquery.uls/i18n/sd.json @@ -0,0 +1,21 @@ +{ + "@metadata": { + "authors": [ + "Mehtab ahmed" + ] + }, + "uls-select-language": "ٻولي چونڊيو", + "uls-region-WW": "دنيا ڀر", + "uls-region-SP": "خاص", + "uls-region-AM": "آمريڪا", + "uls-region-AF": "آفريڪا", + "uls-region-EU": "يُورپ", + "uls-region-AS": "ايشيا", + "uls-region-ME": "وچ اوڀر", + "uls-region-PA": "پئسفڪ", + "uls-no-results-found": "ڪي به نتيجا نه لڌا", + "uls-common-languages": "عام ٻوليون", + "uls-no-results-suggestion-title": "توهان کي هنن شين ۾ دلچسپي ٿي سگھي ٿي:", + "uls-search-help": "توهان ٻولي جي نالي، اسڪرپٽ جو نالو، ٻولي جو آءِ سي او ڪوڊ يا خطي جي حساب سان ڳولي سگھو ٿا.", + "uls-search-placeholder": "ٻولي ڳولا" +} diff --git a/lib/jquery.uls/src/jquery.uls.core.js b/lib/jquery.uls/src/jquery.uls.core.js index 76a69c65..f1d7354d 100644 --- a/lib/jquery.uls/src/jquery.uls.core.js +++ b/lib/jquery.uls/src/jquery.uls.core.js @@ -33,20 +33,18 @@ \ \