diff options
Diffstat (limited to 'extensions/WikiEditor/modules')
83 files changed, 206 insertions, 115 deletions
diff --git a/extensions/WikiEditor/modules/ext.wikiEditor.css b/extensions/WikiEditor/modules/ext.wikiEditor.css index f0665730..30a27326 100644 --- a/extensions/WikiEditor/modules/ext.wikiEditor.css +++ b/extensions/WikiEditor/modules/ext.wikiEditor.css @@ -2,19 +2,16 @@ * CSS for WikiEditor */ -/* This ID (#editform) could change in MediaWiki */ form#editform { margin: 0; padding: 0; } -/* These IDs (#wpSummaryLabel and #wpSummary) could change in MediaWiki */ #wpSummary, #wpSummaryLabel { margin-bottom: 1em; } -/* This ID (#wpTextbox1) could change in MediaWiki */ .wikiEditor-ui textarea#wpTextbox1 { border: none; padding: 0; @@ -26,3 +23,9 @@ form#editform { .wikiEditor-ui .wikiEditor-ui-text > textarea#wpTextbox1 { margin: 0; } + +/* Hide vanilla MediaWiki's "Editing help" link, as we provide it in the toolbar */ +.editButtons .editHelp, +.editButtons .mw-editButtons-pipe-separator { + display: none; +} diff --git a/extensions/WikiEditor/modules/images/dialogs/insert-disambiguation.png b/extensions/WikiEditor/modules/images/dialogs/insert-disambiguation.png Binary files differnew file mode 100644 index 00000000..f9057763 --- /dev/null +++ b/extensions/WikiEditor/modules/images/dialogs/insert-disambiguation.png diff --git a/extensions/WikiEditor/modules/images/dialogs/insert-link-exists.png b/extensions/WikiEditor/modules/images/dialogs/insert-link-exists.png Binary files differindex 1935267d..6c65e1ba 100644 --- a/extensions/WikiEditor/modules/images/dialogs/insert-link-exists.png +++ b/extensions/WikiEditor/modules/images/dialogs/insert-link-exists.png diff --git a/extensions/WikiEditor/modules/images/dialogs/insert-link-external-rtl.png b/extensions/WikiEditor/modules/images/dialogs/insert-link-external-rtl.png Binary files differindex eb327531..7901e2bc 100644 --- a/extensions/WikiEditor/modules/images/dialogs/insert-link-external-rtl.png +++ b/extensions/WikiEditor/modules/images/dialogs/insert-link-external-rtl.png diff --git a/extensions/WikiEditor/modules/images/dialogs/insert-link-external.png b/extensions/WikiEditor/modules/images/dialogs/insert-link-external.png Binary files differindex c0645999..53d2f732 100644 --- a/extensions/WikiEditor/modules/images/dialogs/insert-link-external.png +++ b/extensions/WikiEditor/modules/images/dialogs/insert-link-external.png diff --git a/extensions/WikiEditor/modules/images/templateEditor/dialog-collapsed.png b/extensions/WikiEditor/modules/images/templateEditor/dialog-collapsed.png Binary files differindex 93c5c794..0cb83821 100644 --- a/extensions/WikiEditor/modules/images/templateEditor/dialog-collapsed.png +++ b/extensions/WikiEditor/modules/images/templateEditor/dialog-collapsed.png diff --git a/extensions/WikiEditor/modules/images/templateEditor/dialog-expanded.png b/extensions/WikiEditor/modules/images/templateEditor/dialog-expanded.png Binary files differindex 5c278cea..8cd3a8b3 100644 --- a/extensions/WikiEditor/modules/images/templateEditor/dialog-expanded.png +++ b/extensions/WikiEditor/modules/images/templateEditor/dialog-expanded.png diff --git a/extensions/WikiEditor/modules/images/templateEditor/expand.png b/extensions/WikiEditor/modules/images/templateEditor/expand.png Binary files differindex a92c4e4e..1db80410 100644 --- a/extensions/WikiEditor/modules/images/templateEditor/expand.png +++ b/extensions/WikiEditor/modules/images/templateEditor/expand.png diff --git a/extensions/WikiEditor/modules/images/templateEditor/name-base.png b/extensions/WikiEditor/modules/images/templateEditor/name-base.png Binary files differindex ae3d62d6..0d1cce71 100644 --- a/extensions/WikiEditor/modules/images/templateEditor/name-base.png +++ b/extensions/WikiEditor/modules/images/templateEditor/name-base.png diff --git a/extensions/WikiEditor/modules/images/templateEditor/text-base.png b/extensions/WikiEditor/modules/images/templateEditor/text-base.png Binary files differindex d16aa18e..8fda004a 100644 --- a/extensions/WikiEditor/modules/images/templateEditor/text-base.png +++ b/extensions/WikiEditor/modules/images/templateEditor/text-base.png diff --git a/extensions/WikiEditor/modules/images/templateEditor/wiki-text.png b/extensions/WikiEditor/modules/images/templateEditor/wiki-text.png Binary files differindex ce8cef80..44afb4df 100644 --- a/extensions/WikiEditor/modules/images/templateEditor/wiki-text.png +++ b/extensions/WikiEditor/modules/images/templateEditor/wiki-text.png diff --git a/extensions/WikiEditor/modules/images/toc/close.png b/extensions/WikiEditor/modules/images/toc/close.png Binary files differindex 9078c4bf..a540856f 100644 --- a/extensions/WikiEditor/modules/images/toc/close.png +++ b/extensions/WikiEditor/modules/images/toc/close.png diff --git a/extensions/WikiEditor/modules/images/toc/grab.png b/extensions/WikiEditor/modules/images/toc/grab.png Binary files differindex 144f0d67..6291ec86 100644 --- a/extensions/WikiEditor/modules/images/toc/grab.png +++ b/extensions/WikiEditor/modules/images/toc/grab.png diff --git a/extensions/WikiEditor/modules/images/toc/grip.png b/extensions/WikiEditor/modules/images/toc/grip.png Binary files differindex ad0855ab..07898519 100644 --- a/extensions/WikiEditor/modules/images/toc/grip.png +++ b/extensions/WikiEditor/modules/images/toc/grip.png diff --git a/extensions/WikiEditor/modules/images/toc/open.png b/extensions/WikiEditor/modules/images/toc/open.png Binary files differindex 2f26a3fd..c782beb7 100644 --- a/extensions/WikiEditor/modules/images/toc/open.png +++ b/extensions/WikiEditor/modules/images/toc/open.png diff --git a/extensions/WikiEditor/modules/images/toolbar/arrow-down.png b/extensions/WikiEditor/modules/images/toolbar/arrow-down.png Binary files differindex 0221028e..41ecb8ba 100644 --- a/extensions/WikiEditor/modules/images/toolbar/arrow-down.png +++ b/extensions/WikiEditor/modules/images/toolbar/arrow-down.png diff --git a/extensions/WikiEditor/modules/images/toolbar/arrow-ltr.png b/extensions/WikiEditor/modules/images/toolbar/arrow-ltr.png Binary files differindex 063ac6f7..d401bf0a 100644 --- a/extensions/WikiEditor/modules/images/toolbar/arrow-ltr.png +++ b/extensions/WikiEditor/modules/images/toolbar/arrow-ltr.png diff --git a/extensions/WikiEditor/modules/images/toolbar/arrow-rtl.png b/extensions/WikiEditor/modules/images/toolbar/arrow-rtl.png Binary files differindex 9e61e2f3..b9598a30 100644 --- a/extensions/WikiEditor/modules/images/toolbar/arrow-rtl.png +++ b/extensions/WikiEditor/modules/images/toolbar/arrow-rtl.png diff --git a/extensions/WikiEditor/modules/images/toolbar/base.png b/extensions/WikiEditor/modules/images/toolbar/base.png Binary files differindex 5c5fb2c9..ebd432e6 100644 --- a/extensions/WikiEditor/modules/images/toolbar/base.png +++ b/extensions/WikiEditor/modules/images/toolbar/base.png diff --git a/extensions/WikiEditor/modules/images/toolbar/button-sprite.png b/extensions/WikiEditor/modules/images/toolbar/button-sprite.png Binary files differindex de825702..a51432dc 100644 --- a/extensions/WikiEditor/modules/images/toolbar/button-sprite.png +++ b/extensions/WikiEditor/modules/images/toolbar/button-sprite.png diff --git a/extensions/WikiEditor/modules/images/toolbar/example-image.png b/extensions/WikiEditor/modules/images/toolbar/example-image.png Binary files differindex 80a21c6a..a0862f40 100644 --- a/extensions/WikiEditor/modules/images/toolbar/example-image.png +++ b/extensions/WikiEditor/modules/images/toolbar/example-image.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-big.png b/extensions/WikiEditor/modules/images/toolbar/format-big.png Binary files differindex 11e6f3f7..fe28ab30 100644 --- a/extensions/WikiEditor/modules/images/toolbar/format-big.png +++ b/extensions/WikiEditor/modules/images/toolbar/format-big.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-L.png b/extensions/WikiEditor/modules/images/toolbar/format-bold-L.png Binary files differnew file mode 100644 index 00000000..4819e670 --- /dev/null +++ b/extensions/WikiEditor/modules/images/toolbar/format-bold-L.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-ka.png b/extensions/WikiEditor/modules/images/toolbar/format-bold-ka.png Binary files differindex de20bd49..29bcdd36 100644 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold-ka.png +++ b/extensions/WikiEditor/modules/images/toolbar/format-bold-ka.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-os.png b/extensions/WikiEditor/modules/images/toolbar/format-bold-os.png Binary files differnew file mode 100644 index 00000000..e54f9d02 --- /dev/null +++ b/extensions/WikiEditor/modules/images/toolbar/format-bold-os.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-ru.png b/extensions/WikiEditor/modules/images/toolbar/format-bold-ru.png Binary files differindex a21dc787..6a69c036 100644 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold-ru.png +++ b/extensions/WikiEditor/modules/images/toolbar/format-bold-ru.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold.png b/extensions/WikiEditor/modules/images/toolbar/format-bold.png Binary files differindex cc51e326..22cdc546 100644 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold.png +++ b/extensions/WikiEditor/modules/images/toolbar/format-bold.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-indent-rtl.png b/extensions/WikiEditor/modules/images/toolbar/format-indent-rtl.png Binary files differindex e94d2007..6dbad6d4 100644 --- a/extensions/WikiEditor/modules/images/toolbar/format-indent-rtl.png +++ b/extensions/WikiEditor/modules/images/toolbar/format-indent-rtl.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-indent.png b/extensions/WikiEditor/modules/images/toolbar/format-indent.png Binary files differindex 14a5e22f..ec1ba450 100644 --- a/extensions/WikiEditor/modules/images/toolbar/format-indent.png +++ b/extensions/WikiEditor/modules/images/toolbar/format-indent.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-italic-E.png b/extensions/WikiEditor/modules/images/toolbar/format-italic-E.png Binary files differnew file mode 100644 index 00000000..181a09b2 --- /dev/null +++ b/extensions/WikiEditor/modules/images/toolbar/format-italic-E.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-italic.png b/extensions/WikiEditor/modules/images/toolbar/format-italic.png Binary files differindex eb21ab4e..f51e7a93 100644 --- a/extensions/WikiEditor/modules/images/toolbar/format-italic.png +++ b/extensions/WikiEditor/modules/images/toolbar/format-italic.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-ulist-rtl.png b/extensions/WikiEditor/modules/images/toolbar/format-ulist-rtl.png Binary files differindex 5e0fc6e4..8781f744 100644 --- a/extensions/WikiEditor/modules/images/toolbar/format-ulist-rtl.png +++ b/extensions/WikiEditor/modules/images/toolbar/format-ulist-rtl.png diff --git a/extensions/WikiEditor/modules/images/toolbar/format-ulist.png b/extensions/WikiEditor/modules/images/toolbar/format-ulist.png Binary files differindex dabd0183..ac4438d7 100644 --- a/extensions/WikiEditor/modules/images/toolbar/format-ulist.png +++ b/extensions/WikiEditor/modules/images/toolbar/format-ulist.png diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-file.png b/extensions/WikiEditor/modules/images/toolbar/insert-file.png Binary files differindex 4b0d246e..44de584f 100644 --- a/extensions/WikiEditor/modules/images/toolbar/insert-file.png +++ b/extensions/WikiEditor/modules/images/toolbar/insert-file.png diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-gallery.png b/extensions/WikiEditor/modules/images/toolbar/insert-gallery.png Binary files differindex d5402094..5ceeb567 100644 --- a/extensions/WikiEditor/modules/images/toolbar/insert-gallery.png +++ b/extensions/WikiEditor/modules/images/toolbar/insert-gallery.png diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-ilink.png b/extensions/WikiEditor/modules/images/toolbar/insert-ilink.png Binary files differindex c5a286e5..acee281f 100644 --- a/extensions/WikiEditor/modules/images/toolbar/insert-ilink.png +++ b/extensions/WikiEditor/modules/images/toolbar/insert-ilink.png diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-nowiki.png b/extensions/WikiEditor/modules/images/toolbar/insert-nowiki.png Binary files differindex 2f607bfd..92f56d88 100644 --- a/extensions/WikiEditor/modules/images/toolbar/insert-nowiki.png +++ b/extensions/WikiEditor/modules/images/toolbar/insert-nowiki.png diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-redirect-rtl.png b/extensions/WikiEditor/modules/images/toolbar/insert-redirect-rtl.png Binary files differindex 6230d9ec..c6c62c1e 100644 --- a/extensions/WikiEditor/modules/images/toolbar/insert-redirect-rtl.png +++ b/extensions/WikiEditor/modules/images/toolbar/insert-redirect-rtl.png diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-redirect.png b/extensions/WikiEditor/modules/images/toolbar/insert-redirect.png Binary files differindex 31137dc9..5115ad79 100644 --- a/extensions/WikiEditor/modules/images/toolbar/insert-redirect.png +++ b/extensions/WikiEditor/modules/images/toolbar/insert-redirect.png diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-reference.png b/extensions/WikiEditor/modules/images/toolbar/insert-reference.png Binary files differindex cc144ccf..8573d032 100644 --- a/extensions/WikiEditor/modules/images/toolbar/insert-reference.png +++ b/extensions/WikiEditor/modules/images/toolbar/insert-reference.png diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-signature.png b/extensions/WikiEditor/modules/images/toolbar/insert-signature.png Binary files differindex 23ad7da7..d42cf37f 100644 --- a/extensions/WikiEditor/modules/images/toolbar/insert-signature.png +++ b/extensions/WikiEditor/modules/images/toolbar/insert-signature.png diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-xlink.png b/extensions/WikiEditor/modules/images/toolbar/insert-xlink.png Binary files differindex fd28a57d..db049b6a 100644 --- a/extensions/WikiEditor/modules/images/toolbar/insert-xlink.png +++ b/extensions/WikiEditor/modules/images/toolbar/insert-xlink.png diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/arrow-down.png b/extensions/WikiEditor/modules/images/toolbar/png24/arrow-down.png Binary files differdeleted file mode 100644 index 623795f6..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/arrow-down.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/arrow-left.png b/extensions/WikiEditor/modules/images/toolbar/png24/arrow-left.png Binary files differdeleted file mode 100644 index 91d5f1de..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/arrow-left.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/arrow-right.png b/extensions/WikiEditor/modules/images/toolbar/png24/arrow-right.png Binary files differdeleted file mode 100644 index e8e95bc7..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/arrow-right.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-big.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-big.png Binary files differdeleted file mode 100644 index dee5b106..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-big.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-A.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-A.png Binary files differdeleted file mode 100644 index 5970b4d4..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-A.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-B.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-B.png Binary files differdeleted file mode 100644 index d785a20b..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-B.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-F.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-F.png Binary files differdeleted file mode 100644 index eea5b71e..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-F.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-G.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-G.png Binary files differdeleted file mode 100644 index 5781fae0..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-G.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-N.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-N.png Binary files differdeleted file mode 100644 index b3e38798..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-N.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-P.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-P.png Binary files differdeleted file mode 100644 index 3c9e8496..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-P.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-V.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-V.png Binary files differdeleted file mode 100644 index b5a96621..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold-V.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-bold.png Binary files differdeleted file mode 100644 index 5970b4d4..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-bold.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-A.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-A.png Binary files differdeleted file mode 100644 index 47881e1f..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-A.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-C.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-C.png Binary files differdeleted file mode 100644 index 3752f8cc..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-C.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-I.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-I.png Binary files differdeleted file mode 100644 index b47d2b2c..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-I.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-K.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-K.png Binary files differdeleted file mode 100644 index 8e8c55a9..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic-K.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-italic.png Binary files differdeleted file mode 100644 index 47881e1f..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-italic.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-olist.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-olist.png Binary files differdeleted file mode 100644 index 893b187f..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-olist.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-small.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-small.png Binary files differdeleted file mode 100644 index 9a8b8656..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-small.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-subscript.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-subscript.png Binary files differdeleted file mode 100644 index 1e3d778b..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-subscript.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-superscript.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-superscript.png Binary files differdeleted file mode 100644 index 6f9a73b8..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-superscript.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/format-ulist.png b/extensions/WikiEditor/modules/images/toolbar/png24/format-ulist.png Binary files differdeleted file mode 100644 index 33c8f84c..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/format-ulist.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/generate.sh b/extensions/WikiEditor/modules/images/toolbar/png24/generate.sh deleted file mode 100644 index ca14ee68..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/generate.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/bash - -# Compresses all PNGs in the current directory and puts the compressed -# version in the parent directory -# -# Requires pngcrush - -for f in *.png -do - pngcrush $f ../$f -done - diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/insert-file.png b/extensions/WikiEditor/modules/images/toolbar/png24/insert-file.png Binary files differdeleted file mode 100644 index cabc613a..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/insert-file.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/insert-gallery.png b/extensions/WikiEditor/modules/images/toolbar/png24/insert-gallery.png Binary files differdeleted file mode 100644 index 661689ae..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/insert-gallery.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/insert-link.png b/extensions/WikiEditor/modules/images/toolbar/png24/insert-link.png Binary files differdeleted file mode 100644 index b16eeaba..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/insert-link.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/insert-newline.png b/extensions/WikiEditor/modules/images/toolbar/png24/insert-newline.png Binary files differdeleted file mode 100644 index d5ec80b6..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/insert-newline.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/insert-nowiki.png b/extensions/WikiEditor/modules/images/toolbar/png24/insert-nowiki.png Binary files differdeleted file mode 100644 index ab9a3752..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/insert-nowiki.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/insert-redirect.png b/extensions/WikiEditor/modules/images/toolbar/png24/insert-redirect.png Binary files differdeleted file mode 100644 index 22faf0ee..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/insert-redirect.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/insert-reference.png b/extensions/WikiEditor/modules/images/toolbar/png24/insert-reference.png Binary files differdeleted file mode 100644 index aaaf642f..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/insert-reference.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/insert-signature.png b/extensions/WikiEditor/modules/images/toolbar/png24/insert-signature.png Binary files differdeleted file mode 100644 index 476a4236..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/insert-signature.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/insert-table.png b/extensions/WikiEditor/modules/images/toolbar/png24/insert-table.png Binary files differdeleted file mode 100644 index 070a3e3c..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/insert-table.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/images/toolbar/png24/search-replace.png b/extensions/WikiEditor/modules/images/toolbar/png24/search-replace.png Binary files differdeleted file mode 100644 index 6c2c6617..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/png24/search-replace.png +++ /dev/null diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.css b/extensions/WikiEditor/modules/jquery.wikiEditor.css index 6df44565..d8e331cc 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.css +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.css @@ -9,6 +9,12 @@ width: 100%; background-color: #E0EEf7; border: solid silver 1px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} +.wikiEditor-ui textarea { + width: 100%; } .wikiEditor-ui textarea:focus { outline: none; @@ -109,4 +115,4 @@ background: url(images/toolbar/loading.gif) 0 0 no-repeat; text-indent: -9999px; margin: 0 auto; -}
\ No newline at end of file +} diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.css b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.css index efde00fb..39d9d50e 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.css +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.css @@ -55,7 +55,8 @@ #wikieditor-toolbar-link-int-target-status-exists, #wikieditor-toolbar-link-int-target-status-notexists, #wikieditor-toolbar-link-int-target-status-invalid, -#wikieditor-toolbar-link-int-target-status-external { +#wikieditor-toolbar-link-int-target-status-external, +#wikieditor-toolbar-link-int-target-status-disambig { padding-left: 30px; background-position: 0 50%; background-repeat: no-repeat; @@ -80,6 +81,11 @@ background-image: url(images/dialogs/insert-link-external.png); background-position: left; } +#wikieditor-toolbar-link-int-target-status-disambig { + /* @embed */ + background-image: url(images/dialogs/insert-disambiguation.png); + background-position: left; +} /* File dialog */ #wikieditor-toolbar-file-target, #wikieditor-toolbar-file-caption { diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js index ca8af558..0d769164 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js @@ -188,40 +188,40 @@ $.wikiEditor.modules.dialogs.config = { // Show loading spinner while waiting for the API to respond updateWidget( 'loading' ); // Call the API to check page status, saving the request object so it can be aborted if - // necessary + // necessary. + // This used to request a page that would show whether or not the target exists, but we can + // also check whether it has the disambiguation property and still get existence information. + // If the Disambiguator extension is not installed then such a property won't be set. $( '#wikieditor-toolbar-link-int-target-status' ).data( 'request', - $.ajax( { - url: mw.util.wikiScript( 'api' ), - dataType: 'json', - data: { - action: 'query', - indexpageids: '', - titles: target, - converttitles: '', - format: 'json' - }, - success: function ( data ) { - var status; - if ( !data || !data.query ) { - // This happens in some weird cases - status = false; - } else { - var page = data.query.pages[data.query.pageids[0]]; - status = 'exists'; - if ( page.missing !== undefined ) { - status = 'notexists'; - } else if ( page.invalid !== undefined ) { - status = 'invalid'; - } - } - // Cache the status of the link target if the force internal - // parameter was not passed - if ( !internal ) { - cache[target] = status; + ( new mw.Api() ).get( { + action: 'query', + prop: 'pageprops', + titles: target, + ppprop: 'disambiguation', + indexpageids: true + } ).done( function ( data ) { + var status; + if ( !data.query ) { + // This happens in some weird cases + status = false; + } else { + var page = data.query.pages[data.query.pageids[0]]; + status = 'exists'; + if ( page.missing !== undefined ) { + status = 'notexists'; + } else if ( page.invalid !== undefined ) { + status = 'invalid'; + } else if ( page.pageprops !== undefined ) { + status = 'disambig'; } - updateWidget( status ); } + // Cache the status of the link target if the force internal + // parameter was not passed + if ( !internal ) { + cache[target] = status; + } + updateWidget( status ); } ) ); } @@ -324,6 +324,7 @@ $.wikiEditor.modules.dialogs.config = { var invalidMsg = mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-invalid' ); var externalMsg = mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-external' ); var loadingMsg = mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-loading' ); + var disambigMsg = mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-disambig' ); $( '#wikieditor-toolbar-link-int-target-status' ) .append( $( '<div>' ) .attr( 'id', 'wikieditor-toolbar-link-int-target-status-exists' ) @@ -349,6 +350,10 @@ $.wikiEditor.modules.dialogs.config = { 'title': loadingMsg } ) ) ) + .append( $( '<div>' ) + .attr( 'id', 'wikieditor-toolbar-link-int-target-status-disambig' ) + .append( disambigMsg ) + ) .data( 'existencecache', {} ) .children().hide(); @@ -1000,6 +1005,7 @@ $.wikiEditor.modules.dialogs.config = { return; } if ( ( rows * cols ) > 1000 ) { + // 1000 is in the English message. The parameter replacement is kept for BC. alert( mw.msg( 'wikieditor-toolbar-tool-table-toomany', 1000 ) ); return; } diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.js b/extensions/WikiEditor/modules/jquery.wikiEditor.js index 6e87a45f..def8b69e 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.js +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.js @@ -146,9 +146,9 @@ $.wikiEditor = { } else if ( property + 'Msg' in object ) { var p = object[property + 'Msg']; if ( $.isArray( p ) && p.length >= 2 ) { - return mediaWiki.msg.apply( mediaWiki.msg, p ); + return mediaWiki.message.apply( mediaWiki.message, p ).plain(); } else { - return mediaWiki.msg( p ); + return mediaWiki.message( p ).plain(); } } else { return ''; diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.publish.js b/extensions/WikiEditor/modules/jquery.wikiEditor.publish.js index bb631cf2..b61140dc 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.publish.js +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.publish.js @@ -105,6 +105,7 @@ fn: { e.preventDefault(); }); }, + immediateCreate: true, dialog: { buttons: { 'wikieditor-publish-dialog-publish': function () { @@ -144,7 +145,10 @@ fn: { context.fn.addButton( { 'captionMsg': 'wikieditor-publish-button-cancel', - 'action': function () { } + 'action': function () { + window.location.href = $( '#mw-editform-cancel' ).attr( 'href' ); + return false; + } } ); } } diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.toc.js b/extensions/WikiEditor/modules/jquery.wikiEditor.toc.js index 5cfa900c..54b8a863 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.toc.js +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.toc.js @@ -478,8 +478,6 @@ fn: { //$( this ).removeClass( 'current' ); setTimeout( function() { $.wikiEditor.modules.toc.fn.unhighlight( context ); }, 1000 ); - if ( typeof $.trackAction != 'undefined' ) - $.trackAction( 'ntoc.heading' ); event.preventDefault(); } ) .text( structure[i].text ); diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js index 1477a332..d3f7a9d5 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js @@ -21,6 +21,7 @@ getDefaultConfig: function() { 'cs': [2, -142], 'de': [2, -214], 'fr': [2, -286], + 'gl': [2, -358], 'es': [2, -358], 'he': [2, -142], 'hu': [2, -214], @@ -37,12 +38,16 @@ getDefaultConfig: function() { 'cs': 'format-bold-B.png', 'de': 'format-bold-F.png', 'fr': 'format-bold-G.png', + 'gl': 'format-bold-N.png', 'es': 'format-bold-N.png', + 'eu': 'format-bold-L.png', 'he': 'format-bold-B.png', 'hu': 'format-bold-F.png', 'it': 'format-bold-G.png', 'ka': 'format-bold-ka.png', + 'ky': 'format-bold-ru.png', 'nl': 'format-bold-V.png', + 'os': 'format-bold-os.png', 'pt': 'format-bold-N.png', 'pt-br': 'format-bold-N.png', 'pl': 'format-bold-B.png', @@ -70,9 +75,11 @@ getDefaultConfig: function() { 'cs': [2, -862], 'de': [2, -934], 'fr': [2, -862], + 'gl': [2, -790], 'es': [2, -790], 'he': [2, -862], 'it': [2, -790], + 'ky': [2, -934], 'nl': [2, -790], 'pt': [2, -862], 'pt-br': [2, -862], @@ -86,12 +93,16 @@ getDefaultConfig: function() { 'cs': 'format-italic-I.png', 'de': 'format-italic-K.png', 'fr': 'format-italic-I.png', + 'gl': 'format-italic-C.png', 'es': 'format-italic-C.png', + 'eu': 'format-italic-E.png', 'he': 'format-italic-I.png', 'hu': 'format-italic-D.png', 'it': 'format-italic-C.png', 'ka': 'format-italic-ka.png', + 'ky': 'format-italic-K.png', 'nl': 'format-italic-C.png', + 'os': 'format-italic-K.png', 'pt': 'format-italic-I.png', 'pt-br': 'format-italic-I.png', 'pl': 'format-italic-I.png', @@ -670,67 +681,141 @@ getDefaultConfig: function() { 'layout': 'characters', 'characters': [ "\u0410", "\u0430", // A - "\u04d8", "\u04d9", // Schwa + "\u04d0", "\u04d1", // A with breve (Chuvash) + "\u04d2", "\u04d3", // A with diaeresis (Mari, Gargauz, etc.) + "\u04d8", "\u04d9", // Schwa (Abkhaz, etc) + "\u04da", "\u04db", // Schwa with diaeresis (Khanty) "\u0411", "\u0431", // B "\u0412", "\u0432", // V "\u0413", "\u0433", // G - "\u0490", "\u0491", // G with upturn + "\u0490", "\u0491", // G with upturn (Ukranian, etc) + "\u04f6", "\u04f7", // Ge with descender (Abkhaz, etc) "\u0403", "\u0453", // G with acute (Macedonian) + "\u04fa", "\u04fb", // Ge with stroke and hook (Nivkh) "\u0492", "\u0493", // G with stroke (Kazakh etc.) "\u0494", "\u0495", // G with hook (Sakha etc.) "\u0414", "\u0434", // D - "\u0402", "\u0452", // Dj + "\u0500", "\u0501", // De (Komi) + "\u0502", "\u0503", // Dje (Komi) + "\u0402", "\u0452", // Dj (Serbian, Montenegrin) "\u0415", "\u0435", "\u0400", "\u0450", // IE "\u0404", "\u0454", // Ukrainian IE "\u0401", "\u0451", // IO + "\u04d6", "\u04d7", // Ye with breve (Chuvash) + "\u04bc", "\u04bd", // Che (Abkhazian) + "\u04be", "\u04bf", // Che with descender (Abkhazian) "\u0416", "\u0436", // Zh + "\u0496", "\u0497", // Zhe with descender (Kalmyk, Tatar, etc) + "\u04c1", "\u04c2", // Zhe with breve (Moldovan, Gagauz) + "\u04dc", "\u04dd", // Zhe with diaeresis (Udmurt) "\u0417", "\u0437", // Z - "\u0405", "\u0455", // Dz + "\u0498", "\u0499", // Ze with descender (Bashkir) + "\u04de", "\u04df", // Ze with diaeresis (Udmurt) + "\u0510", "\u0511", // Reversed Ze (Enets, Khanty) + "\u04e0", "\u04e1", // Dze (Abkhazian) + "\u0405", "\u0455", // Dz (Macedonian, Montenegrin) + "\u0504", "\u0505", // Zje (Komi) + "\u0506", "\u0507", // Dzje (Komi) "\u0418", "\u0438", // I - "\u0406", "\u0456", // Dotted I - "\u0407", "\u0457", // I with dieresis + "\u0406", "\u0456", // Dotted I (Ukranian, etc) + "\u0407", "\u0457", // I with dieresis (Rusyn, Ukranian) [ "\u25cc\u04c0", "\u04c0" ], // Palochka. Dotted circle to differentiate from I + [ "\u25cc\u04cf", "\u04cf" ], // Palochka. Dotted circle to differentiate from I "\u0419", "\u0439", // Short I - "\u04e2", "\u04e3", // I with macron - "\u040D", "\u045D", // I with grave (Macedonian) - "\u0408", "\u0458", // J + "\u04e2", "\u04e3", // I with macron (Tajik) + "\u040d", "\u045d", // I with grave (Macedonian) + "\u048a", "\u048b", // Short I with tail (Kildin Sami) + "\u04e4", "\u04e5", // I with diaeresis (Udmurt) + "\u0408", "\u0458", // Je (Altai, Azerbaijani, etc) "\u041a", "\u043a", // K "\u040c", "\u045c", // K with acute (Macedonian) "\u049a", "\u049b", // K with descender (Kazakh etc.) + "\u049c", "\u049d", // Ka with vertical stroke (Azerbaijani) + "\u049e", "\u049f", // Ka with stroke (Abkhaz) + "\u04a0", "\u04a1", // Ka (Bashkir) + "\u04c3", "\u04c4", // Ka with hook (Chukchi, etc) + "\u051a", "\u051b", // Qa (Kurdish, old Abkhaz) "\u041b", "\u043b", // L - "\u0409", "\u0459", // Lj + "\u0409", "\u0459", // Lj (Serbian, Macedonian) + "\u0508", "\u0509", // Lje (Komi) + "\u0512", "\u0513", // El with hook (Chukchi, Itelmen, Khanty) + "\u04c5", "\u04c6", // El with tail (Itelmen, Kildin Sami) "\u041c", "\u043c", // M + "\u04cd", "\u04ce", // Em with tail (Kildin Sami) "\u041d", "\u043d", // N - "\u040a", "\u045a", // Nj + "\u040a", "\u045a", // Nj (Macedonian, Serbian) "\u04a2", "\u04a3", // N with descender (Kazakh etc.) + "\u04a4", "\u04a5", // Ligature En Ghe (Aleut, Altai, etc) + "\u04c7", "\u04c8", // En with hook (Even, etc) + "\u050a", "\u050b", // Nje (Komi) + "\u04c9", "\u04ca", // En with tail (Kilidn Sami) "\u041e", "\u043e", // O - "\u04e8", "\u04e9", // O with bar + "\u04a8", "\u04a9", // Ha (Abkhazian) + "\u04e6", "\u04e7", // O with diaeresis (Altay, Komi, etc) + "\u04e8", "\u04e9", // O with bar (Bashkir, etc) + "\u04ea", "\u04eb", // Barred O with diaeresis (Even, Khanty) "\u041f", "\u043f", // P + "\u0524", "\u0525", // Pe with descender (Abkhaz) + "\u04a6", "\u04a7", // Pe with middle hook (Abkhaz) "\u0420", "\u0440", // R + "\u048e", "\u048f", // Er with tick (Kildin Sami) "\u0421", "\u0441", // S + "\u04aa", "\u04ab", // Es with descender (Bashkir, Chuvash) "\u0422", "\u0442", // T - "\u040b", "\u045b", // Tsh + "\u040b", "\u045b", // Tsh (Serbian, Bosnian, etc) + "\u050c", "\u050d", // Sje (Komi) + "\u04ac", "\u04ad", // Te with descender (Abkhaz) + "\u050e", "\u050f", // The (Komi) "\u0423", "\u0443", // U - "\u040e", "\u045e", // Short U + "\u040e", "\u045e", // Short U (Belarusian, Dungan, etc) "\u04ee", "\u04ef", // U with macron (Tajik) - "\u04b0", "\u04b1", // Straight U with stroke - "\u04ae", "\u04af", // Straight U + "\u04f0", "\u04f1", // U with diaeresis (Altai, etc) + "\u04f2", "\u04f3", // U with double acute (Chuvash) + "\u04ae", "\u04af", // Straight U Bashkir, Buryat, etc) + "\u04b0", "\u04b1", // Straight U with stroke (Kazakh) "\u0424", "\u0444", // F "\u0425", "\u0445", // Kha - "\u04b2", "\u04b3", // Kha with descender - "\u04ba", "\u04bb", // Shha + "\u04b2", "\u04b3", // Kha with descender (Abkhaz, etc) + "\u04fc", "\u04fd", // Ha with hook (Itelmen, Nivkh) + "\u04fe", "\u04ff", // Ha with stroke (Nivkh) + "\u04ba", "\u04bb", // Shha (Azerbaijani, etc) "\u0426", "\u0446", // Ts "\u0427", "\u0447", // Ch - "\u04b6", "\u04b7", // Ch with descender - "\u040f", "\u045f", // Dzh + "\u04b4", "\u04b5", // Ligature Te Tse (Abkhaz) + "\u04b6", "\u04b7", // Ch with descender (Abkhaz, Tajik) + "\u04b8", "\u04b9", // Che with vertical stroke (Azeri) + "\u04cb", "\u04cc", // Che (Khakassian) + "\u04f4", "\u04f5", // Che with diaeresis (Udmurt) + "\u040f", "\u045f", // Dzh (Serbian, Macedonian, etc) "\u0428", "\u0448", // Sh "\u0429", "\u0449", // Sch "\u042a", "\u044a", // Hard sign "\u042b", "\u044b", // Yeru + "\u04f8", "\u04f9", // Yeru with diaeresis (mari) "\u042c", "\u044c", // Soft sign + "\u048c", "\u048d", // Semisoft Sign (kildin) "\u042d", "\u044d", // E + "\u04ec", "\u04ed", // E with diaeresis (kildin) "\u042e", "\u044e", // Yu - "\u042f", "\u044f" // Ya + "\u042f", "\u044f", // Ya + "\u051c", "\u051d", // We (Kurdish) + "\u0460", "\u0461", // Omega + "\u0462", "\u0463", // Yat (old cyrillic) + "\u0464", "\u0465", // Iotified E (old cyrillic) + "\u0466", "\u0467", // Little Yus (old cyrillic) + "\u0468", "\u0469", // Iotified Little Yus (old cyrillic) + "\u046A", "\u046B", // Big Yus (old cyrillic) + "\u046C", "\u046D", // Iotified Big Yus (old cyrillic) + "\u046E", "\u046F", // Ksi (old cyrillic) + "\u0470", "\u0471", // Psi (old cyrillic) + "\u0472", "\u0473", // Fita (old cyrillic) + "\u0474", "\u0475", // Izhitsa (old cyrillic) + "\u0476", "\u0477", // Izhitsa with double grave accent (old cyrillic) + "\u0478", "\u0479", // Uk (old cyrillic) + "\u047A", "\u047B", // Round Omega (old cyrillic) + "\u047c", "\u047d", // Cyr Omega with Titlo (old cyrillic) + "\u047e", "\u047f", // Cyr Ot (old cyrillic) + "\u0480", "\u0481" // Cyr Koppa (old cyrillic) ] }, // The core 28-letter alphabet, special letters for the Arabic language, diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js index 9024ba1d..e1bc6f15 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js @@ -236,28 +236,6 @@ fn: { * @param {Object} source */ doAction : function( context, action, source ) { - // Verify that this has been called from a source that's within the toolbar - // 'trackAction' defined in click tracking - if ( mw.config.get( 'wgWikiEditorToolbarClickTracking' ) && $.trackAction !== undefined && source.closest( '.wikiEditor-ui-toolbar' ).size() ) { - // Build a unique id for this action by tracking the parent rel attributes up to the toolbar level - var rels = []; - var step = source; - var i = 0; - while ( !step.hasClass( 'wikiEditor-ui-toolbar' ) ) { - if ( i > 25 ) { - break; - } - i++; - var rel = step.attr( 'rel' ); - if ( rel ) { - rels.push( step.attr( 'rel' ) ); - } - step = step.parent(); - } - rels.reverse(); - var id = rels.join( '.' ); - $.trackAction( id ); - } switch ( action.type ) { case 'replace': case 'encapsulate': @@ -300,7 +278,7 @@ fn: { var $group = $( '<div/>' ).attr( { 'class' : 'group group-' + id, 'rel' : id } ); var label = $.wikiEditor.autoMsg( group, 'label' ); if ( label ) { - $group.append( '<div class="label">' + label + '</div>' ); + $group.append( '<span class="label">' + label + '</div>' ); } var empty = true; if ( 'tools' in group ) { @@ -336,13 +314,13 @@ fn: { var offsetOrIcon = $.wikiEditor.autoIconOrOffset( tool.icon, tool.offset, $.wikiEditor.imgPath + 'toolbar/' ); - if ( typeof offsetOrIcon == 'object' ) { + if ( typeof offsetOrIcon === 'object' ) { $button = $( '<a/>' ) .attr( { 'href' : '#', - 'alt' : label, 'title' : label, 'rel' : id, + 'role' : 'button', 'class' : 'tool tool-button wikiEditor-toolbar-spritedButton' } ) .text( label ) @@ -358,6 +336,7 @@ fn: { 'alt' : label, 'title' : label, 'rel' : id, + 'role' : 'button', 'class' : 'tool tool-button' } ); } @@ -461,10 +440,6 @@ fn: { $(this).attr( 'rel' ), { expires: 30, path: '/' } ); - // Click tracking - if ( mw.config.get( 'wgWikiEditorToolbarClickTracking' ) && $.trackAction !== undefined ) { - $.trackAction(section + '.' + $(this).attr('rel')); - } context.fn.restoreCursorAndScrollTop(); // No dragging! event.preventDefault(); @@ -601,7 +576,12 @@ fn: { var $link = $( '<a/>' ) .addClass( selected == id ? 'current' : null ) - .attr( 'href', '#' ) + .attr( { + href: '#', + role: 'button', + 'aria-pressed': 'false', + 'aria-controls': 'wikiEditor-section-' + id + } ) .text( $.wikiEditor.autoMsg( section, 'label' ) ) .data( 'context', context ) .mouseup( function( e ) { @@ -613,14 +593,23 @@ fn: { return false; } ) .click( function( e ) { + // We have to set aria-pressed over here, as NVDA wont recognize it + // if we do it in the below .each as it seems + $(this).attr( 'aria-pressed', 'true' ); + $( '.tab > a' ).each( function( i, elem ) { + if ( elem !== e.target ) { + $( elem ).attr( 'aria-pressed', 'false' ); + } + } ); var $sections = $(this).data( 'context' ).$ui.find( '.sections' ); var $section = $(this).data( 'context' ).$ui.find( '.section-' + $(this).parent().attr( 'rel' ) ); var show = $section.css( 'display' ) == 'none'; - var $previousSections = $section.parent().find( '.section-visible' ); - $previousSections.css( 'position', 'absolute' ); - $previousSections.removeClass( 'section-visible' ); - $previousSections.fadeOut( 'fast', function() { $(this).css( 'position', 'static' ); } ); + $section.parent().find( '.section-visible' ) + .css( 'position', 'absolute' ) + .attr( 'aria-expanded', 'false' ) + .removeClass( 'section-visible' ) + .fadeOut( 'fast', function() { $(this).css( 'position', 'static' ); } ); $(this).parent().parent().find( 'a' ).removeClass( 'current' ); $sections.css( 'overflow', 'hidden' ); var animate = function( $that ) { @@ -632,8 +621,9 @@ fn: { } ); }; if ( show ) { - $section.addClass( 'section-visible' ); - $section.fadeIn( 'fast' ); + $section.addClass( 'section-visible' ) + .attr( 'aria-expanded', 'true' ) + .fadeIn( 'fast' ); if ( $section.hasClass( 'loading' ) ) { // Loading of this section was deferred, load it now var $that = $(this); @@ -655,10 +645,6 @@ fn: { context.fn.trigger( 'resize' ); } ); } - // Click tracking - if ( mw.config.get( 'wgWikiEditorToolbarClickTracking' ) && $.trackAction !== undefined ) { - $.trackAction( $section.attr('rel') + '.' + ( show ? 'show': 'hide' ) ); - } // Save the currently visible section $.cookie( 'wikiEditor-' + $(this).data( 'context' ).instance + '-toolbar-section', @@ -676,7 +662,11 @@ fn: { .append( $link ); }, buildSection: function( context, id, section ) { - var $section = $( '<div/>' ).attr( { 'class': section.type + ' section section-' + id, 'rel': id } ); + var $section = $( '<div/>' ).attr( { + 'class': section.type + ' section section-' + id, + 'rel': id, + id: 'wikiEditor-section-' + id + } ); var selected = $.cookie( 'wikiEditor-' + context.instance + '-toolbar-section' ); var show = selected == id; @@ -693,7 +683,10 @@ fn: { // Show or hide section if ( id !== 'main' ) { - $section.css( 'display', show ? 'block' : 'none' ); + $section + .css( 'display', show ? 'block' : 'none' ) + .attr( 'aria-expanded', show ? 'true' : 'false' ); + if ( show ) { $section.addClass( 'section-visible' ); } @@ -776,6 +769,8 @@ fn: { var oldValue = $( 'body' ).css( 'position' ); $( 'body' ).css( 'position', 'static' ); $( 'body' ).css( 'position', oldValue ); + + context.$textarea.trigger( 'wikiEditor-toolbar-doneInitialSections' ); }, 'loop' : function( i, s ) { s.$sections.append( $.wikiEditor.modules.toolbar.fn.buildSection( s.context, s.id, s.config ) ); |
