Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220490
Change subject: WIP support block/inline modes
......................................................................
WIP support block/inline modes
Change-Id: Icb752435149dc66d38c04d6c80658e4212318ba4
---
M i18n/en.json
M i18n/qqq.json
M modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
3 files changed, 29 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi
refs/changes/90/220490/1
diff --git a/i18n/en.json b/i18n/en.json
index 0172d4d..db0e674 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,6 +11,8 @@
"syntaxhighlight-err-loading": "(error loading supported language list)",
"syntaxhighlight-err-language": "Invalid language.",
"syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-code": "Code",
+ "syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-display-default":
"Block",
+ "syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-display-inline":
"Inline",
"syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-language":
"Language",
"syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-title": "Code
block",
"geshi.css": "/* CSS placed here will be applied to GeSHi syntax
highlighting */"
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b0a054f..859a3d3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -14,6 +14,8 @@
"syntaxhighlight-err-loading": "Error message shown to the user if
loading the list of supported languages fails.",
"syntaxhighlight-err-language": "Error message shown if the user inputs
an invalid or unsupported language.",
"syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-code": "Label
for the code input field",
+
"syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-display-default":
"Label for the 'default' value of the display attribute.",
+
"syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-display-inline":
"Label for the 'inline' value of the display attribute.",
"syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-language":
"Label for the language field",
"syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-title": "Title
for the VisualEditor syntax highlighter inspector, above the text area for the
code",
"geshi.css": "CSS comment"
diff --git a/modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
b/modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
index 86e48ea..264d734 100644
--- a/modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
+++ b/modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
@@ -52,6 +52,19 @@
}
} );
+ this.displaySelect = new OO.ui.ButtonSelectWidget( {
+ items: [
+ new OO.ui.ButtonOptionWidget( {
+ data: 'block',
+ label: ve.msg(
'syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-display-default' )
+ } ),
+ new OO.ui.ButtonOptionWidget( {
+ data: 'inline',
+ label: ve.msg(
'syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-display-inline' )
+ } )
+ ]
+ } );
+
this.showLinesCheckbox = new OO.ui.CheckboxInputWidget();
var languageField = new OO.ui.FieldLayout( this.language, {
@@ -61,6 +74,10 @@
codeField = new OO.ui.FieldLayout( this.input, {
align: 'top',
label: ve.msg(
'syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-code' )
+ } ),
+ displayField = new OO.ui.FieldLayout( this.displaySelect, {
+ align: 'top',
+ label: 'Display'
} ),
showLinesField = new OO.ui.FieldLayout( this.showLinesCheckbox,
{
align: 'inline',
@@ -72,6 +89,7 @@
this.form.$element.prepend(
languageField.$element,
codeField.$element,
+ displayField.$element,
showLinesField.$element
);
};
@@ -98,11 +116,15 @@
.next( function () {
var attrs = this.selectedNode.getAttribute( 'mw'
).attrs,
language = attrs.lang || '',
+ display = attrs.inline ? 'inline' : 'block',
showLines = attrs.line !== undefined;
this.language.setValue( language );
this.language.setValidityFlag( true );
this.language.on( 'change', this.onChangeHandler );
+
+ this.displaySelect.selectItemByData( display );
+ this.displaySelect.on( 'choose', this.onChangeHandler );
this.showLinesCheckbox.setSelected( showLines );
this.showLinesCheckbox.on( 'change',
this.onChangeHandler );
@@ -116,6 +138,7 @@
return
ve.ui.MWSyntaxHighlightInspector.super.prototype.getTeardownProcess.call( this,
data )
.first( function () {
this.language.off( 'change', this.onChangeHandler );
+ this.displaySelect.off( 'choose', this.onChangeHandler
);
this.showLinesCheckbox.off( 'change',
this.onChangeHandler );
}, this );
};
@@ -128,9 +151,11 @@
ve.ui.MWSyntaxHighlightInspector.super.prototype.updateMwData.call(
this, mwData );
var language = this.language.getValue(),
+ display = this.displaySelect.getSelectedItem().getData(),
showLines = this.showLinesCheckbox.isSelected();
mwData.attrs.lang = language || undefined;
+ mwData.attrs.inline = display === 'inline' ? '1' : undefined;
mwData.attrs.line = showLines ? '1' : undefined;
};
--
To view, visit https://gerrit.wikimedia.org/r/220490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb752435149dc66d38c04d6c80658e4212318ba4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
