From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- extensions/WikiEditor/modules/ext.wikiEditor.css | 9 - extensions/WikiEditor/modules/ext.wikiEditor.js | 81 +- extensions/WikiEditor/modules/ext.wikiEditor.less | 11 + .../modules/ext.wikiEditor.previewDialog.js | 7 - .../modules/ext.wikiEditor.tests.toolbar.js | 255 -- .../modules/ext.wikiEditor.toolbar.styles.css | 25 - .../modules/ext.wikiEditor.toolbar.styles.less | 20 + .../modules/images/toolbar/button-sprite.svg | 3038 -------------------- .../modules/images/toolbar/format-big.svg | 113 - .../modules/images/toolbar/format-bold-A.svg | 131 - .../modules/images/toolbar/format-bold-B.svg | 147 - .../modules/images/toolbar/format-bold-F.svg | 147 - .../modules/images/toolbar/format-bold-G.svg | 163 -- .../modules/images/toolbar/format-bold-N.svg | 147 - .../modules/images/toolbar/format-bold-P.svg | 147 - .../modules/images/toolbar/format-bold-V.svg | 147 - .../modules/images/toolbar/format-bold.svg | 131 - .../modules/images/toolbar/format-indent.svg | 220 -- .../modules/images/toolbar/format-italic-A.svg | 147 - .../modules/images/toolbar/format-italic-C.svg | 147 - .../modules/images/toolbar/format-italic-K.svg | 147 - .../modules/images/toolbar/format-italic-i.svg | 104 - .../modules/images/toolbar/format-italic.svg | 147 - .../modules/images/toolbar/format-olist.svg | 202 -- .../modules/images/toolbar/format-small.svg | 114 - .../modules/images/toolbar/format-subscript.svg | 114 - .../modules/images/toolbar/format-superscript.svg | 114 - .../modules/images/toolbar/format-ulist.svg | 204 -- .../modules/images/toolbar/insert-file.svg | 206 -- .../modules/images/toolbar/insert-gallery.svg | 191 -- .../modules/images/toolbar/insert-ilink.svg | 148 - .../modules/images/toolbar/insert-link.svg | 94 - .../modules/images/toolbar/insert-newline.svg | 105 - .../modules/images/toolbar/insert-nowiki.svg | 112 - .../modules/images/toolbar/insert-redirect.svg | 118 - .../modules/images/toolbar/insert-reference.svg | 88 - .../modules/images/toolbar/insert-signature.svg | 274 -- .../modules/images/toolbar/insert-table.svg | 131 - .../modules/images/toolbar/insert-xlink.svg | 125 - .../modules/images/toolbar/magnify-clip.png | Bin 204 -> 0 bytes .../modules/images/toolbar/search-replace.svg | 228 -- .../WikiEditor/modules/jquery.wikiEditor.css | 112 - .../modules/jquery.wikiEditor.dialogs.config.css | 184 -- .../modules/jquery.wikiEditor.dialogs.config.js | 55 +- .../modules/jquery.wikiEditor.dialogs.config.less | 234 ++ .../modules/jquery.wikiEditor.dialogs.css | 68 - .../modules/jquery.wikiEditor.dialogs.less | 60 + .../WikiEditor/modules/jquery.wikiEditor.html | 6 +- extensions/WikiEditor/modules/jquery.wikiEditor.js | 59 +- .../WikiEditor/modules/jquery.wikiEditor.less | 134 + .../modules/jquery.wikiEditor.preview.css | 31 - .../modules/jquery.wikiEditor.preview.js | 50 +- .../modules/jquery.wikiEditor.preview.less | 35 + .../modules/jquery.wikiEditor.previewDialog.css | 39 - .../modules/jquery.wikiEditor.previewDialog.js | 132 - .../modules/jquery.wikiEditor.publish.js | 30 +- .../modules/jquery.wikiEditor.toolbar.config.js | 772 +---- .../modules/jquery.wikiEditor.toolbar.css | 322 --- .../modules/jquery.wikiEditor.toolbar.js | 120 +- .../modules/jquery.wikiEditor.toolbar.less | 387 +++ 60 files changed, 1172 insertions(+), 9857 deletions(-) delete mode 100644 extensions/WikiEditor/modules/ext.wikiEditor.css create mode 100644 extensions/WikiEditor/modules/ext.wikiEditor.less delete mode 100644 extensions/WikiEditor/modules/ext.wikiEditor.previewDialog.js delete mode 100644 extensions/WikiEditor/modules/ext.wikiEditor.tests.toolbar.js delete mode 100644 extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.css create mode 100644 extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.less delete mode 100644 extensions/WikiEditor/modules/images/toolbar/button-sprite.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-big.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-bold-A.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-bold-B.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-bold-F.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-bold-G.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-bold-N.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-bold-P.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-bold-V.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-bold.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-indent.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-italic-A.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-italic-C.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-italic-K.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-italic-i.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-italic.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-olist.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-small.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-subscript.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-superscript.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/format-ulist.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-file.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-gallery.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-ilink.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-link.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-newline.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-nowiki.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-redirect.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-reference.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-signature.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-table.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/insert-xlink.svg delete mode 100644 extensions/WikiEditor/modules/images/toolbar/magnify-clip.png delete mode 100644 extensions/WikiEditor/modules/images/toolbar/search-replace.svg delete mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.css delete mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.css create mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.less delete mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.css create mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.less create mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.less delete mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.preview.css create mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.preview.less delete mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.previewDialog.css delete mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.previewDialog.js delete mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.css create mode 100644 extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.less (limited to 'extensions/WikiEditor/modules') diff --git a/extensions/WikiEditor/modules/ext.wikiEditor.css b/extensions/WikiEditor/modules/ext.wikiEditor.css deleted file mode 100644 index 6ea7e631..00000000 --- a/extensions/WikiEditor/modules/ext.wikiEditor.css +++ /dev/null @@ -1,9 +0,0 @@ -/** - * CSS for WikiEditor - */ - -/* 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/ext.wikiEditor.js b/extensions/WikiEditor/modules/ext.wikiEditor.js index 46087989..7e3baed6 100644 --- a/extensions/WikiEditor/modules/ext.wikiEditor.js +++ b/extensions/WikiEditor/modules/ext.wikiEditor.js @@ -1,7 +1,80 @@ /* * JavaScript for WikiEditor */ -jQuery( document ).ready( function ( $ ) { - // Initialize wikiEditor - $( '#wpTextbox1' ).wikiEditor(); -} ); + +( function ( $, mw ) { + function logEditEvent( action, data ) { + if ( mw.loader.getState( 'schema.Edit' ) === null ) { + return; + } + + mw.loader.using( 'schema.Edit' ).done( function () { + data = $.extend( { + version: 1, + action: action, + editor: 'wikitext', + platform: 'desktop', // FIXME + integration: 'page', + 'page.id': mw.config.get( 'wgArticleId' ), + 'page.title': mw.config.get( 'wgPageName' ), + 'page.ns': mw.config.get( 'wgNamespaceNumber' ), + 'page.revid': mw.config.get( 'wgRevisionId' ), + 'page.length': -1, // FIXME + 'user.id': mw.user.getId(), + 'user.editCount': mw.config.get( 'wgUserEditCount', 0 ), + 'mediawiki.version': mw.config.get( 'wgVersion' ) + }, data ); + + if ( mw.user.isAnon() ) { + data['user.class'] = 'IP'; + } + + data['action.' + action + '.type'] = data.type; + data['action.' + action + '.mechanism'] = data.mechanism; + data['action.' + action + '.timing'] = data.timing === undefined ? + 0 : Math.floor( data.timing ); + // Remove renamed properties + delete data.type; + delete data.mechanism; + delete data.timing; + + mw.eventLog.logEvent( 'Edit', data ); + } ); + } + + $( function () { + var $textarea = $( '#wpTextbox1' ), + editingSessionIdInput = $( '#editingStatsId' ), + editingSessionId, submitting, onUnloadFallback; + + // Initialize wikiEditor + $textarea.wikiEditor(); + + if ( editingSessionIdInput.length ) { + editingSessionId = editingSessionIdInput.val(); + logEditEvent( 'ready', { + editingSessionId: editingSessionId + } ); + $textarea.closest( 'form' ).submit( function () { + submitting = true; + } ); + onUnloadFallback = window.onunload; + window.onunload = function () { + var fallbackResult; + + if ( onUnloadFallback ) { + fallbackResult = onUnloadFallback(); + } + + if ( !submitting ) { + logEditEvent( 'abort', { + editingSessionId: editingSessionId, + // TODO: abort.type + } ); + } + + return fallbackResult; + }; + } + } ); +}( jQuery, mediaWiki ) ); \ No newline at end of file diff --git a/extensions/WikiEditor/modules/ext.wikiEditor.less b/extensions/WikiEditor/modules/ext.wikiEditor.less new file mode 100644 index 00000000..0163242d --- /dev/null +++ b/extensions/WikiEditor/modules/ext.wikiEditor.less @@ -0,0 +1,11 @@ +/** + * CSS for WikiEditor + */ + +/* Hide vanilla MediaWiki's "Editing help" link, as we provide it in the toolbar */ +.editButtons { + .editHelp, + .mw-editButtons-pipe-separator { + display: none; + } +} diff --git a/extensions/WikiEditor/modules/ext.wikiEditor.previewDialog.js b/extensions/WikiEditor/modules/ext.wikiEditor.previewDialog.js deleted file mode 100644 index 3b1acd7c..00000000 --- a/extensions/WikiEditor/modules/ext.wikiEditor.previewDialog.js +++ /dev/null @@ -1,7 +0,0 @@ -/* - * JavaScript for WikiEditor Preview Dialog - */ -jQuery( document ).ready( function ( $ ) { - // Add preview module - $( 'textarea#wpTextbox1' ).wikiEditor( 'addModule', 'previewDialog' ); -} ); diff --git a/extensions/WikiEditor/modules/ext.wikiEditor.tests.toolbar.js b/extensions/WikiEditor/modules/ext.wikiEditor.tests.toolbar.js deleted file mode 100644 index 3475284b..00000000 --- a/extensions/WikiEditor/modules/ext.wikiEditor.tests.toolbar.js +++ /dev/null @@ -1,255 +0,0 @@ -/** - * Test set for the edit toolbar - */ -var textareaId = '#wpTextbox1'; -var wikiEditorTests = { - // Add emoticons section - 'add_sections_toolbar': { - call: 'addToToolbar', - data: { - 'sections': { - 'emoticons': { - 'type': 'toolbar', - 'label': 'Emoticons' - } - } - }, - test: '*[rel=emoticons].section', - pre: 0, - post: 1 - }, - // Add faces group to emoticons section - 'add_groups': { - call: 'addToToolbar', - data: { - section: 'emoticons', - 'groups': { - 'faces': { - 'label': 'Faces' - } - } - }, - test: '*[rel=emoticons].section *[rel=faces].group', - pre: 0, - post: 1 - }, - // Add smile tool to faces group of emoticons section - 'add_tools': { - call: 'addToToolbar', - data: { - section: 'emoticons', - 'group': 'faces', - 'tools': { - 'smile': { - label: 'Smile!', - type: 'button', - icon: 'http://upload.wikimedia.org/wikipedia/commons/thumb/a/a4/Gnome-face-smile.svg/22px-Gnome-face-smile.svg.png', - action: { - type: 'encapsulate', - options: { - pre: ':)' - } - } - } - } - }, - test: '*[rel=emoticons].section *[rel=faces].group *[rel=smile].tool', - pre: 0, - post: 1 - }, - // Add info section - 'add_sections_booklet': { - call: 'addToToolbar', - data: { - 'sections': { - 'info': { - 'type': 'booklet', - 'label': 'Info' - } - } - }, - test: '*[rel=info].section', - pre: 0, - post: 1 - }, - // Add info section - 'add_pages_table': { - call: 'addToToolbar', - data: { - section: 'info', - pages: { - 'colors': { - 'layout': 'table', - 'label': 'Colors', - 'headings': [ - { text: 'Name' }, - { text: 'Temperature' }, - { text: 'Swatch' } - ] - } - } - }, - test: '*[rel=info].section *[rel=colors].page', - pre: 0, - post: 1 - }, - // Add colors rows - 'add_rows': { - call: 'addToToolbar', - data: { - section: 'info', - page: 'colors', - 'rows': [ - { - 'name': { text: 'Red' }, - 'temp': { text: 'Warm' }, - 'swatch': { html: '
' } - }, - { - 'name': { text: 'Blue' }, - 'temp': { text: 'Cold' }, - 'swatch': { html: '
' } - }, - { - 'name': { text: 'Silver' }, - 'temp': { text: 'Neutral' }, - 'swatch': { html: '
' } - } - ] - }, - test: '*[rel=info].section *[rel=colors].page tr td', - pre: 0, - post: 9 - }, - // Add - 'add_pages_characters': { - call: 'addToToolbar', - data: { - section: 'info', - pages: { - 'emoticons': { - 'layout': 'characters', - 'label': 'Emoticons' - }, - 'removeme': { - 'layout': 'characters', - 'label': 'Remove Me!' - } - } - }, - test: '*[rel=info].section *[rel=emoticons].page', - pre: 0, - post: 1 - }, - // Add - 'add_characters': { - call: 'addToToolbar', - data: { - section: 'info', - page: 'emoticons', - characters: [ ':)', ':))', ':(', '<3', ';)' ] - }, - test: '*[rel=info].section *[rel=emoticons].page *[rel=":)"]', - pre: 0, - post: 1 - }, - // Remove page - 'remove_page': { - call: 'removeFromToolbar', - data: { - section: 'info', - page: 'removeme' - }, - test: '*[rel=info].section *[rel=removeme].page', - pre: 1, - post: 0 - }, - // Remove :)) from emoticon characters - 'remove_character': { - call: 'removeFromToolbar', - data: { - section: 'info', - page: 'emoticons', - 'character': ':))' - }, - test: '*[rel=info].section *[rel=emoticons].page *[rel=":))"]', - pre: 1, - post: 0 - }, - // Remove row from colors table of info section - 'remove_row': { - call: 'removeFromToolbar', - data: { - section: 'info', - page: 'colors', - 'row': 0 - }, - test: '*[rel=info].section *[rel=colors].page tr td', - pre: 9, - post: 6 - } -}; - -jQuery( document ).ready( function ( $ ) { - var $button = $( '' ) - .css( { - position: 'fixed', - bottom: 0, - right: 0, - width: '100%', - backgroundColor: '#333', - opacity: 0.75, - color: '#DDDDDD', - padding: '0.7em', - border: 'none', - display: 'none', - cursor: 'pointer' - } ) - .click( function () { - if ( $( this ).data( 'testDone' ) ) { - $( this ).slideUp( 'fast' ); - return false; - } - - var test, pre, post, i, - messages = [ 'Running tests for wikiEditor API' ], - $target = $( textareaId ), - $ui = $target.data( 'wikiEditor-context' ).$ui, - passes = 0, - tests = 0; - - for ( test in wikiEditorTests ) { - pre = $ui.find( wikiEditorTests[test].test ).length === wikiEditorTests[test].pre; - messages.push ( test + '-pre: ' + ( pre ? 'PASS' : 'FAIL' ) ); - $target.wikiEditor( - wikiEditorTests[test].call, - wikiEditorTests[test].data - ); - post = $ui.find( wikiEditorTests[test].test ).length === wikiEditorTests[test].post; - messages.push ( test + '-post: ' + ( post ? 'PASS' : 'FAIL' ) ); - if ( pre && post ) { - passes++; - } - tests++; - } - - if ( window.console ) { - for ( i = 0; i < messages.length; i++ ) { - window.console.log( messages[i] ); - } - } - - $( this ) - .attr( 'title', messages.join( ' | ' ) ) - .text( passes + ' / ' + tests + ' were successful' ) - .css( 'backgroundColor', passes < tests ? 'red' : 'green' ) - .data( 'testDone', 'true' ) - .blur(); - } ) - .appendTo( $( 'body' ) ); - - setTimeout( function () { - $button.slideDown( 'fast' ); - }, 1500 ); - -} ); diff --git a/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.css b/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.css deleted file mode 100644 index cc80c169..00000000 --- a/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.css +++ /dev/null @@ -1,25 +0,0 @@ -/** - * CSS for WikiEditor - */ - -form#editform { - margin: 0; - padding: 0; -} - -#wpSummary, -#wpSummaryLabel { - margin-bottom: 1em; -} - -#wpTextbox1 { - line-height: 1.5em; - resize: vertical; -} - -/* Hide the old toolbar until the wikiEditor toolbar is deemed not supported, - * hide the WikiEditor toolbar until it's css has loaded */ -.wikiEditor-oldToolbar, -.wikiEditor-ui-toolbar { - display: none; -} diff --git a/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.less b/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.less new file mode 100644 index 00000000..67da9329 --- /dev/null +++ b/extensions/WikiEditor/modules/ext.wikiEditor.toolbar.styles.less @@ -0,0 +1,20 @@ +/** + * CSS for WikiEditor + */ + +form#editform { + margin: 0; + padding: 0; +} + +#wpTextbox1 { + line-height: 1.5em; + resize: vertical; +} + +/* Hide the old toolbar until the wikiEditor toolbar is deemed not supported, + * hide the WikiEditor toolbar until it's css has loaded */ +.wikiEditor-oldToolbar, +.wikiEditor-ui-toolbar { + display: none; +} diff --git a/extensions/WikiEditor/modules/images/toolbar/button-sprite.svg b/extensions/WikiEditor/modules/images/toolbar/button-sprite.svg deleted file mode 100644 index 061ffa38..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/button-sprite.svg +++ /dev/null @@ -1,3038 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - + - A - - - - - A - - - - - B - - - - - F - - - - - G - - - - - N - - - - - P - - - - - V - - - - - A - - - - - - - - - - - A - - - - - C - - - - - - I - - - - - - K - - - - - A - - - - - 1 - 2 - 3 - - - - - - - - A - - - - - â–¼ - A - - - - - â–² - A - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - W - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 2 - 3 - - - - - - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-big.svg b/extensions/WikiEditor/modules/images/toolbar/format-big.svg deleted file mode 100644 index 68d0193a..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-big.svg +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - + - A - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-A.svg b/extensions/WikiEditor/modules/images/toolbar/format-bold-A.svg deleted file mode 100644 index 83a0cb81..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold-A.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - A - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-B.svg b/extensions/WikiEditor/modules/images/toolbar/format-bold-B.svg deleted file mode 100644 index ef04e499..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold-B.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - B - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-F.svg b/extensions/WikiEditor/modules/images/toolbar/format-bold-F.svg deleted file mode 100644 index 8c8de992..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold-F.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - F - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-G.svg b/extensions/WikiEditor/modules/images/toolbar/format-bold-G.svg deleted file mode 100644 index 4c924a63..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold-G.svg +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - G - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-N.svg b/extensions/WikiEditor/modules/images/toolbar/format-bold-N.svg deleted file mode 100644 index 69c9c5a1..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold-N.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - N - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-P.svg b/extensions/WikiEditor/modules/images/toolbar/format-bold-P.svg deleted file mode 100644 index 96d36e6d..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold-P.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - P - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-V.svg b/extensions/WikiEditor/modules/images/toolbar/format-bold-V.svg deleted file mode 100644 index 2ef715af..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold-V.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - V - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold.svg b/extensions/WikiEditor/modules/images/toolbar/format-bold.svg deleted file mode 100644 index 83a0cb81..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-bold.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - A - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-indent.svg b/extensions/WikiEditor/modules/images/toolbar/format-indent.svg deleted file mode 100644 index 870274f9..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-indent.svg +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-italic-A.svg b/extensions/WikiEditor/modules/images/toolbar/format-italic-A.svg deleted file mode 100644 index 0e484a13..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-italic-A.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - A - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-italic-C.svg b/extensions/WikiEditor/modules/images/toolbar/format-italic-C.svg deleted file mode 100644 index d58e1deb..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-italic-C.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - C - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-italic-K.svg b/extensions/WikiEditor/modules/images/toolbar/format-italic-K.svg deleted file mode 100644 index 25f31558..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-italic-K.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - K - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-italic-i.svg b/extensions/WikiEditor/modules/images/toolbar/format-italic-i.svg deleted file mode 100644 index c5183082..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-italic-i.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - I - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-italic.svg b/extensions/WikiEditor/modules/images/toolbar/format-italic.svg deleted file mode 100644 index 23b01c9c..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-italic.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - A - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-olist.svg b/extensions/WikiEditor/modules/images/toolbar/format-olist.svg deleted file mode 100644 index 909cb94b..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-olist.svg +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - 1 - 2 - 3 - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-small.svg b/extensions/WikiEditor/modules/images/toolbar/format-small.svg deleted file mode 100644 index af49cc73..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-small.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - A - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-subscript.svg b/extensions/WikiEditor/modules/images/toolbar/format-subscript.svg deleted file mode 100644 index f6d094da..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-subscript.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - â–¼ - A - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-superscript.svg b/extensions/WikiEditor/modules/images/toolbar/format-superscript.svg deleted file mode 100644 index 0c94275c..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-superscript.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - â–² - A - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/format-ulist.svg b/extensions/WikiEditor/modules/images/toolbar/format-ulist.svg deleted file mode 100644 index 21091807..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/format-ulist.svg +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-file.svg b/extensions/WikiEditor/modules/images/toolbar/insert-file.svg deleted file mode 100644 index 012ffeff..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-file.svg +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-gallery.svg b/extensions/WikiEditor/modules/images/toolbar/insert-gallery.svg deleted file mode 100644 index 99d73797..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-gallery.svg +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-ilink.svg b/extensions/WikiEditor/modules/images/toolbar/insert-ilink.svg deleted file mode 100644 index 58a64a6c..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-ilink.svg +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-link.svg b/extensions/WikiEditor/modules/images/toolbar/insert-link.svg deleted file mode 100644 index 0a0f8c4a..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-link.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-newline.svg b/extensions/WikiEditor/modules/images/toolbar/insert-newline.svg deleted file mode 100644 index c7db3a8f..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-newline.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-nowiki.svg b/extensions/WikiEditor/modules/images/toolbar/insert-nowiki.svg deleted file mode 100644 index 35a788d7..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-nowiki.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - W - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-redirect.svg b/extensions/WikiEditor/modules/images/toolbar/insert-redirect.svg deleted file mode 100644 index ca036928..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-redirect.svg +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-reference.svg b/extensions/WikiEditor/modules/images/toolbar/insert-reference.svg deleted file mode 100644 index c404e860..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-reference.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-signature.svg b/extensions/WikiEditor/modules/images/toolbar/insert-signature.svg deleted file mode 100644 index d0fd5d89..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-signature.svg +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-table.svg b/extensions/WikiEditor/modules/images/toolbar/insert-table.svg deleted file mode 100644 index 3585edfc..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-table.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/insert-xlink.svg b/extensions/WikiEditor/modules/images/toolbar/insert-xlink.svg deleted file mode 100644 index c7c664b5..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/insert-xlink.svg +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/images/toolbar/magnify-clip.png b/extensions/WikiEditor/modules/images/toolbar/magnify-clip.png deleted file mode 100644 index 00a9cee1..00000000 Binary files a/extensions/WikiEditor/modules/images/toolbar/magnify-clip.png and /dev/null differ diff --git a/extensions/WikiEditor/modules/images/toolbar/search-replace.svg b/extensions/WikiEditor/modules/images/toolbar/search-replace.svg deleted file mode 100644 index 91cb6ace..00000000 --- a/extensions/WikiEditor/modules/images/toolbar/search-replace.svg +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.css b/extensions/WikiEditor/modules/jquery.wikiEditor.css deleted file mode 100644 index cabe6a94..00000000 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.css +++ /dev/null @@ -1,112 +0,0 @@ -/* - * CSS for WikiEditor jQuery plugin - */ - -.wikiEditor-ui { - position: relative; - clear: both; - width: 100%; - background-color: #E0EEf7; -} -.wikiEditor-ui textarea { - width: 100%; - border: 0; -} -.wikiEditor-ui textarea:focus { - outline: none; -} -.wikiEditor-ui .wikiEditor-ui-clear { - clear: both; -} -.wikiEditor-ui .wikiEditor-ui-view { - border: 1px solid silver; -} -.wikiEditor-ui .wikiEditor-ui-top { - position: relative; - border-bottom: 1px solid silver; -} -.wikiEditor-ui .wikiEditor-ui-left { - float: left; - width: 100%; -} -.wikiEditor-ui .wikiEditor-ui-right { - float: right; - background: #F3F3F3; - overflow: hidden; -} -.wikiEditor-wikitext { - float: left; - width: 100%; -} -.wikiEditor-ui-controls { - float: left; - width: 100%; - background-color: white; -} -.wikiEditor-ui-tabs { - float: left; - height: 2.5em; - margin-right: -1px; - background-color: white; - border-left: 1px solid silver; - border-top: 1px solid silver; -} -.wikiEditor-ui-buttons { - float: right; - height: 2.5em; - margin-right: -1px; - background-color: white; - padding-left: 1em; - border-top: 1px solid white; -} -.wikiEditor-ui-buttons button { - margin-left: 0.5em; -} -.wikiEditor-ui-tabs div { - float: left; - height: 2.5em; - background-color: #f3f3f3; - border-right: 1px solid silver; - border-bottom: 1px solid silver; -} -.wikiEditor-ui-tabs div.current { - border-bottom: 1px solid white; - background-color: white; -} -.wikiEditor-ui-tabs div a { - display: inline-block; - padding: 0 0.75em; - line-height: 2.5em; - color: #0645AD; -} -.wikiEditor-ui-tabs div.current a { - color: #333333; -} -.wikiEditor-ui-tabs div.current a:hover { - text-decoration: none; -} - -.wikiEditor-view-wikitext { - line-height: 1em; -} -.wikiEditor-ui-loading { - background: #f3f3f3; - z-index: 10; - position: absolute; - top: 0; - left: 0; - text-align: center; - height: 100%; - width: 100%; - border: 1px solid silver; - margin: -1px; -} -.wikiEditor-ui-loading span { - display: block; - height: 24px; - width: 24px; - /* @embed */ - background: url(images/toolbar/loading.gif) 0 0 no-repeat; - text-indent: -9999px; - margin: 0 auto; -} diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.css b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.css deleted file mode 100644 index 1cc9f5a1..00000000 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.css +++ /dev/null @@ -1,184 +0,0 @@ -/* - * CSS for WikiEditor Dialogs - */ - -/* Table Dialog */ -#wikieditor-toolbar-table-dialog fieldset { - width: 218px; - padding: 0; - float: left; -} - -#wikieditor-toolbar-table-dialog .wikieditor-toolbar-table-preview-wrapper { - width: 330px; - padding: 0; - float: right; -} - -.wikieditor-toolbar-table-preview-content * { - cursor: default; -} -.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table { - width: 100% !important; -} -.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table td { - padding: 10px 4px !important; - height: auto !important; -} -.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table th { - padding: 7px 3px !important; -} -.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper { - float: left; - margin-right: 20px; - vertical-align: bottom; -} - -.wikiEditor-toolbar-dialog .ui-dialog-content { - padding: 30px 20px 0 !important; -} -.wikieditor-toolbar-dialog-wrapper { - width: 100%; -} -/* Insert Link Dialog */ -#wikieditor-toolbar-link-int-target-status { - float: right; -} -#wikieditor-toolbar-link-int-target, -#wikieditor-toolbar-link-int-text { - width: 100%; -} -#wikieditor-toolbar-tool-link-int-target-label { - float: left; - line-height: 1.7em; -} -#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-disambig { - padding-left: 30px; - background-position: 0 50%; - background-repeat: no-repeat; -} -#wikieditor-toolbar-link-int-target-status-exists { - /* @embed */ - background-image: url(images/dialogs/insert-link-exists.png); - background-position: left; -} -#wikieditor-toolbar-link-int-target-status-notexists { - /* @embed */ - background-image: url(images/dialogs/insert-link-notexists.png); - background-position: left; -} -#wikieditor-toolbar-link-int-target-status-invalid { - /* @embed */ - background-image: url(images/dialogs/insert-link-invalid.png); - background-position: left; -} -#wikieditor-toolbar-link-int-target-status-external { - /* @embed */ - 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 { - width: 100%; -} -.wikieditor-toolbar-file-options .wikieditor-toolbar-field-wrapper { - float: left; - margin: 0 20px 0 0; -} -/* Reference Dialog */ -#wikieditor-toolbar-reference-dialog label { - float: left; - line-height: 1.7em; -} -#wikieditor-toolbar-reference-text { - width: 100%; -} -/* RTL Changes */ - -body.rtl #wikieditor-toolbar-link-int-target-status-external { - /* @embed */ - background-image: url(images/dialogs/insert-link-external-rtl.png); -} - -body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button { - float: left; - margin: 0.5em 0.4em 0.5em 0 !important; -} -/* Template Editor Dialogs */ -.wikiEditor-template-dialog-fields label { - text-transform: capitalize; - float: left; - width: 25%; - line-height: 2.25em; -} -.wikiEditor-template-dialog-fields textarea { - float: right; - width: 70%; - line-height: 1.5em; - height: 1.5em; -} -.wikiEditor-template-dialog-fields .wikiEditor-template-dialog-field-wrapper { - padding: 0.75em 0.33em; - border-bottom: 1px dashed silver; - clear: both; -} -.wikiEditor-template-dialog-fields .wikiEditor-template-dialog-field-wrapper:first-child { - padding-top: 0; -} -.wikiEditor-template-dialog-fields .wikiEditor-template-dialog-field-wrapper:last-child { - border-bottom: none; -} -/* Self Clearing Floats */ -.wikieditor-toolbar-table-dimension-fields:after, -.wikieditor-toolbar-dialog-wrapper:after { - visibility: hidden; - display: block; - font-size: 0; - content: " "; - clear: both; - height: 0; -} -.wikieditor-toolbar-table-dimension-fields, -.wikieditor-toolbar-dialog-wrapper { - display: inline-table; -} -/* Hides from IE-mac \*/ -* html .wikieditor-toolbar-table-dimension-fields, -* html .wikieditor-toolbar-dialog-wrapper { - height: 1%; -} -.wikieditor-toolbar-table-dimension-fields, -.wikieditor-toolbar-dialog-wrapper { - display: block; -} -/* End hide from IE-mac */ -.wikiEditor-toolbar-dialog .ui-dialog-buttonpane { - border-top: 1px solid #cccccc !important; -} -.wikiEditor-toolbar-dialog .ui-dialog-content { - padding-bottom: 1em !important; -} -/* Edit dialog */ -.wikiEditor-dialog-editoptions { - margin-top: 15px; -} -/* Publish dialog */ -.wikiEditor-publish-dialog-copywarn { - margin-top: 0.5em; -} -.wikiEditor-publish-dialog-summary { - margin-top: 1.5em; -} -.wikiEditor-publish-dialog-options { - margin-top: 1.5em; -} diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js index 8cd50a06..31b54805 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js @@ -119,6 +119,8 @@ $.wikiEditor.modules.dialogs.config = { ', init: function () { + var api = new mw.Api(); + function isExternalLink( s ) { // The following things are considered to be external links: // * Starts a URL protocol @@ -198,7 +200,7 @@ $.wikiEditor.modules.dialogs.config = { // If the Disambiguator extension is not installed then such a property won't be set. $( '#wikieditor-toolbar-link-int-target-status' ).data( 'request', - ( new mw.Api() ).get( { + api.get( { action: 'query', prop: 'pageprops', titles: target, @@ -328,28 +330,23 @@ $.wikiEditor.modules.dialogs.config = { } ); // Add images to the page existence widget, which will be shown mutually exclusively to communicate if // the page exists, does not exist or the title is invalid (like if it contains a | character) - var existsMsg = mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-exists' ); - var notexistsMsg = mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-notexists' ); - 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( $( '
' ) .attr( 'id', 'wikieditor-toolbar-link-int-target-status-exists' ) - .append( existsMsg ) + .text( mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-exists' ) ) ) .append( $( '
' ) .attr( 'id', 'wikieditor-toolbar-link-int-target-status-notexists' ) - .append( notexistsMsg ) + .text( mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-notexists' ) ) ) .append( $( '
' ) .attr( 'id', 'wikieditor-toolbar-link-int-target-status-invalid' ) - .append( invalidMsg ) + .text( mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-invalid' ) ) ) .append( $( '
' ) .attr( 'id', 'wikieditor-toolbar-link-int-target-status-external' ) - .append( externalMsg ) + .text( mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-external' ) ) ) .append( $( '
' ) .attr( 'id', 'wikieditor-toolbar-link-int-target-status-loading' ) @@ -361,7 +358,7 @@ $.wikiEditor.modules.dialogs.config = { ) .append( $( '
' ) .attr( 'id', 'wikieditor-toolbar-link-int-target-status-disambig' ) - .append( disambigMsg ) + .text( mw.msg( 'wikieditor-toolbar-tool-link-int-target-status-disambig' ) ) ) .data( 'existencecache', {} ) .children().hide(); @@ -403,20 +400,15 @@ $.wikiEditor.modules.dialogs.config = { return; } - var request = $.ajax( { - url: mw.util.wikiScript( 'api' ), - data: { - action: 'opensearch', - search: title, - namespace: 0, - suggest: '', - format: 'json' - }, - dataType: 'json', - success: function ( data ) { - cache[title] = data[1]; - $( that ).suggestions( 'suggestions', data[1] ); - } + var request = api.get( { + action: 'opensearch', + search: title, + namespace: 0, + suggest: '' + } ) + .done( function ( data ) { + cache[title] = data[1]; + $( that ).suggestions( 'suggestions', data[1] ); } ); $( this ).data( 'request', request ); }, @@ -474,6 +466,7 @@ $.wikiEditor.modules.dialogs.config = { else insertText = '[[' + target + '|' + escapeInternalText( text ) + ']]'; } else { + target = $.trim( target ); // Prepend http:// if there is no protocol if ( !target.match( /^[a-z]+:\/\/./ ) ) target = 'http://' + target; @@ -602,7 +595,7 @@ $.wikiEditor.modules.dialogs.config = { $( '#wikieditor-toolbar-link-int-target' ).suggestions(); // don't overwrite user's text - if ( selection !== '' ){ + if ( selection !== '' ) { $( '#wikieditor-toolbar-link-int-text' ).data( 'untouched', false ); } @@ -813,7 +806,7 @@ $.wikiEditor.modules.dialogs.config = { if ( fileName !== '' ) { fileTitle = new mw.Title( fileName ); // Append file namespace prefix to filename if not already contains it - if ( fileTitle.getNamespaceId() !== 6 ){ + if ( fileTitle.getNamespaceId() !== 6 ) { fileTitle = new mw.Title( fileName, 6 ); } fileName = fileTitle.toText(); @@ -1101,7 +1094,7 @@ $.wikiEditor.modules.dialogs.config = { 'browsers': { // Left-to-right languages 'ltr': { - 'msie': false, + 'msie': [['>=', 11]], // Known to work on 11. 'firefox': [['>=', 2]], 'opera': false, 'safari': [['>=', 3]], @@ -1109,7 +1102,7 @@ $.wikiEditor.modules.dialogs.config = { }, // Right-to-left languages 'rtl': { - 'msie': false, + 'msie': [['>=', 11]], // Works on 11 but dialog positioning is cruddy. 'firefox': [['>=', 2]], 'opera': false, 'safari': [['>=', 3]], @@ -1128,11 +1121,11 @@ $.wikiEditor.modules.dialogs.config = {
\
\ \ - \ + \
\
\ \ - \ + \
\
\ \ diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.less b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.less new file mode 100644 index 00000000..72b384d3 --- /dev/null +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.less @@ -0,0 +1,234 @@ +@import "mediawiki.mixins"; + +/* + * CSS for WikiEditor Dialogs + */ + +/* Replace Dialog */ +#wikieditor-toolbar-replace-search, +#wikieditor-toolbar-replace-replace { + width: 100%; +} + +/* Table Dialog */ +#wikieditor-toolbar-table-dialog { + fieldset { + width: 218px; + padding: 0; + float: left; + } + + .wikieditor-toolbar-table-preview-wrapper { + width: 330px; + padding: 0; + float: right; + } +} + +.wikieditor-toolbar-table-preview-content * { + cursor: default; +} + +.wikiEditor-toolbar-dialog { + .wikieditor-toolbar-table-preview-wrapper { + table { + width: 100% !important; + } + } + + .wikieditor-toolbar-table-preview-content { + table { + td { + padding: 10px 4px !important; + height: auto !important; + } + + th { + padding: 7px 3px !important; + } + } + } + + .ui-dialog-content { + padding: 30px 20px 1em !important; + } + + .ui-dialog-buttonpane { + border-top: 1px solid #cccccc !important; + } +} + +.wikieditor-toolbar-table-dimension-fields { + .wikieditor-toolbar-field-wrapper { + float: left; + margin-right: 20px; + vertical-align: bottom; + } +} + +.wikieditor-toolbar-dialog-wrapper { + width: 100%; +} + +/* Insert Link Dialog */ +#wikieditor-toolbar-link-int-target-status { + float: right; +} + +#wikieditor-toolbar-link-int-target, +#wikieditor-toolbar-link-int-text { + width: 100%; +} + +#wikieditor-toolbar-tool-link-int-target-label { + float: left; + line-height: 1.7em; +} + +#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-disambig { + padding-left: 30px; + background-position: 0 50%; + background-repeat: no-repeat; +} + +#wikieditor-toolbar-link-int-target-status-exists { + .background-image('images/dialogs/insert-link-exists.png'); + background-position: left; +} + +#wikieditor-toolbar-link-int-target-status-notexists { + .background-image('images/dialogs/insert-link-notexists.png'); + background-position: left; +} + +#wikieditor-toolbar-link-int-target-status-invalid { + .background-image('images/dialogs/insert-link-invalid.png'); + background-position: left; +} + +#wikieditor-toolbar-link-int-target-status-external { + .background-image('images/dialogs/insert-link-external.png'); + background-position: left; +} + +#wikieditor-toolbar-link-int-target-status-disambig { + .background-image('images/dialogs/insert-disambiguation.png'); + background-position: left; +} + +/* File dialog */ +#wikieditor-toolbar-file-target, +#wikieditor-toolbar-file-caption { + width: 100%; +} + +.wikieditor-toolbar-file-options { + .wikieditor-toolbar-field-wrapper { + float: left; + margin: 0 20px 0 0; + } +} + +/* Reference Dialog */ +#wikieditor-toolbar-reference-dialog { + label { + float: left; + line-height: 1.7em; + } +} + +#wikieditor-toolbar-reference-text { + width: 100%; +} + +/* RTL Changes */ + +body.rtl { + .wikiEditor-toolbar-dialog { + .ui-dialog-buttonpane { + button { + float: left; + margin: 0.5em 0.4em 0.5em 0 !important; + } + } + } +} + +/* Template Editor Dialogs */ +.wikiEditor-template-dialog-fields { + label { + text-transform: capitalize; + float: left; + width: 25%; + line-height: 2.25em; + } + + textarea { + float: right; + width: 70%; + line-height: 1.5em; + height: 1.5em; + } + + .wikiEditor-template-dialog-field-wrapper { + padding: 0.75em 0.33em; + border-bottom: 1px dashed silver; + clear: both; + + &:first-child { + padding-top: 0; + } + + &:last-child { + border-bottom: none; + } + } +} + +/* Self Clearing Floats */ +.wikieditor-toolbar-table-dimension-fields:after, +.wikieditor-toolbar-dialog-wrapper:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; +} + +/* Hides from IE-mac \*/ +* html { + .wikieditor-toolbar-table-dimension-fields, + .wikieditor-toolbar-dialog-wrapper { + height: 1%; + } +} + +.wikieditor-toolbar-table-dimension-fields, +.wikieditor-toolbar-dialog-wrapper { + display: inline-table; + display: block; +} + +/* End hide from IE-mac */ +/* Edit dialog */ +.wikiEditor-dialog-editoptions { + margin-top: 15px; +} + +/* Publish dialog */ +.wikiEditor-publish-dialog-copywarn { + margin-top: 0.5em; +} + +.wikiEditor-publish-dialog-summary { + margin-top: 1.5em; +} + +.wikiEditor-publish-dialog-options { + margin-top: 1.5em; +} diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.css b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.css deleted file mode 100644 index b97ce7e3..00000000 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.css +++ /dev/null @@ -1,68 +0,0 @@ -/** - * CSS for WikiEditor Dialogs jQuery plugin - */ - -.wikiEditor-toolbar-dialog table { - margin-top: 0.75em; -} - -.wikiEditor-toolbar-dialog table td { - padding: 0.5em; - height: 3em; - overflow: visible; -} - -/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */ -div.suggestions { - z-index: 1099; -} - -.wikiEditor-toolbar-dialog table td { - padding: 0 !important; -} - -.wikiEditor-toolbar-dialog .ui-dialog-content fieldset { - border: none !important; - margin: 0 !important; - padding: 0 !important; -} - -.wikiEditor-toolbar-dialog .ui-widget-header { - border-bottom:1px solid #6bc8f3 !important; -} - -.wikiEditor-toolbar-dialog .ui-dialog-content input[type=text] { - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -webkit-box-sizing: border-box; - -khtml-box-sizing: border-box; -} - -.wikiEditor-toolbar-dialog .ui-dialog-content input[type="radio"], -.wikiEditor-toolbar-dialog .ui-dialog-content input[type="checkbox"] { - margin-left: 0; -} - -.wikiEditor-toolbar-dialog .ui-dialog-titlebar-close { - padding: 0; -} -body .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close { - right: 0.9em; -} - -.wikieditor-toolbar-field-wrapper { - padding: 0 0 25px 0; -} - -.wikieditor-toolbar-floated-field-wrapper { - float: left; - margin-right: 2em; -} - -.wikieditor-toolbar-dialog-hint { - color: #999999; -} - -.wikiEditor-toolbar-dialog { - border: none; -} \ No newline at end of file diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.less b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.less new file mode 100644 index 00000000..6516d090 --- /dev/null +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.less @@ -0,0 +1,60 @@ +/** + * CSS for WikiEditor Dialogs jQuery plugin + */ + +.wikiEditor-toolbar-dialog { + border: none; + + .ui-dialog-content { + fieldset { + border: none !important; + margin: 0 !important; + padding: 0 !important; + } + + input[type=text] { + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + -webkit-box-sizing: border-box; + -khtml-box-sizing: border-box; + box-sizing: border-box; + } + + input { + &[type="radio"], + &[type="checkbox"] { + margin-left: 0; + } + } + } + + .ui-dialog-titlebar-close { + padding: 0; + } +} + +/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */ +div.suggestions { + z-index: 1099; +} + +body { + .wikiEditor-toolbar-dialog { + .ui-dialog-titlebar-close { + right: 0.9em; + } + } +} + +.wikieditor-toolbar-field-wrapper { + padding: 0 0 25px 0; +} + +.wikieditor-toolbar-floated-field-wrapper { + float: left; + margin-right: 2em; +} + +.wikieditor-toolbar-dialog-hint { + color: #999999; +} diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.html b/extensions/WikiEditor/modules/jquery.wikiEditor.html index 7a890af0..349f0273 100644 --- a/extensions/WikiEditor/modules/jquery.wikiEditor.html +++ b/extensions/WikiEditor/modules/jquery.wikiEditor.html @@ -6,14 +6,14 @@ +