From 72e48c26e036b85a7b1d05cd7f18ca381167e039 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Fri, 30 Mar 2018 00:20:24 +0100 Subject: [PATCH] Convert remaining tools to OOUI Replaces the insert and advanced-insert groups, which are currently multi-colour icons. Drops the button-sprite + offset mode, according to mwgrep there are no other users of this. Bug: T191031 Bug: T143508 Change-Id: I7032f98908a591ea5c9d3dbbb7616e2c10bbfc80 --- extension.json | 5 +- modules/images/toolbar/button-sprite.png | Bin 5350 -> 0 bytes modules/images/toolbar/button-sprite.svg | 2 - modules/images/toolbar/insert-file.png | Bin 860 -> 0 bytes modules/images/toolbar/insert-file.svg | 36 ------ modules/images/toolbar/insert-gallery.png | Bin 293 -> 0 bytes modules/images/toolbar/insert-gallery.svg | 44 ------- modules/images/toolbar/insert-link.png | Bin 415 -> 0 bytes modules/images/toolbar/insert-link.svg | 20 --- .../images/toolbar/insert-redirect-rtl.png | Bin 908 -> 0 bytes .../images/toolbar/insert-redirect-rtl.svg | 103 --------------- modules/images/toolbar/insert-redirect.png | Bin 983 -> 0 bytes modules/images/toolbar/insert-redirect.svg | 118 ------------------ modules/images/toolbar/insert-reference.png | Bin 321 -> 0 bytes modules/images/toolbar/insert-reference.svg | 88 ------------- modules/images/toolbar/insert-signature.png | Bin 748 -> 0 bytes modules/images/toolbar/insert-signature.svg | 49 -------- modules/images/toolbar/insert-table.png | Bin 259 -> 0 bytes modules/images/toolbar/insert-table.svg | 37 ------ modules/images/toolbar/search-replace.png | Bin 740 -> 0 bytes modules/images/toolbar/search-replace.svg | 46 ------- modules/jquery.wikiEditor.dialogs.config.js | 15 +-- modules/jquery.wikiEditor.js | 26 +--- modules/jquery.wikiEditor.toolbar.config.js | 15 +-- modules/jquery.wikiEditor.toolbar.js | 20 ++- modules/jquery.wikiEditor.toolbar.less | 5 - 26 files changed, 21 insertions(+), 608 deletions(-) delete mode 100644 modules/images/toolbar/button-sprite.png delete mode 100644 modules/images/toolbar/button-sprite.svg delete mode 100644 modules/images/toolbar/insert-file.png delete mode 100644 modules/images/toolbar/insert-file.svg delete mode 100644 modules/images/toolbar/insert-gallery.png delete mode 100644 modules/images/toolbar/insert-gallery.svg delete mode 100644 modules/images/toolbar/insert-link.png delete mode 100644 modules/images/toolbar/insert-link.svg delete mode 100644 modules/images/toolbar/insert-redirect-rtl.png delete mode 100644 modules/images/toolbar/insert-redirect-rtl.svg delete mode 100644 modules/images/toolbar/insert-redirect.png delete mode 100644 modules/images/toolbar/insert-redirect.svg delete mode 100644 modules/images/toolbar/insert-reference.png delete mode 100644 modules/images/toolbar/insert-reference.svg delete mode 100644 modules/images/toolbar/insert-signature.png delete mode 100644 modules/images/toolbar/insert-signature.svg delete mode 100644 modules/images/toolbar/insert-table.png delete mode 100644 modules/images/toolbar/insert-table.svg delete mode 100644 modules/images/toolbar/search-replace.png delete mode 100644 modules/images/toolbar/search-replace.svg diff --git a/extension.json b/extension.json index 7599a83a..31b8eeb3 100644 --- a/extension.json +++ b/extension.json @@ -280,9 +280,12 @@ "mediawiki.Title", "mediawiki.Upload.Dialog", "mediawiki.user", + "oojs-ui.styles.icons-content", "oojs-ui.styles.icons-editing-advanced", + "oojs-ui.styles.icons-editing-core", "oojs-ui.styles.icons-editing-list", - "oojs-ui.styles.icons-editing-styling" + "oojs-ui.styles.icons-editing-styling", + "oojs-ui.styles.icons-media" ] }, "ext.wikiEditor.styles": { diff --git a/modules/images/toolbar/button-sprite.png b/modules/images/toolbar/button-sprite.png deleted file mode 100644 index 4ae1663c7d69de5e1bf5f8ee43c0bf280f300e16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5350 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 diff --git a/modules/images/toolbar/button-sprite.svg b/modules/images/toolbar/button-sprite.svg deleted file mode 100644 index 83531f7d..00000000 --- a/modules/images/toolbar/button-sprite.svg +++ /dev/null @@ -1,2 +0,0 @@ - -image/svg+xml diff --git a/modules/images/toolbar/insert-file.png b/modules/images/toolbar/insert-file.png deleted file mode 100644 index a31ffb2bc787ebef4bf4a254689ac920bb5ca3c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 860 zcmV-i1Ec(jP)}L>mx*loE_V|3b*d7%D-)<(FJdB9ZtO zjDT1hrpAY<^nZaCHm(KLNZ?mWShhpLvymnQp)fi|qYwh*F|`3Q(TL@^oNSrJx8uRJ z6;4`F)sk5`i53n$-9t>olDd>jDnFOFJc4%Xsh1-NsTeDT5XVe#Y?MFU3MpV#-eO*z zMaF|gd7l*<_p)N)EEEBgI!6!-a+wUV*0gpMDGrV^URC_iDeJpFSyE6)+jy2COwOko zMJ!5{==J7fl@(9F{4zV%%%VYe@J6xBb8qx;=Kf_hF*XxgqK)|pFkmUDPsS)I&`ufQ zf-LnhG#c>Lmu>X)_L12#7olvDuA)Bca&Ubk<5NDRDM74%0t}!8$1JGE3Ry0Kj`2yb zIzP%_#$llB)@%}d)Z_Eg2i@Fs&Qg+AgiM4?NDtTbekweOjliZ#V^-iU*-CQm0?Hjn z@mt?x`949h=yA)VUmR=8b*Il~VY7#dr${(HZoNmo&_rkJ7vB$08-XhWX67Ptt2WcP zdNrwBn);Qin04Akqzf5tKC3|AXocmCh9fH?vT~GM)?)7RMWh>N)8AKQY;5euicJ)u zvIU%lYpGUzFd7g@H%TQDc(%Z?j-3hoDsD2v(dtYdxxbI5*-7Rsd5KDS`ukwl791Ti zY`gItn)06^r9l8e44wrk$Iw3kzP5S!Xh_d}fbhZ~y>9n@Cxs%yWDI0000 - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/modules/images/toolbar/insert-gallery.png b/modules/images/toolbar/insert-gallery.png deleted file mode 100644 index f351cb9ff2366f0a8a52565e10a0e3251eacd55e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmV+=0owkFP)qaK|00001 zbW%=J06^y0W&i*Hqe(Ca|Xm#1+jNS*or{*wrmJndD`l^(^BW&1hN@L zrmemU0zfvC`Lw%WaBTtuYaYUUru><3ds&5(<=+8;vWfu%gHw=j%D;E-9ECydWDyNA rOZ;bQ0CB&gYM@yv%v(TS2&$I>y5&>v`FCv200000NkvXXu0mjfMu>al diff --git a/modules/images/toolbar/insert-gallery.svg b/modules/images/toolbar/insert-gallery.svg deleted file mode 100644 index 325695bd..00000000 --- a/modules/images/toolbar/insert-gallery.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/images/toolbar/insert-link.png b/modules/images/toolbar/insert-link.png deleted file mode 100644 index 7fc4435d54a0d9a3daf5af71a3542069b990fa6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 415 zcmV;Q0bu@#P)D=7hYinzQf`W^S zi*s{xl$4ZLS64qjKV)QN+1c5zudl|&#(H{sg@uK_zP@yHbcl$EnVFfNpPzw&fq#F0 zVPRo}goM=8)NgNZ+uPfHeSNsNxb*b&prD|3c6M7^TW)S{*VorzU|_<+!rk57iHV8q z?CitC!4Re$(i(|G - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/modules/images/toolbar/insert-redirect-rtl.png b/modules/images/toolbar/insert-redirect-rtl.png deleted file mode 100644 index 837c43310cb520a73da8e4a143502f0e404c5155..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 908 zcmV;719SX|P))@sy(2bPD|-q{K(53VvV3VYoa?W=?m30@ukJWS_?1Z)y;^Z^D-bSq`IW}}%%#E;u&=jY!2`;oYDV;!=cV|`y33BFk7aJ zd)&HGtyFZ*OT{7tSG;tG)x?6z^FNRC7+gA}4tcmA5(-Dq$~9MBH*MyeP%x-41%Ry+ z4L~CP#f*ZvaJH^#PC+_-s0)9qbm84kKl=CLl;5o~42KFpCeD}zf!LgKbK!zTZkL-P zoNy2rrWTjo`{V=D_0ZNkt`>6RnI@v~(OT+tA$iRDy2?F`y|dGlOB!k z=r=rU>5O`E%|pJO-8L73;$j=`7V`UY-+gn$9vLmVa%t%zq@n`p3A>bC7e_b7J{sQ< zm`Zc=0b{4Tv{l#VqOB3xHr%=Y$8F@!optExO~*nv8U(29brJBoNV6`z9BkMDty@yI zB;=OD>|b|{ny+1drXJ1a@=I(B$aBI6M1tr@JZi3dy)pUbC21>?p@l_IEv8EgyiBgb z&7%%newP6WEsOdWziZzB0000 - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/modules/images/toolbar/insert-redirect.png b/modules/images/toolbar/insert-redirect.png deleted file mode 100644 index 35772cece2ade18fdaca2a70d347b94f6ab7f1d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 983 zcmV;|11S87P)oen zTJv8#7QoDzGjt@n8o%F<{09($mTx_ecGhugGU*I0t!;F6bg44pL^95%n`}dBm1wQFIC{TfPLP42jBdG@6oh$QKF({C<2s zFOf(T4JfquP0PaP^-W%iqT@(pN+|&t7^X%$3I|P1t&Nq5vvlrks#-e9=Q03*!cYcI zd7m(lv?MhbAP!2e&mW*MY;wV)uP|}OZDf`&qPn^og>nO7a$=VmAx0#Cl%u7==IK}8 z;@LNTBX<<-)5X=&)A>URu!3* zEAa;cXphD)6h&RETnf;Fb+vH7&vRe?g|j5V1v~UZT^F%v6rbNuGLazUvk3ab)pKn(MNpn<#z`~=pUi=dL9nNwyc(ZU?ucTVs8o#Fs^I!H2G%7Nn5ISPoYoIc@WDe@^TL6H z?CW2|Nc11tmi&oMMsZ9p#rk&CiiKR^oz5*+U#Z-P%T`^vLZ&4aj}i{oa@+|ga-5Sy zuZr-`&)>28OW(6_f7iU86z2< zEsedfX5kvrJIW5dTq^+EwlNJ8P#~!MWPR17r~b^trya}5+wC#==1rYCjbJcDCY|Qr z5mN)Qva&MVz5kG*+FY6;$ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/modules/images/toolbar/insert-reference.png b/modules/images/toolbar/insert-reference.png deleted file mode 100644 index 8573d032a914c33001c5ee15e3c0d90ebc29a405..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmV-H0lxl;P)*yHhDQf*zW(8l)M@kI2Hlfjq`()+yodH!R-DYN@fBK z?Ah;LZ)$Y;YGhf!z*+t7-J?e1cq8=*3~X|*m5n`& - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/modules/images/toolbar/insert-signature.png b/modules/images/toolbar/insert-signature.png deleted file mode 100644 index 52e0c994b89048e1f4ed88785dbd4c70613f0119..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 748 zcmV`rl*-2frKw;+3|1fr(WKg`{$oS^6z5#ROw-=L%D@KtoG!prsH|PqQN?01T*nItRldB-$ z@su$_*~_IMzY1b|VnN|{El3{A03Q3> zut4ij>&RKFISE@cks)Gj6#78_88%N}dx`G3em>_1AayDS-v~{ zp_6DNVr>MnqyO;A*jy1aIh-Nl`=S*e$apaI0({ZH$a#i3OJ-!wE}^5g!UeT}X;KY8^BdG1|8GTtsbcEn}pSQPG1ks^-t}umbbmDTJjpEbI0+ zI)Sz!s&^=Y9=)U2!Muj17APz%f|YvCp?I4f9u`A030rRwYopO##Ep89H3~rg@ypnE zNa=3@V}S-AdklueQ9Gp z4F>#x_zN`m^n)yb#(XtWGGS$4V($sb=y)X|YhVfqXTm@Xh+TnL7Kquwv55+pfWGAB e7dKNR#xMY*iWAy%KfI3s0000 - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/images/toolbar/insert-table.png b/modules/images/toolbar/insert-table.png deleted file mode 100644 index 65dcfabffeaddffb9e66d5f1e4836039d5dc64e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1SGw${mubWY$ZW{!3_UF&^$uA7AUgA)5S5Q zf^mxvvk()b$lEVF^91xKM9*%{>D~OA;j0mQ;{O`^8)f##=j&+9DyWu?S7}M-mT6wk zbZB$y_4kKlQ=${si9Wo2ZpD`^`&-v+Jh4IPp!W%jgZJLQ@PDp(KjH~@+QJHtyA#4^ zztpte%l6AO`t7YM>*#gIZ>-(8AhPSJq>7{9(V~qZnu?;awr`i~tv*$HKmS4n%ZiCX z{S2l-Pq=PLIsV_Uz-D>S`aL@eKK^mt#1NpomCLS+ks&YakY_Rb?xR3IFnGH9xvX - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/images/toolbar/search-replace.png b/modules/images/toolbar/search-replace.png deleted file mode 100644 index 0d0c3cdb1778741bfb6433f3183e7ded3659d31d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 740 zcmV?GjomnHT*S2<)NWAw*|u%lwrv}iwcBrZ zUiKpUqIdGI=bSln=Fe(A?HF4UiAjlGKJKpWP9GfKE5)O?uZLY_WoM{MxO=*Eb#+3^ zt!zuF8c3)ZN-OW?v9qh=uND6N`-h6Ugp;!agw)bDubhFp!IierwaD@@|C}yfj*JeQ zOh!?tY%9Ug#M~;EwC>4e^NRipg^E|+NLZd^P4JCIgSCY3go|mj;P+?VO>jPIBav3z$U<zkJHj z*s^}&Osg5oY@CWH>I*3x;ALY|0~Rm>6n^B}6B1vE^Mk`X`htRhdAtxoSV1q30YUy4 zu;%xq+>UcNt?+?{?G*g7vQlp!FK9}orlsg~n}E%b_-hhh@oz67_-tGA7Mf%vTFe`jzI+_#1*x*Q>Xdr?(r;OKdW>BrqlTZL!y5 zKS=9mN4Ayl@N&h4wFNFj`0&EsnlxAP^FF8L4P%_#984yYy2Q_)KNbIsUR_;%e_VTD z-|nkN_Pjr)9UB{)nwp|D-Z{KkSXdxn6^XB3ze?=&brNC3%*>2Nqj_*hTV7sXQ&U5> z9UUFKq=WkU`WR+5o9!k3S^>i-E-x>`0ZhyN+S(fKaDgKNvv;0000 - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/jquery.wikiEditor.dialogs.config.js b/modules/jquery.wikiEditor.dialogs.config.js index 878f9f50..c8d329f8 100644 --- a/modules/jquery.wikiEditor.dialogs.config.js +++ b/modules/jquery.wikiEditor.dialogs.config.js @@ -16,8 +16,7 @@ link: { labelMsg: 'wikieditor-toolbar-tool-link', type: 'button', - icon: 'insert-link.png', - offset: [ 2, -1654 ], + oouiIcon: 'link', action: { type: 'dialog', module: 'insert-link' @@ -26,8 +25,7 @@ file: { labelMsg: 'wikieditor-toolbar-tool-file', type: 'button', - icon: 'insert-file.png', - offset: [ 2, -1438 ], + oouiIcon: 'image', action: { type: 'dialog', module: 'insert-file' @@ -37,8 +35,7 @@ labelMsg: 'wikieditor-toolbar-tool-reference', filters: [ 'body.ns-subject' ], type: 'button', - icon: 'insert-reference.png', - offset: [ 2, -1798 ], + oouiIcon: 'book', action: { type: 'dialog', module: 'insert-reference' @@ -53,8 +50,7 @@ table: { labelMsg: 'wikieditor-toolbar-tool-table', type: 'button', - icon: 'insert-table.png', - offset: [ 2, -1942 ], + oouiIcon: 'table', action: { type: 'dialog', module: 'insert-table' @@ -70,8 +66,7 @@ replace: { labelMsg: 'wikieditor-toolbar-tool-replace', type: 'button', - icon: 'search-replace.png', - offset: [ -70, -214 ], + oouiIcon: 'find', action: { type: 'dialog', module: 'search-and-replace' diff --git a/modules/jquery.wikiEditor.js b/modules/jquery.wikiEditor.js index 691bcb32..1f06902a 100644 --- a/modules/jquery.wikiEditor.js +++ b/modules/jquery.wikiEditor.js @@ -155,37 +155,15 @@ * * @param {Object} icon Icon object from e.g. toolbar config * @param {string} path Default icon path, defaults to $.wikiEditor.imgPath - * @return {string} - */ - autoIcon: function ( icon, path ) { - var src = $.wikiEditor.autoLang( icon ); - path = path || $.wikiEditor.imgPath; - // Prepend path if src is not absolute - if ( src.substr( 0, 7 ) !== 'http://' && src.substr( 0, 8 ) !== 'https://' && src[ 0 ] !== '/' ) { - src = path + src; - } - return src + '?' + mw.loader.getVersion( 'jquery.wikiEditor' ); - }, - - /** - * Get the sprite offset for a language if available, icon for a language if available, or the default offset or icon, - * in that order of preference. - * - * @param {Object} icon Icon object, see autoIcon() - * @param {Object} offset Offset object - * @param {string} path Icon path, see autoIcon() * @return {Object} */ - autoIconOrOffset: function ( icon, offset, path ) { + autoIcon: function ( icon, path ) { var i, key, src; path = path || $.wikiEditor.imgPath; for ( i = 0; i < fallbackChain.length; i++ ) { key = fallbackChain[ i ]; - if ( offset && hasOwn.call( offset, key ) ) { - return offset[ key ]; - } if ( icon && hasOwn.call( icon, key ) ) { src = icon[ key ]; // Prepend path if src is not absolute @@ -195,7 +173,7 @@ return src + '?' + mw.loader.getVersion( 'jquery.wikiEditor' ); } } - return offset || icon; + return icon; } }; diff --git a/modules/jquery.wikiEditor.toolbar.config.js b/modules/jquery.wikiEditor.toolbar.config.js index bd9af46d..c4f63565 100644 --- a/modules/jquery.wikiEditor.toolbar.config.js +++ b/modules/jquery.wikiEditor.toolbar.config.js @@ -56,8 +56,7 @@ signature: { labelMsg: 'wikieditor-toolbar-tool-signature', type: 'button', - offset: [ 2, -1870 ], - icon: 'insert-signature.png', + oouiIcon: 'signature', action: { type: 'encapsulate', options: { @@ -261,8 +260,7 @@ gallery: { labelMsg: 'wikieditor-toolbar-tool-gallery', type: 'button', - icon: 'insert-gallery.png', - offset: [ 2, -1510 ], + oouiIcon: 'imageGallery', action: { type: 'encapsulate', options: { @@ -279,14 +277,7 @@ redirect: { labelMsg: 'wikieditor-toolbar-tool-redirect', type: 'button', - icon: { - 'default': 'insert-redirect.png', - 'default-rtl': 'insert-redirect-rtl.png' - }, - offset: { - 'default': [ -70, -142 ], - 'default-rtl': [ -70, -502 ] - }, + oouiIcon: 'articleRedirect', action: { type: 'encapsulate', options: { diff --git a/modules/jquery.wikiEditor.toolbar.js b/modules/jquery.wikiEditor.toolbar.js index 5d360b6d..c701ad58 100644 --- a/modules/jquery.wikiEditor.toolbar.js +++ b/modules/jquery.wikiEditor.toolbar.js @@ -305,7 +305,7 @@ return $group; }, buildTool: function ( context, id, tool ) { - var i, label, $button, offsetOrIcon, $select, $options, oouiButton, + var i, label, $button, icon, $select, $options, oouiButton, option, optionLabel; if ( 'filters' in tool ) { for ( i = 0; i < tool.filters.length; i++ ) { @@ -337,18 +337,12 @@ 'class': 'tool tool-button' } ) .text( label ); - offsetOrIcon = $.wikiEditor.autoIconOrOffset( - tool.icon, - tool.offset, - $.wikiEditor.imgPath + 'toolbar/' - ); - if ( typeof offsetOrIcon === 'object' ) { - $button - .addClass( 'wikiEditor-toolbar-spritedButton' ) - .css( 'backgroundPosition', offsetOrIcon[ 0 ] + 'px ' + offsetOrIcon[ 1 ] + 'px' ); - } else if ( offsetOrIcon !== undefined ) { // Bug T172500 - $button - .css( 'background-image', 'url(' + offsetOrIcon + ')' ); + if ( tool.icon ) { + icon = $.wikiEditor.autoIcon( + tool.icon, + $.wikiEditor.imgPath + 'toolbar/' + ); + $button.css( 'background-image', 'url(' + icon + ')' ); } } $button.data( 'setActive', function ( active ) { diff --git a/modules/jquery.wikiEditor.toolbar.less b/modules/jquery.wikiEditor.toolbar.less index 77640c5a..69d50d54 100644 --- a/modules/jquery.wikiEditor.toolbar.less +++ b/modules/jquery.wikiEditor.toolbar.less @@ -328,11 +328,6 @@ overflow: hidden; } -/* Sprited buttons */ -.wikiEditor-toolbar-spritedButton { - .background-image-svg('images/toolbar/button-sprite.svg', 'images/toolbar/button-sprite.png'); -} - /* OOUI buttons */ .tool.oo-ui-buttonElement-frameless.oo-ui-iconElement { margin: 0;