jenkins-bot has submitted this change and it was merged.
Change subject: Provide disable input tools option in IME menu
......................................................................
Provide disable input tools option in IME menu
Bug: 48533
Change-Id: Ie856cbda344ae2624567fb6c2d6206996c3b10dc
---
M i18n/en.json
M resources/css/ext.uls.inputsettings.css
A resources/images/cog.png
M resources/images/cog.svg
A resources/images/remove-input.png
A resources/images/remove-input.svg
M resources/js/ext.uls.ime.js
7 files changed, 166 insertions(+), 50 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 7eca407..5fd47af 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -39,7 +39,6 @@
"ext-uls-disable-input-method": "Disable input method",
"ext-uls-disable-input-method-desc": "Use a regular keyboard",
"ext-uls-input-settings-more-languages-tooltip": "More languages",
-"ext-uls-input-more-settings" : "More settings",
"jquery-ime-other-languages": "Other languages",
"jquery-ime-disable-text": "Disable input method",
"jquery-ime-help": "Help",
diff --git a/resources/css/ext.uls.inputsettings.css
b/resources/css/ext.uls.inputsettings.css
index b8c7b56..b6b7531 100644
--- a/resources/css/ext.uls.inputsettings.css
+++ b/resources/css/ext.uls.inputsettings.css
@@ -31,22 +31,40 @@
background-color: #5089e8;
}
-.uls-ime-more-settings-link {
- /* @embed */
- background: transparent url('../images/cog-16x16-ltr.png') right center
no-repeat;
- background-image: -webkit-linear-gradient(transparent, transparent),
url('../images/cog.svg');
- background-image: -moz-linear-gradient(transparent, transparent),
url('../images/cog.svg');
- background-image: linear-gradient(transparent, transparent),
url('../images/cog.svg');
- background-size: 20px auto;
+.uls-ime-menu-settings-item {
background-color: #f0f0f0;
border-radius: 0 0 5px 5px;
border-top: 1px solid #ddd;
margin-top: 6px;
- padding: 2px 0 2px 0;
+ padding: 4px 2px;
color: #444;
}
-.uls-ime-more-settings-link > a:hover {
+.uls-ime-disable-link {
+ /* @embed */
+ background: transparent url('../images/remove-input.png') left top
no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url('../images/remove-input.svg');
+ background-image: -moz-linear-gradient(transparent, transparent),
url('../images/remove-input.svg');
+ background-image: linear-gradient(transparent, transparent),
url('../images/remove-input.svg');
+ background-size: auto 16px;
+ padding-left: 22px;
+ padding-bottom: 10px;
+}
+
+.uls-ime-more-settings-link {
+ /* @embed */
+ background: transparent url('../images/cog.png') right top no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url('../images/cog.svg');
+ background-image: -moz-linear-gradient(transparent, transparent),
url('../images/cog.svg');
+ background-image: linear-gradient(transparent, transparent),
url('../images/cog.svg');
+ background-size: auto 14px;
+ border-left: 1px solid #CCCCCC;
+ width: 22px;
+ height: 14px;
+ float: right;
+}
+
+.uls-ime-menu-settings-item > a:hover {
background-color: #f0f0f0;
color: #000;
}
@@ -87,4 +105,4 @@
margin: 12px 0;
padding: 6px 10px;
background: #f0f0f0;
-}
\ No newline at end of file
+}
diff --git a/resources/images/cog.png b/resources/images/cog.png
new file mode 100644
index 0000000..a8ec25f
--- /dev/null
+++ b/resources/images/cog.png
Binary files differ
diff --git a/resources/images/cog.svg b/resources/images/cog.svg
index bf8dafc..93791b1 100644
--- a/resources/images/cog.svg
+++ b/resources/images/cog.svg
@@ -7,12 +7,38 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
xmlns:svg="http://www.w3.org/2000/svg";
xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
version="1.1"
- width="42"
- height="31.999998"
- viewBox="0 0 42 31.999998"
+ width="20"
+ height="14"
+ viewBox="0 0 20 14"
id="Layer_1"
- xml:space="preserve"><metadata
+ xml:space="preserve"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="cog.svg"
+
inkscape:export-filename="/Users/pau/repos/wikimedia/UniversalLanguageSelector/resources/images/cog.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1124"
+ inkscape:window-height="646"
+ id="namedview82"
+ showgrid="false"
+ inkscape:zoom="7.3750004"
+ inkscape:cx="3.9830519"
+ inkscape:cy="14.711864"
+ inkscape:window-x="520"
+ inkscape:window-y="93"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="Layer_1" /><metadata
id="metadata7"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
@@ -25,7 +51,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132-1"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -34,7 +61,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329-2"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><marker
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -43,7 +71,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132-31"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -52,7 +81,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329-94"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><marker
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -61,7 +91,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132-8"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -70,7 +101,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329-91"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><clipPath
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><clipPath
id="clipPath3169-2"><rect
width="748.77557"
height="428.80975"
@@ -80,7 +112,8 @@
style="fill:#f5f5f4;fill-opacity:1;stroke:#888a85;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
/></clipPath><clipPath
id="clipPath22-7"><path
d="M 0,792 1224,792 1224,0 0,0 0,792 z"
- id="path24-2" /></clipPath><clipPath
+ id="path24-2"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
id="clipPath6483-7"><rect
width="548"
height="280"
@@ -103,7 +136,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132-982"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -112,7 +146,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329-95"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><marker
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -121,7 +156,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132-98"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -130,7 +166,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329-1"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><marker
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -139,7 +176,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132-9"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -148,7 +186,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329-32"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><marker
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -157,7 +196,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path32940"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -166,7 +206,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path32936"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><marker
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -175,7 +216,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132-2"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -184,7 +226,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329-9"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><marker
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -193,7 +236,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132-3"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -202,7 +246,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329-3"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><marker
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -211,7 +256,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132-4"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -220,7 +266,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329-8"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><clipPath
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><clipPath
id="clipPath6483-5"><rect
width="548"
height="280"
@@ -243,7 +290,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
id="path45126-6"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><clipPath
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><clipPath
id="clipPath6483-1-7-3-9"><rect
width="548"
height="280"
@@ -281,7 +329,8 @@
style="fill:#ffffff;fill-opacity:1;stroke:none" /></clipPath><clipPath
id="clipPath22"><path
d="M 0,792 1224,792 1224,0 0,0 0,792 z"
- id="path24" /></clipPath><clipPath
+ id="path24"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
id="clipPath3169"><rect
width="748.77557"
height="428.80975"
@@ -297,7 +346,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
id="path45126"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -306,7 +356,8 @@
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c
-1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(-0.6,-0.6)"
id="path45132"
-
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
/></marker><marker
+
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -315,7 +366,8 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.8,0,0,0.8,5.92,0.8)"
id="path14326"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker><marker
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker><marker
refX="0"
refY="0"
orient="auto"
@@ -324,8 +376,10 @@
d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76
2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
transform="matrix(0.4,0,0,0.4,2.96,0.4)"
id="path14329"
-
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
/></marker></defs>
+
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ inkscape:connector-curvature="0" /></marker></defs>
<path
- d="M 18.788295,0 C 18.258441,0 17.83188,0.42656 17.83188,0.9564138 l
0,2.4308835 C 16.594732,3.6944151 15.403984,4.1887145 14.285181,4.8617694 L
12.571607,3.1481946 c -0.374663,-0.3746629 -0.980257,-0.3746629 -1.35492,0 L
8.1083436,6.2565374 c -0.3746626,0.3746639 -0.3746626,0.980256 0,1.3549199 L
9.8219178,9.3250326 C 9.1541311,10.440568 8.6910851,11.644818
8.3872978,12.871731 l -2.4308844,0 C 5.4265604,12.871731 5,13.298291
5,13.828141 l 0,4.383563 c 0,0.529854 0.4265604,0.956414 0.9564135,0.956414 l
2.3910337,0 c 0.307067,1.238251 0.8008512,2.426955 1.4744706,3.546699 l
-1.7135742,1.713575 c -0.3746626,0.374661 -0.3746626,0.980256 0,1.354921 l
3.1083434,3.108342 c 0.374663,0.374662 0.980257,0.374662 1.35492,0 l
1.713574,-1.713574 c 1.123692,0.677719 2.309334,1.12739 3.546699,1.43462 l
0,2.430884 c 0,0.529854 0.426561,0.956414 0.956415,0.956414 l 4.383563,0 c
0.52985,0 0.95641,-0.42656 0.95641,-0.956413 l 0,-2.430885 c 1.24001,-0.30559
2.425185,-0.761767 3.5467,-1.43462 l 1.713575,1.713574 c 0.374664,0.374662
0.980256,0.374662 1.35492,0 l 3.108343,-3.108342 c 0.374662,-0.374665
0.374662,-0.98026 0,-1.354921 l -1.713575,-1.713575 c 0.674452,-1.117718
1.166647,-2.315963 1.474471,-3.546698 l 2.430885,0 C 36.57344,19.168118
37,18.741558 37,18.211704 l 0,-4.383559 c 0,-0.529854 -0.42656,-0.956414
-0.956413,-0.956414 l -2.430885,0 C 33.307437,11.642048 32.805034,10.438055
32.138231,9.3250326 l 1.713575,-1.7135753 c 0.374662,-0.3746639
0.374662,-0.980256 0,-1.3549199 L 30.743463,3.1481946 c -0.374664,-0.3746629
-0.980256,-0.3746629 -1.35492,0 L 27.674968,4.8617694 C 26.555129,4.1896139
25.36061,3.6922413 24.128268,3.3872973 l 0,-2.4308835 C 24.128268,0.42656
23.701708,0 23.171858,0 l -4.383563,0 z m 2.032377,9.9626393 c
1.549644,-0.041137 3.129994,0.4829097 4.343712,1.6338727 2.427433,2.301926
2.541027,6.140437 0.239103,8.567871 -2.296244,2.421441 -6.138424,2.526877
-8.567871,0.239103 -2.427433,-2.301926 -2.541028,-6.140437 -0.239103,-8.567871
1.150964,-1.213716 2.674516,-1.831849 4.224159,-1.8729746 z"
+ d="M 9.0323793,0 C 8.8005682,0 8.6139472,0.18662 8.6139472,0.41843112 l
0,1.06351138 C 8.0726951,1.6163066 7.5517427,1.8325625 7.0622665,2.127024 L
6.3125779,1.3773353 c -0.1639151,-0.1639151 -0.4288625,-0.1639151 -0.5927775,0
L 4.3599,2.7372351 c -0.1639149,0.1639155 -0.1639149,0.4288621 0,0.5927775 L
5.1095888,4.0797018 C 4.8174321,4.5677486 4.6148495,5.094608
4.4819426,5.6313825 l -1.063512,0 c -0.2318107,0 -0.4184309,0.18662
-0.4184309,0.4184294 l 0,1.9178088 c 0,0.2318111 0.1866202,0.4184311
0.418431,0.4184311 l 1.0460772,0 C 4.5988498,8.9277869 4.8148803,9.4478449
5.1095888,9.9377329 L 4.3599,10.687422 c -0.1639149,0.163914
-0.1639149,0.428861 0,0.592778 l 1.3599004,1.359899 c 0.163915,0.163915
0.4288624,0.163915 0.5927774,0 l 0.7496887,-0.749688 c 0.4916156,0.296501
1.0103341,0.493233 1.5516807,0.627646 l 0,1.063512 C 8.6139472,13.81338
8.8005682,14 9.0323792,14 l 1.9178088,0 c 0.231809,0 0.418429,-0.18662
0.418429,-0.418431 l 0,-1.063512 c 0.542505,-0.133696 1.061019,-0.333273
1.551681,-0.627646 l 0.74969,0.749688 c 0.163915,0.163915 0.428862,0.163915
0.592777,0 l 1.3599,-1.359899 c 0.163915,-0.163917 0.163915,-0.428864
0,-0.592778 L 14.872976,9.9377329 c 0.295073,-0.4890017 0.510408,-1.0132343
0.64508,-1.5516807 l 1.063513,0 C 16.813379,8.3860518 17,8.1994318 17,7.9676207
L 17,6.0498136 C 17,5.8180025 16.81338,5.6313825 16.581569,5.6313825 l
-1.063513,0 C 15.384503,5.0933961 15.164701,4.5666491 14.872976,4.0797018 l
0.749688,-0.7496892 c 0.163915,-0.1639154 0.163915,-0.428862 0,-0.5927775 L
14.262765,1.3773353 c -0.163915,-0.1639151 -0.428862,-0.1639151 -0.592777,0 L
12.920298,2.127024 C 12.430368,1.8329562 11.907767,1.6153555
11.368616,1.4819425 l 0,-1.06351138 C 11.368616,0.18662 11.181996,0 10.950188,0
L 9.0323793,0 z m 0.8891645,4.3586548 c 0.6779692,-0.017997 1.3693712,0.211273
1.9003732,0.7148193 1.062002,1.0070927 1.1117,2.6864413 0.104608,3.7484439 C
10.921919,9.881298 9.2409652,9.9274262 8.1780818,8.9265251 7.1160799,7.9194327
7.066382,6.2400841 8.0734747,5.1780816 8.5770213,4.6470809 9.2435753,4.3766477
9.9215438,4.3586553 z"
id="rect3381-0"
- style="fill:#434343;fill-opacity:1;stroke:none" /></svg>
\ No newline at end of file
+ style="fill:#434343;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/resources/images/remove-input.png
b/resources/images/remove-input.png
new file mode 100644
index 0000000..fa53810
--- /dev/null
+++ b/resources/images/remove-input.png
Binary files differ
diff --git a/resources/images/remove-input.svg
b/resources/images/remove-input.svg
new file mode 100644
index 0000000..72978d2
--- /dev/null
+++ b/resources/images/remove-input.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ version="1.1"
+ width="20"
+ height="16"
+ viewBox="0 0 20 16"
+ id="Layer_1"
+ xml:space="preserve"><metadata
+ id="metadata7"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs5" />
+<path
+ d="m 9.203125,0.86425174 c 0,0 -0.046035,0.114102 -0.1093749,0.24999916
-0.059486,0.1276119 -0.1717269,0.2591933 -0.1718747,0.265625 -0.037299,0.00282
-0.1874024,0.05322 -0.3906245,0.062496 -0.2709628,0.012376 -0.6260083,0.00217
-1,-0.015626 C 6.7832665,1.3911249 5.98593,1.3197852 5.4531254,1.4111192 l
-0.01562,0 C 5.1154955,1.4710694 4.8866516,1.6853747 4.7187552,1.9111185
4.5483819,2.1401927 4.4250607,2.3999192 4.3437554,2.6454936 4.2193799,3.0211572
4.1742776,3.3101273 4.1562548,3.4579945 L 2,3.4580019 l 0,9.1875011 16,0
0,-9.1875011 -13.0781245,0 C 4.9464624,3.3087594 4.9849,3.1142694
5.0624997,2.8798765 5.1280083,2.6820118 5.2154622,2.4790982 5.3125,2.3486264
5.409539,2.2181547 5.5033583,2.1609973 5.5937508,2.1455015 c
0.3061346,-0.052483 1.1285161,-0.00498 1.890625,0.031254 0.3810539,0.018142
0.7588323,0.030213 1.0781244,0.015627 0.3192921,-0.014586 0.575556,0.00206
0.8437511,-0.2187497 C 9.6157286,1.801122 9.6855051,1.614273
9.7656253,1.4423825 9.8457479,1.2704918 9.9062507,1.1142574 9.9062507,1.1142574
L 9.203125,0.86425824 z m -5.6874998,4.68749966 1.2343744,0 c 0.077057,0
0.1406254,0.047943 0.1406254,0.1250001 l 0,1.2500013 c 0,0.077045
-0.06357,0.1406242 -0.1406254,0.1406242 l -1.2343744,0 c -0.077057,0
-0.1406254,-0.06357 -0.1406254,-0.1406242 l 0,-1.2500013 c 0,-0.077051
0.06357,-0.1250001 0.1406254,-0.1250001 z m 2.2656249,0 1.2343756,0 c
0.077057,0 0.1406254,0.047943 0.1406254,0.1250001 l 0,1.2500013 c 0,0.077045
-0.06357,0.1406242 -0.1406254,0.1406242 l -1.2343756,0 c -0.077057,0
-0.1406242,-0.06357 -0.1406242,-0.1406242 l 0,-1.2500013 c 0,-0.077051
0.06357,-0.1250001 0.1406242,-0.1250001 z m 2.2656249,0 1.2343756,0 c
0.077057,0 0.1406254,0.047943 0.1406254,0.1250001 l 0,1.2500013 c 0,0.077045
-0.06357,0.1406242 -0.1406254,0.1406242 l -1.2343756,0 c -0.077057,0
-0.1406242,-0.06357 -0.1406242,-0.1406242 l 0,-1.2500013 c 0,-0.077051
0.06357,-0.1250001 0.1406242,-0.1250001 z m 2.265626,0 1.234374,0 c 0.07706,0
0.140626,0.047943 0.140626,0.1250001 l 0,1.2500013 c 0,0.077045
-0.06357,0.1406242 -0.140626,0.1406242 l -1.234374,0 c -0.07706,0
-0.140625,-0.06357 -0.140625,-0.1406242 l 0,-1.2500013 c 0,-0.077051
0.06357,-0.1250001 0.140625,-0.1250001 z m 2.265625,0 1.234376,0 c 0.07704,0
0.140624,0.047943 0.140624,0.1250001 l 0,1.2500013 c 0,0.077045
-0.06357,0.1406242 -0.140624,0.1406242 l -1.234376,0 c -0.07706,0
-0.140625,-0.06357 -0.140625,-0.1406242 l 0,-1.2500013 c 0,-0.077051
0.06357,-0.1250001 0.140625,-0.1250001 z m 2.265624,0 1.234375,0 c 0.07705,0
0.140624,0.047943 0.140624,0.1250001 l 0,1.2500013 c 0,0.077045
-0.06357,0.1406242 -0.140624,0.1406242 l -1.234375,0 c -0.07705,0
-0.140626,-0.06357 -0.140626,-0.1406242 l 0,-1.2500013 c 0,-0.077051
0.06357,-0.1250001 0.140626,-0.1250001 z m -10.265625,2.4062507 1.2343756,0 c
0.077057,0 0.1406242,0.06357 0.1406242,0.1406254 l 0,1.234374 c 0,0.077045
-0.06357,0.1406254 -0.1406242,0.1406254 l -1.2343756,0 c -0.077057,0
-0.1406254,-0.06357 -0.1406254,-0.1406254 l 0,-1.234374 c 0,-0.077045
0.06357,-0.1406254 0.1406254,-0.1406254 z m 2.3281258,0 1.2343744,0 c
0.077057,0 0.1406254,0.06357 0.1406254,0.1406254 l 0,1.234374 c 0,0.077045
-0.06357,0.1406254 -0.1406254,0.1406254 l -1.2343744,0 c -0.077057,0
-0.1406254,-0.06357 -0.1406254,-0.1406254 l 0,-1.234374 c 0,-0.077045
0.06357,-0.1406254 0.1406254,-0.1406254 z m 2.3281246,0 1.2500006,0 c 0.07706,0
0.140625,0.06357 0.140625,0.1406254 l 0,1.234374 c 0,0.077045
-0.06357,0.1406254 -0.140625,0.1406254 l -1.2500006,0 c -0.077057,0
-0.1406253,-0.06357 -0.1406253,-0.1406254 l 0,-1.234374 c 0,-0.077045
0.06357,-0.1406254 0.1406253,-0.1406254 z m 2.3437506,0 1.234374,0 c 0.07706,0
0.140626,0.06357 0.140626,0.1406254 l 0,1.234374 c 0,0.077045
-0.06357,0.1406254 -0.140626,0.1406254 l -1.234374,0 c -0.07706,0
-0.140626,-0.06357 -0.140626,-0.1406254 l 0,-1.234374 c 0,-0.077045
0.06357,-0.1406254 0.140626,-0.1406254 z m 2.328125,0 1.234374,0 c 0.07705,0
0.140626,0.06357 0.140626,0.1406254 l 0,1.234374 c 0,0.077045
-0.06357,0.1406254 -0.140626,0.1406254 l -1.234374,0 c -0.07705,0
-0.140626,-0.06357 -0.140626,-0.1406254 l 0,-1.234374 c 0,-0.077045
0.06357,-0.1406254 0.140626,-0.1406254 z m -8.7031259,2.8437499 9.5937509,0 c
0.07704,0 0.124999,0.06357 0.124999,0.140625 l 0,0.640625 c 0,0.07706
-0.04794,0.140625 -0.124999,0.140625 l -9.5937509,0 c -0.077057,0
-0.1249996,-0.06357 -0.1249996,-0.140625 l 0,-0.640625 c 0,-0.07705
0.04795,-0.140625 0.1249996,-0.140625 z"
+ id="path4443"
+
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#565656;fill-opacity:1;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
/><rect
+ width="1.211776"
+ height="20.600193"
+ x="12.122033"
+ y="-11.714309"
+ transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+ id="rect2982-0-9"
+ style="fill:#565656;fill-opacity:1;stroke:none" /></svg>
\ No newline at end of file
diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index 1841082..ec1cd02 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -104,13 +104,16 @@
// Add a 'more setttings' link that takes to input settings of ULS
$.fn.imeselector.Constructor.prototype.helpLink = function () {
- var $moreSettingsLink, imeselector;
+ var $disableInputToolsLink, $moreSettingsLink, imeselector;
imeselector = this;
- $moreSettingsLink = $( '<a>' ).text( 'More settings' )
- .addClass( 'uls-ime-more-settings-link' )
- .attr( 'data-i18n', 'ext-uls-input-more-settings' );
+ $disableInputToolsLink = $( '<span>' )
+ .addClass( 'uls-ime-disable-link' )
+ .attr( 'data-i18n', 'ext-uls-input-disable' );
+
+ $moreSettingsLink = $( '<span>' )
+ .addClass( 'uls-ime-more-settings-link' );
$moreSettingsLink.languagesettings( {
defaultModule: 'input',
@@ -127,9 +130,21 @@
e.stopPropagation();
} );
- $moreSettingsLink.i18n();
+ $disableInputToolsLink.i18n();
- return $moreSettingsLink;
+ $disableInputToolsLink.on( 'click', function (e) {
+ $.ime.preferences.disable();
+ imeselector.hide();
+ imeselector.$menu.removeClass( 'open' );
+ $.ime.preferences.save( function () {
+ mw.ime.disable();
+ } );
+ e.stopPropagation();
+ } );
+
+ return $( '<div>' )
+ .addClass( 'uls-ime-menu-settings-item' )
+ .append( $disableInputToolsLink, $moreSettingsLink );
};
mw.ime.disable = function () {
--
To view, visit https://gerrit.wikimedia.org/r/64270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie856cbda344ae2624567fb6c2d6206996c3b10dc
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Pginer <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
