jenkins-bot has submitted this change and it was merged.
Change subject: Use new options format for toolbar in mw init
......................................................................
Use new options format for toolbar in mw init
Wasn't updated after change 63095 and so wasn't setting options.
Bug: 48509
Change-Id: Icda3305e422bedaf0d490b8fbe51f55b8c8e79e8
---
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 6 insertions(+), 13 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
index 50d15c9..cf6a222 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -51,19 +51,12 @@
this.deactivating = false;
this.scrollTop = null;
this.surfaceOptions = {
- 'toolbars': {
- 'top': {
- 'float': !this.isMobileDevice,
- // HACK: The toolbar configuration isn't very
extendable, so this is mostly
- // copy-pasted from ve.Surface except using
mwLink for the link tool
- 'tools': [
- { 'name': 'history', 'items' : ['undo',
'redo'] },
- { 'name': 'textStyle', 'items' :
['mwFormat'] },
- { 'name': 'textStyle', 'items' :
['bold', 'italic', 'mwLink', 'clear'] },
- { 'name': 'list', 'items' : ['number',
'bullet', 'outdent', 'indent'] }
- ]
- }
- },
+ 'toolbar': [
+ { 'name': 'history', 'items' : ['undo', 'redo'] },
+ { 'name': 'textStyle', 'items' : ['mwFormat'] },
+ { 'name': 'textStyle', 'items' : ['bold', 'italic',
'mwLink', 'clear'] },
+ { 'name': 'list', 'items' : ['number', 'bullet',
'outdent', 'indent'] }
+ ],
'commands': ['bold', 'italic', 'mwLink', 'undo', 'redo',
'indent', 'outdent']
};
this.currentUri = currentUri;
--
To view, visit https://gerrit.wikimedia.org/r/63850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icda3305e422bedaf0d490b8fbe51f55b8c8e79e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
