[MediaWiki-commits] [Gerrit] Adding a MediaSizeWidget - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Adding a MediaSizeWidget .. Adding a MediaSizeWidget The widget is responsible for presenting width/height values and storing original media size values that aspect ratio is calculated from. Change-Id: I3d0f9348a52ac39f68dd09394778369026928c9d --- M modules/ve/i18n/en.json M modules/ve/i18n/qqq.json M modules/ve/ui/styles/ve.ui.Widget.css A modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js 4 files changed, 384 insertions(+), 2 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve/i18n/en.json b/modules/ve/i18n/en.json index d9bea05..4094ce2 100644 --- a/modules/ve/i18n/en.json +++ b/modules/ve/i18n/en.json @@ -60,6 +60,10 @@ visualeditor-languageinspector-widget-label-langcode: Language code, visualeditor-languageinspector-widget-label-language: Language, visualeditor-linkinspector-title: Hyperlink, +visualeditor-mediasizewidget-button-originaldimensions: Set to original dimensions, +visualeditor-mediasizewidget-label-defaulterror: Size values are invalid., +visualeditor-mediasizewidget-label-height: Height, +visualeditor-mediasizewidget-label-width: Width, visualeditor-listbutton-bullet-tooltip: Bullet list, visualeditor-listbutton-number-tooltip: Numbered list, visualeditor-shortcuts-clipboard: Clipboard, @@ -72,4 +76,4 @@ visualeditor-specialcharinspector-characterlist-insert: {\n\t\symbols\: {\n\t\t\−\: \−\,\n\t\t\—\: \—\,\n\t\t\°\: \°\,\n\t\t\″\: \″\,\n\t\t\′\: \′\,\n\t\t\←\: \←\,\n\t\t\→\: \→\,\n\t\t\·\: \·\,\n\t\t\§\: \§\\n\t},\n\t\accents\: {\n\t\t\à\: \à\,\n\t\t\á\: \á\,\n\t\t\â\: \â\,\n\t\t\ä\: \ä\,\n\t\t\ç\: \ç\,\n\t\t\è\: \è\,\n\t\t\é\: \é\,\n\t\t\ê\: \ê\,\n\t\t\ë\: \ë\,\n\t\t\ì\: \ì\,\n\t\t\í\: \í\,\n\t\t\î\: \î\,\n\t\t\ï\: \ï\,\n\t\t\ò\: \ò\,\n\t\t\ó\: \ó\,\n\t\t\ô\: \ô\,\n\t\t\ö\: \ö\,\n\t\t\ø\: \ø\,\n\t\t\ù\: \ù\,\n\t\t\ú\: \ú\,\n\t\t\û\: \û\,\n\t\t\ü\: \ü\\n\t},\n\t\math\: {\n\t\t\−\: \−\,\n\t\t\×\: \×\,\n\t\t\÷\: \÷\,\n\t\t\≈\: \≈\,\n\t\t\≠\: \≠\,\n\t\t\≤\: \≤\,\n\t\t\≥\: \≥\,\n\t\t\±\: \±\\n\t}\n}, visualeditor-toolbar-insert: Insert, visualeditor-version-label: Version -} \ No newline at end of file +} diff --git a/modules/ve/i18n/qqq.json b/modules/ve/i18n/qqq.json index b71c960..975a971 100644 --- a/modules/ve/i18n/qqq.json +++ b/modules/ve/i18n/qqq.json @@ -65,6 +65,10 @@ visualeditor-linkinspector-title: Title of the link inspector dialog.\n{{Identical|Hyperlink}}, visualeditor-listbutton-bullet-tooltip: Tooltip text for the bullet list button, visualeditor-listbutton-number-tooltip: Tooltip text for the numbered list button, +visualeditor-mediasizewidget-button-originaldimensions: Label for the button that sets media to its original dimensions., +visualeditor-mediasizewidget-label-defaulterror: An error label notifying the user the size inputs are invalid., +visualeditor-mediasizewidget-label-height: Label for the height input., +visualeditor-mediasizewidget-label-width: Label for the width input., visualeditor-shortcuts-clipboard: Heading for clipboard shortcuts, visualeditor-shortcuts-formatting: Heading for paragraph formatting shortcuts, visualeditor-shortcuts-history: Heading for history shortcuts, @@ -75,4 +79,4 @@ visualeditor-specialcharinspector-characterlist-insert: This is a JSON string defining the special characters that can be inserted using the special character insertion tool.\n{{doc-important|Please make sure it is a valid JSON string.}}\n{{Optional}}, visualeditor-toolbar-insert: Label text for insert menu in toolbar.\n{{Identical|Insert}}, visualeditor-version-label: Label text for version number\n{{Identical|Version}} -} \ No newline at end of file +} diff --git a/modules/ve/ui/styles/ve.ui.Widget.css b/modules/ve/ui/styles/ve.ui.Widget.css index e70ec20..d04cf1f 100644 --- a/modules/ve/ui/styles/ve.ui.Widget.css +++ b/modules/ve/ui/styles/ve.ui.Widget.css @@ -114,3 +114,8 @@ .ve-ui-groupButtonWidget { white-space: normal; } + +/* ve.ui.MediaSizeWidget */ +.ve-ui-mediaSizeWidget-input-hasError input[type=text] { + background: #ffc2c2; +} diff --git a/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js new file mode 100644 index 000..942c814 --- /dev/null +++ b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js @@ -0,0 +1,369 @@ +/*! + * VisualEditor UserInterface MediaSizeWidget class. + * + * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ + +/** + * Widget that lets the user edit dimensions (width and height), + * optionally with a fixed aspect ratio. + * + * The widget is designed to work in one of two ways: + * 1. Instantiated with size configuration already set up + * 2.
[MediaWiki-commits] [Gerrit] Adding a MediaSizeWidget - change (VisualEditor/VisualEditor)
Mooeypoo has uploaded a new change for review. https://gerrit.wikimedia.org/r/107019 Change subject: Adding a MediaSizeWidget .. Adding a MediaSizeWidget The widget is responsible for presenting width/height values and storing original media size values that aspect ratio is calculated from. Change-Id: I3d0f9348a52ac39f68dd09394778369026928c9d --- M modules/ve/i18n/en.json M modules/ve/i18n/qqq.json M modules/ve/ui/styles/ve.ui.Widget.css A modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js 4 files changed, 308 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/19/107019/1 diff --git a/modules/ve/i18n/en.json b/modules/ve/i18n/en.json index 166bfa2..6ad8cbe 100644 --- a/modules/ve/i18n/en.json +++ b/modules/ve/i18n/en.json @@ -54,6 +54,10 @@ visualeditor-languageinspector-widget-label-langcode: Language code, visualeditor-languageinspector-widget-label-language: Language, visualeditor-linkinspector-title: Hyperlink, +visualeditor-mediasizewidget-button-originalDimensions: Set to original dimensions, +visualeditor-mediasizewidget-label-defaulterror: Size values are invalid., +visualeditor-mediasizewidget-label-height: Height, +visualeditor-mediasizewidget-label-width: Width, visualeditor-listbutton-bullet-tooltip: Bullet list, visualeditor-listbutton-number-tooltip: Numbered list, visualeditor-specialcharacter-button-tooltip: Special character, @@ -61,4 +65,4 @@ visualeditor-specialcharinspector-characterlist-insert: {\n\t\symbols\: {\n\t\t\−\: \−\,\n\t\t\—\: \—\,\n\t\t\°\: \°\,\n\t\t\″\: \″\,\n\t\t\′\: \′\,\n\t\t\←\: \←\,\n\t\t\→\: \→\,\n\t\t\·\: \·\,\n\t\t\§\: \§\\n\t},\n\t\accents\: {\n\t\t\à\: \à\,\n\t\t\á\: \á\,\n\t\t\â\: \â\,\n\t\t\ä\: \ä\,\n\t\t\ç\: \ç\,\n\t\t\è\: \è\,\n\t\t\é\: \é\,\n\t\t\ê\: \ê\,\n\t\t\ë\: \ë\,\n\t\t\ì\: \ì\,\n\t\t\í\: \í\,\n\t\t\î\: \î\,\n\t\t\ï\: \ï\,\n\t\t\ò\: \ò\,\n\t\t\ó\: \ó\,\n\t\t\ô\: \ô\,\n\t\t\ö\: \ö\,\n\t\t\ø\: \ø\,\n\t\t\ù\: \ù\,\n\t\t\ú\: \ú\,\n\t\t\û\: \û\,\n\t\t\ü\: \ü\\n\t},\n\t\math\: {\n\t\t\−\: \−\,\n\t\t\×\: \×\,\n\t\t\÷\: \÷\,\n\t\t\≈\: \≈\,\n\t\t\≠\: \≠\,\n\t\t\≤\: \≤\,\n\t\t\≥\: \≥\,\n\t\t\±\: \±\\n\t}\n}, visualeditor-toolbar-insert: Insert, visualeditor-version-label: Version -} \ No newline at end of file +} diff --git a/modules/ve/i18n/qqq.json b/modules/ve/i18n/qqq.json index 61e5979..bf983c1 100644 --- a/modules/ve/i18n/qqq.json +++ b/modules/ve/i18n/qqq.json @@ -59,9 +59,13 @@ visualeditor-linkinspector-title: Title of the link inspector dialog.\n{{Identical|Hyperlink}}, visualeditor-listbutton-bullet-tooltip: Tooltip text for the bullet list button, visualeditor-listbutton-number-tooltip: Tooltip text for the numbered list button, +visualeditor-mediasizewidget-button-originalDimensions: Label for the button that sets media to its original dimensions., +visualeditor-mediasizewidget-label-defaulterror: An error label notifying the user the size inputs are invalid., +visualeditor-mediasizewidget-label-height: Label for the height input., +visualeditor-mediasizewidget-label-width: Label for the width input., visualeditor-specialcharacter-button-tooltip: Tooltip text for the insert character button.\n{{Identical|Special character}}, visualeditor-specialcharacterinspector-title: Used as title for special character inspector.\n{{Identical|Special character}}, visualeditor-specialcharinspector-characterlist-insert: This is a JSON string defining the special characters that can be inserted using the special character insertion tool.\n{{doc-important|Please make sure it is a valid JSON string.}}\n{{Optional}}, visualeditor-toolbar-insert: Label text for insert menu in toolbar.\n{{Identical|Insert}}, visualeditor-version-label: Label text for version number\n{{Identical|Version}} -} \ No newline at end of file +} diff --git a/modules/ve/ui/styles/ve.ui.Widget.css b/modules/ve/ui/styles/ve.ui.Widget.css index e70ec20..ec19a5d 100644 --- a/modules/ve/ui/styles/ve.ui.Widget.css +++ b/modules/ve/ui/styles/ve.ui.Widget.css @@ -114,3 +114,8 @@ .ve-ui-groupButtonWidget { white-space: normal; } + +/* ve.ui.MediaSizeWidget */ +.ve-ui-MediaSizeWidget-input-hasError input[type='text'] { + background: #ffc2c2; +} diff --git a/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js new file mode 100644 index 000..793441c --- /dev/null +++ b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js @@ -0,0 +1,293 @@ +/*! + * VisualEditor UserInterface MediaSizeWidget class. + * + * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ + +/** + * Creates an ve.ui.MediaSizeWidget object. + * + * @class + * @extends OO.ui.TextInputWidget + * + * @constructor + * @param {Object}