jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342794 )
Change subject: Move all style related files to ui/styles
......................................................................
Move all style related files to ui/styles
For example,
modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.less will have
its style file as
modules/ui/translationunits/styles/mw.cx.ui.LinkTranslationUnit.less
This makes the filer organization consistent with VE, OOJS-UI
Change-Id: I04edeb999c31131bdc8819b54435965788d5ac2c
---
M extension.json
M modules/ui/mw.cx.ui.Infobar.js
R modules/ui/styles/images/external_link.png
R modules/ui/styles/images/external_link.svg
R modules/ui/styles/translationunits/mw.cx.ui.LinkTranslationUnit.less
R modules/ui/styles/widgets/mw.cx.ui.MessageWidget.less
R modules/ui/styles/widgets/mw.cx.ui.PageSelectorWidget.less
R modules/ui/styles/widgets/mw.cx.ui.PageTitleWidget.less
R modules/ui/styles/widgets/mw.cx.ui.ProgressBarWidget.less
R modules/ui/styles/widgets/mw.cx.ui.TranslationToolWidget.less
R modules/ui/widgets/mw.cx.ui.MessageWidget.js
M modules/ui/widgets/mw.cx.ui.PageSelectorWidget.js
R modules/ui/widgets/mw.cx.ui.PageTitleWidget.js
R modules/ui/widgets/mw.cx.ui.ProgressBarWidget.js
R modules/ui/widgets/mw.cx.ui.TranslationToolWidget.js
15 files changed, 90 insertions(+), 93 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 4f248e6..14f65e4 100644
--- a/extension.json
+++ b/extension.json
@@ -1495,7 +1495,7 @@
"cx-translation-target-page-exists"
],
"dependencies": [
- "mw.cx.widgets.MessageWidget",
+ "mw.cx.ui.MessageWidget",
"mw.cx.ui"
],
"targets": [
@@ -1547,7 +1547,7 @@
"mw.cx.ui",
"ext.cx.widgets.spinner",
"mw.cx.ui.Categories",
- "mw.cx.widgets.PageTitleWidget"
+ "mw.cx.ui.PageTitleWidget"
]
},
"mw.cx.ui.SourceColumn.legacy": {
@@ -1580,7 +1580,7 @@
"dependencies": [
"mw.cx.ui",
"ext.cx.widgets.spinner",
- "mw.cx.widgets.PageTitleWidget"
+ "mw.cx.ui.PageTitleWidget"
]
},
"mw.cx.ui.TranslationColumn.legacy": {
@@ -1622,7 +1622,7 @@
],
"dependencies": [
"mw.cx.ui",
- "mw.cx.widgets.ProgressBarWidget",
+ "mw.cx.ui.ProgressBarWidget",
"mw.cx.tools.SearchTool"
]
},
@@ -1676,7 +1676,7 @@
"ui/translationunits/mw.cx.ui.LinkTranslationUnit.js"
],
"styles":[
-
"ui/translationunits/styles/mw.cx.ui.LinkTranslationUnit.less"
+
"ui/styles/translationunits/mw.cx.ui.LinkTranslationUnit.less"
],
"dependencies": [
"mw.cx.ui.TranslationUnit"
@@ -1882,7 +1882,7 @@
],
"dependencies": [
"mw.cx.tools.TranslationToolFactory",
- "mw.cx.widgets.TranslationToolWidget"
+ "mw.cx.ui.TranslationToolWidget"
]
},
"mw.cx.tools.ReferenceTool": {
@@ -1910,23 +1910,23 @@
"mw.cx.ui"
]
},
- "mw.cx.widgets.TranslationToolWidget":{
+ "mw.cx.ui.TranslationToolWidget":{
"scripts": [
- "widgets/mw.cx.widgets.TranslationToolWidget.js"
+ "ui/widgets/mw.cx.ui.TranslationToolWidget.js"
],
"styles": [
-
"widgets/mw.cx.widgets.TranslationToolWidget.less"
+
"ui/styles/widgets/mw.cx.ui.TranslationToolWidget.less"
],
"dependencies": [
"oojs-ui-widgets"
]
},
- "mw.cx.widgets.ProgressBarWidget":{
+ "mw.cx.ui.ProgressBarWidget":{
"scripts": [
- "widgets/mw.cx.widgets.ProgressBarWidget.js"
+ "ui/widgets/mw.cx.ui.ProgressBarWidget.js"
],
"styles": [
- "widgets/mw.cx.widgets.ProgressBarWidget.less"
+
"ui/styles/widgets/mw.cx.ui.ProgressBarWidget.less"
],
"dependencies": [
"oojs-ui-widgets"
@@ -1943,24 +1943,24 @@
"oojs-ui-widgets"
]
},
- "mw.cx.widgets.PageTitleWidget": {
+ "mw.cx.ui.PageTitleWidget": {
"scripts": [
- "widgets/mw.cx.widgets.PageTitleWidget.js"
+ "ui/widgets/mw.cx.ui.PageTitleWidget.js"
],
"styles": [
- "widgets/mw.cx.widgets.PageTitleWidget.less"
+
"ui/styles/widgets/mw.cx.ui.PageTitleWidget.less"
],
"dependencies": [
"oojs-ui-widgets",
"mw.cx.util"
]
},
- "mw.cx.widgets.MessageWidget": {
+ "mw.cx.ui.MessageWidget": {
"scripts": [
- "widgets/mw.cx.widgets.MessageWidget.js"
+ "ui/widgets/mw.cx.ui.MessageWidget.js"
],
"styles": [
- "widgets/mw.cx.widgets.MessageWidget.less"
+ "ui/styles/widgets/mw.cx.ui.MessageWidget.less"
],
"dependencies": [
"mw.cx.ui",
@@ -1979,7 +1979,7 @@
"ui/widgets/mw.cx.ui.PageSelectorWidget.js"
],
"styles": [
-
"ui/widgets/styles/mw.cx.ui.PageSelectorWidget.less"
+
"ui/styles/widgets/mw.cx.ui.PageSelectorWidget.less"
],
"dependencies": [
"mediawiki.widgets"
diff --git a/modules/ui/mw.cx.ui.Infobar.js b/modules/ui/mw.cx.ui.Infobar.js
index dce0135..e99b506 100644
--- a/modules/ui/mw.cx.ui.Infobar.js
+++ b/modules/ui/mw.cx.ui.Infobar.js
@@ -56,7 +56,7 @@
mw.cx.ui.Infobar.prototype.showMessage = function ( type, message, details ) {
var messageWidget;
- messageWidget = new mw.cx.widgets.MessageWidget( {
+ messageWidget = new mw.cx.ui.MessageWidget( {
message: message,
details: details,
type: type
diff --git a/modules/ui/translationunits/images/external_link.png
b/modules/ui/styles/images/external_link.png
similarity index 100%
rename from modules/ui/translationunits/images/external_link.png
rename to modules/ui/styles/images/external_link.png
Binary files differ
diff --git a/modules/ui/translationunits/images/external_link.svg
b/modules/ui/styles/images/external_link.svg
similarity index 100%
rename from modules/ui/translationunits/images/external_link.svg
rename to modules/ui/styles/images/external_link.svg
diff --git
a/modules/ui/translationunits/styles/mw.cx.ui.LinkTranslationUnit.less
b/modules/ui/styles/translationunits/mw.cx.ui.LinkTranslationUnit.less
similarity index 100%
rename from modules/ui/translationunits/styles/mw.cx.ui.LinkTranslationUnit.less
rename to modules/ui/styles/translationunits/mw.cx.ui.LinkTranslationUnit.less
diff --git a/modules/widgets/mw.cx.widgets.MessageWidget.less
b/modules/ui/styles/widgets/mw.cx.ui.MessageWidget.less
similarity index 93%
rename from modules/widgets/mw.cx.widgets.MessageWidget.less
rename to modules/ui/styles/widgets/mw.cx.ui.MessageWidget.less
index c3373b0..e8896bb 100644
--- a/modules/widgets/mw.cx.widgets.MessageWidget.less
+++ b/modules/ui/styles/widgets/mw.cx.ui.MessageWidget.less
@@ -1,4 +1,4 @@
-@import 'common/ext.cx.common.less';
+@import '../../../widgets/common/ext.cx.common.less';
.cx-message-widget {
border-bottom: 1px solid #ddd;
diff --git a/modules/ui/widgets/styles/mw.cx.ui.PageSelectorWidget.less
b/modules/ui/styles/widgets/mw.cx.ui.PageSelectorWidget.less
similarity index 100%
rename from modules/ui/widgets/styles/mw.cx.ui.PageSelectorWidget.less
rename to modules/ui/styles/widgets/mw.cx.ui.PageSelectorWidget.less
diff --git a/modules/widgets/mw.cx.widgets.PageTitleWidget.less
b/modules/ui/styles/widgets/mw.cx.ui.PageTitleWidget.less
similarity index 90%
rename from modules/widgets/mw.cx.widgets.PageTitleWidget.less
rename to modules/ui/styles/widgets/mw.cx.ui.PageTitleWidget.less
index 3ba05d0..9b9d4ed 100644
--- a/modules/widgets/mw.cx.widgets.PageTitleWidget.less
+++ b/modules/ui/styles/widgets/mw.cx.ui.PageTitleWidget.less
@@ -1,5 +1,5 @@
// Common styles for source or tanslation columns of translation view
-@import 'common/ext.cx.common.less';
+@import '../../../widgets/common/ext.cx.common.less';
.cx-pagetitle {
&.oo-ui-textInputWidget {
diff --git a/modules/widgets/mw.cx.widgets.ProgressBarWidget.less
b/modules/ui/styles/widgets/mw.cx.ui.ProgressBarWidget.less
similarity index 87%
rename from modules/widgets/mw.cx.widgets.ProgressBarWidget.less
rename to modules/ui/styles/widgets/mw.cx.ui.ProgressBarWidget.less
index 22ddd41..7819d20 100644
--- a/modules/widgets/mw.cx.widgets.ProgressBarWidget.less
+++ b/modules/ui/styles/widgets/mw.cx.ui.ProgressBarWidget.less
@@ -1,4 +1,4 @@
-@import 'common/ext.cx.common.less';
+@import '../../../widgets/common/ext.cx.common.less';
.cx-progressbar {
background-color: #ddd;
diff --git a/modules/widgets/mw.cx.widgets.TranslationToolWidget.less
b/modules/ui/styles/widgets/mw.cx.ui.TranslationToolWidget.less
similarity index 94%
rename from modules/widgets/mw.cx.widgets.TranslationToolWidget.less
rename to modules/ui/styles/widgets/mw.cx.ui.TranslationToolWidget.less
index 6542c8b..3581bdf 100644
--- a/modules/widgets/mw.cx.widgets.TranslationToolWidget.less
+++ b/modules/ui/styles/widgets/mw.cx.ui.TranslationToolWidget.less
@@ -1,4 +1,4 @@
-@import 'common/ext.cx.common.less';
+@import '../../../widgets/common/ext.cx.common.less';
.cx-card {
background-color: #fff;
diff --git a/modules/widgets/mw.cx.widgets.MessageWidget.js
b/modules/ui/widgets/mw.cx.ui.MessageWidget.js
similarity index 73%
rename from modules/widgets/mw.cx.widgets.MessageWidget.js
rename to modules/ui/widgets/mw.cx.ui.MessageWidget.js
index a9e8c77..ca3017b 100644
--- a/modules/widgets/mw.cx.widgets.MessageWidget.js
+++ b/modules/ui/widgets/mw.cx.ui.MessageWidget.js
@@ -11,13 +11,13 @@
* @constructor
* @param {Object} [config] Configuration options
*/
-mw.cx.widgets.MessageWidget = function CXMessageWidget( config ) {
+mw.cx.ui.MessageWidget = function CXMessageWidget( config ) {
var iconMap;
// Configuration initialization
config = config || {};
// Parent constructor
- mw.cx.widgets.MessageWidget.parent.call( this, config );
+ mw.cx.ui.MessageWidget.parent.call( this, config );
// Mixin constructors
OO.ui.mixin.ItemWidget.call( this );
@@ -49,22 +49,22 @@
/* Setup */
-OO.inheritClass( mw.cx.widgets.MessageWidget, OO.ui.Widget );
-OO.mixinClass( mw.cx.widgets.MessageWidget, OO.ui.mixin.ItemWidget );
-OO.mixinClass( mw.cx.widgets.MessageWidget, OO.ui.mixin.LabelElement );
-OO.mixinClass( mw.cx.widgets.MessageWidget, OO.ui.mixin.IconElement );
-OO.mixinClass( mw.cx.widgets.MessageWidget, OO.ui.mixin.FlaggedElement );
+OO.inheritClass( mw.cx.ui.MessageWidget, OO.ui.Widget );
+OO.mixinClass( mw.cx.ui.MessageWidget, OO.ui.mixin.ItemWidget );
+OO.mixinClass( mw.cx.ui.MessageWidget, OO.ui.mixin.LabelElement );
+OO.mixinClass( mw.cx.ui.MessageWidget, OO.ui.mixin.IconElement );
+OO.mixinClass( mw.cx.ui.MessageWidget, OO.ui.mixin.FlaggedElement );
/* Methods */
/**
* Handle close icon clicks
*/
-mw.cx.widgets.MessageWidget.prototype.onCloseClick = function () {
+mw.cx.ui.MessageWidget.prototype.onCloseClick = function () {
this.$element.remove();
};
-mw.cx.widgets.MessageWidget.prototype.composeMessage = function ( message,
details ) {
+mw.cx.ui.MessageWidget.prototype.composeMessage = function ( message, details
) {
var $message, $details;
$message = $( '<span>' ).addClass( 'cx-message-widget-message' );
$details = $( '<span>' ).addClass( 'cx-message-widget-details' );
diff --git a/modules/ui/widgets/mw.cx.ui.PageSelectorWidget.js
b/modules/ui/widgets/mw.cx.ui.PageSelectorWidget.js
index a45c05f..73d6033 100644
--- a/modules/ui/widgets/mw.cx.ui.PageSelectorWidget.js
+++ b/modules/ui/widgets/mw.cx.ui.PageSelectorWidget.js
@@ -1,73 +1,70 @@
/*!
- * Content Translation UserInterface PageSelectorWidget class.
+* Content Translation UserInterface PageSelectorWidget class.
+*
+* @ingroup Extensions
+* @copyright See AUTHORS.txt
+* @license GPL-2.0+
+*/
+
+'use strict';
+
+/**
+ * Creates an mw.cx.ui.PageSelectorWidget object.
*
- * @ingroup Extensions
- * @copyright See AUTHORS.txt
- * @license GPL-2.0+
+ * @class
+ * @extends mw.cx.ui.PageSelectorWidget
+ *
+ * @constructor
+ * @param {Object} [config] Configuration options
+ * @cfg {number} [namespace] Namespace to prepend to queries. Defaults to main
namespace.
*/
+mw.cx.ui.PageSelectorWidget = function PageSelectorWidget( config ) {
+ config = $.extend( {}, {
+ namespace: mw.config.get( 'wgNamespaceIds' ).main,
+ showDescriptions: true,
+ showImages: true,
+ icon: 'search'
+ }, config );
-( function ( $, mw, OO ) {
- 'use strict';
+ this.siteMapper = config.siteMapper;
+ this.language = config.language || 'en';
+ // Parent constructor
+ mw.cx.ui.PageSelectorWidget.super.call( this, config );
+ // Initialization
+ this.$element.addClass( 'mw-cx-ui-PageSelectorWidget' );
+};
- /**
- * Creates an mw.cx.ui.PageSelectorWidget object.
- *
- * @class
- * @extends mw.cx.ui.PageSelectorWidget
- *
- * @constructor
- * @param {Object} [config] Configuration options
- * @cfg {number} [namespace] Namespace to prepend to queries. Defaults
to main namespace.
- */
- mw.cx.ui.PageSelectorWidget = function PageSelectorWidget( config ) {
- config = $.extend( {}, {
- namespace: mw.config.get( 'wgNamespaceIds' ).main,
- showDescriptions: true,
- showImages: true,
- icon: 'search'
- }, config );
+/* Inheritance */
- this.siteMapper = config.siteMapper;
- this.language = config.language || 'en';
- // Parent constructor
- mw.cx.ui.PageSelectorWidget.super.call( this, config );
- // Initialization
- this.$element.addClass( 'mw-cx-ui-PageSelectorWidget' );
- };
+OO.inheritClass( mw.cx.ui.PageSelectorWidget, mw.widgets.TitleInputWidget );
- /* Inheritance */
+/* Methods */
- OO.inheritClass( mw.cx.ui.PageSelectorWidget,
mw.widgets.TitleInputWidget );
+/**
+ * @inheritdoc
+ */
+mw.cx.ui.PageSelectorWidget.prototype.getApi = function () {
+ return this.siteMapper.getApi( this.language );
+};
- /* Methods */
+mw.cx.ui.PageSelectorWidget.prototype.setLanguage = function ( language ) {
+ this.language = language;
+ this.setDir( $.uls.data.getDir( language ) );
- /**
- * @inheritdoc
- */
- mw.cx.ui.PageSelectorWidget.prototype.getApi = function () {
- return this.siteMapper.getApi( this.language );
- };
+ // Reset the requestCache of OO.ui.mixin.LookupElement
+ this.requestCache = {};
+};
- mw.cx.ui.PageSelectorWidget.prototype.setLanguage = function ( language
) {
- this.language = language;
- this.setDir( $.uls.data.getDir( language ) );
+/**
+ * @inheritdoc
+ */
+mw.cx.ui.PageSelectorWidget.prototype.getOptionWidgetData = function ( title,
data ) {
+ var optionWidgetData;
- // Reset the requestCache of OO.ui.mixin.LookupElement
- this.requestCache = {};
- };
+ // Mixin method
+ optionWidgetData =
mw.widgets.TitleWidget.prototype.getOptionWidgetData.call( this, title, data );
+ // Correct the URL so that it can point to the source language wiki.
+ optionWidgetData.url = this.siteMapper.getPageUrl( this.language, title
);
- /**
- * @inheritdoc
- */
- mw.cx.ui.PageSelectorWidget.prototype.getOptionWidgetData = function (
title, data ) {
- var optionWidgetData;
-
- // Mixin method
- optionWidgetData =
mw.widgets.TitleWidget.prototype.getOptionWidgetData.call( this, title, data );
- // Correct the URL so that it can point to the source language
wiki.
- optionWidgetData.url = this.siteMapper.getPageUrl(
this.language, title );
-
- return optionWidgetData;
- };
-
-}( jQuery, mediaWiki, OO ) );
+ return optionWidgetData;
+};
diff --git a/modules/widgets/mw.cx.widgets.PageTitleWidget.js
b/modules/ui/widgets/mw.cx.ui.PageTitleWidget.js
similarity index 100%
rename from modules/widgets/mw.cx.widgets.PageTitleWidget.js
rename to modules/ui/widgets/mw.cx.ui.PageTitleWidget.js
diff --git a/modules/widgets/mw.cx.widgets.ProgressBarWidget.js
b/modules/ui/widgets/mw.cx.ui.ProgressBarWidget.js
similarity index 100%
rename from modules/widgets/mw.cx.widgets.ProgressBarWidget.js
rename to modules/ui/widgets/mw.cx.ui.ProgressBarWidget.js
diff --git a/modules/widgets/mw.cx.widgets.TranslationToolWidget.js
b/modules/ui/widgets/mw.cx.ui.TranslationToolWidget.js
similarity index 100%
rename from modules/widgets/mw.cx.widgets.TranslationToolWidget.js
rename to modules/ui/widgets/mw.cx.ui.TranslationToolWidget.js
--
To view, visit https://gerrit.wikimedia.org/r/342794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04edeb999c31131bdc8819b54435965788d5ac2c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
