wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 00:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Allow CollabTarget to load on mobile"

Browse source
This commit is contained in:
jenkins-bot 2018-05-23 17:01:57 +00:00 committed by Gerrit Code Review
parent b7bbf68fbe 2cd7abf88b
commit c99c96e805
2 changed files with 75 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
extension.json
View file

@ -214,11 +214,19 @@
"socket.io": {
"scripts": [
"lib/ve/lib/socket.io-client/socket.io.min.js"
],
"targets": [
"desktop",
"mobile"
]
},
"dompurify": {
"scripts": [
"lib/ve/lib/dompurify/purify.js"
],
"targets": [
"desktop",
"mobile"
]
},
"color-picker": {
@ -227,6 +235,10 @@
],
"styles": [
"lib/ve/lib/color-picker/color-picker.css"
],
"targets": [
"desktop",
"mobile"
]
},
"unicodejs": {
@ -444,7 +456,23 @@
"modules/ve-mw-collab/ve.init.mw.CollabTarget.js"
],
"styles": [
"modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css",
"modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css"
],
"dependencies": [
"ext.visualEditor.targetLoader",
"ext.visualEditor.base",
"ext.visualEditor.mediawiki",
"ext.visualEditor.rebase",
"oojs-ui.styles.icons-interactions",
"oojs-ui.styles.icons-layout"
],
"targets": [
"desktop",
"mobile"
]
},
"ext.visualEditor.collabTarget.desktop": {
"styles": [
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css"
],
"skinStyles": {
@ -459,13 +487,37 @@
]
},
"dependencies": [
"ext.visualEditor.targetLoader",
"ext.visualEditor.base",
"ext.visualEditor.mediawiki",
"ext.visualEditor.collabTarget",
"ext.visualEditor.core.desktop",
"ext.visualEditor.mwextensions.desktop",
"ext.visualEditor.desktopTarget",
"ext.visualEditor.rebase"
"ext.visualEditor.desktopTarget"
],
"targets": [
"desktop"
]
},
"ext.visualEditor.collabTarget.mobile": {
"styles": [
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css"
],
"skinStyles": {
"vector": [
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css"
],
"apex": [
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-apex.css"
],
"monobook": [
"modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css"
]
},
"dependencies": [
"ext.visualEditor.collabTarget",
"ext.visualEditor.core.mobile",
"ext.visualEditor.mwextensions"
],
"targets": [
"mobile"
]
},
"ext.visualEditor.collabTarget.init": {
@ -474,11 +526,16 @@
],
"dependencies": [
"oojs-ui",
"mediawiki.widgets"
"mediawiki.widgets",
"ext.visualEditor.supportCheck"
],
"messages" : [
"collabpad",
"collabpad-doctitle"
],
"targets": [
"desktop",
"mobile"
]
},
"ext.visualEditor.collabTarget.init.styles": {
@ -1162,6 +1219,10 @@
],
"dependencies": [
"ext.visualEditor.core"
],
"targets": [
"desktop",
"mobile"
]
},
"ext.visualEditor.rebase": {
@ -1184,6 +1245,10 @@
],
"messages": [
"visualeditor-rebase-client-author-name"
],
"targets": [
"desktop",
"mobile"
]
},
"ext.visualEditor.core.desktop": {

5
modules/ve-mw-collab/ve.init.mw.CollabTarget.init.js
View file

@ -10,7 +10,7 @@
conf = mw.config.get( 'wgVisualEditorConfig' ),
pageName = mw.config.get( 'collabPadPageName' ) || '',
pageTitle = mw.Title.newFromText( pageName ),
modules = [ 'ext.visualEditor.collabTarget' ]
modules = [ OO.ui.isMobile() ? 'ext.visualEditor.collabTarget.mobile' : 'ext.visualEditor.collabTarget.desktop' ]
// Add modules from $wgVisualEditorPluginModules
.concat( conf.pluginModules.filter( mw.loader.getState ) ),
loadingPromise = mw.loader.using( modules ),
@ -51,7 +51,8 @@
} ).always( function () {
form.toggle( false );
progressBar.toggle( false );
} ).fail( function () {
} ).fail( function ( err ) {
mw.log.error( err );
// eslint-disable-next-line no-use-before-define
showForm();
} );