[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use findItem(s)FromData instead getItem(s)FromData

2018-01-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398217 )

Change subject: Use findItem(s)FromData instead getItem(s)FromData
..


Use findItem(s)FromData instead getItem(s)FromData

Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f
Bug: T76630
Change-Id: I1fe6d194a87579dc457708d88dd01b30c5b8a1c3
---
M modules/tools/ext.cx.tools.template.editor.js
M modules/tools/mw.cx.tools.MachineTranslationTool.js
M modules/ui/mw.cx.ui.ToolsColumn.js
3 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/modules/tools/ext.cx.tools.template.editor.js 
b/modules/tools/ext.cx.tools.template.editor.js
index e2f5c05..ab0ca62 100644
--- a/modules/tools/ext.cx.tools.template.editor.js
+++ b/modules/tools/ext.cx.tools.template.editor.js
@@ -433,7 +433,7 @@
selectedOption = selector.getMenu().getSelectedItem();
selectedKeys.forEach( function ( key ) {
if ( !selectedOption || key !== 
selectedOption.getData() ) {
-   selector.getMenu().getItemFromData( key 
).setDisabled( true );
+   selector.getMenu().findItemFromData( 
key ).setDisabled( true );
}
} );
} );
diff --git a/modules/tools/mw.cx.tools.MachineTranslationTool.js 
b/modules/tools/mw.cx.tools.MachineTranslationTool.js
index 5ef2cf8..68c26b3 100644
--- a/modules/tools/mw.cx.tools.MachineTranslationTool.js
+++ b/modules/tools/mw.cx.tools.MachineTranslationTool.js
@@ -153,7 +153,7 @@
}
 
// Validate and fix the given provider if required
-   item = menu.getItemFromData( provider );
+   item = menu.findItemFromData( provider );
if ( provider === undefined || !item ) {
// Fallback to something that always exists
provider = 'source';
diff --git a/modules/ui/mw.cx.ui.ToolsColumn.js 
b/modules/ui/mw.cx.ui.ToolsColumn.js
index 9511043..6eddfd9 100644
--- a/modules/ui/mw.cx.ui.ToolsColumn.js
+++ b/modules/ui/mw.cx.ui.ToolsColumn.js
@@ -95,7 +95,7 @@
  * @param {mw.cx.tools.TranslationTool} tool The translation tool instance
  */
 mw.cx.ui.ToolsColumn.prototype.showTool = function ( tool ) {
-   if ( !this.toolContainer.getItemsFromData( tool.getData() ).length ) {
+   if ( !this.toolContainer.findItemsFromData( tool.getData() ).length ) {
this.toolContainer.addItems( [ tool.getCard() ] );
}
 };
@@ -105,7 +105,7 @@
  * @param {mw.cx.tools.TranslationTool} tool The translation tool instance
  */
 mw.cx.ui.ToolsColumn.prototype.hideTool = function ( tool ) {
-   var items = this.toolContainer.getItemsFromData( tool.getData() );
+   var items = this.toolContainer.findItemsFromData( tool.getData() );
this.toolContainer.removeItems( items );
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/398217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1fe6d194a87579dc457708d88dd01b30c5b8a1c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use findItem(s)FromData instead getItem(s)FromData

2017-12-13 Thread Prtksxna (Code Review) 
Prtksxna has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398217 )

Change subject: Use findItem(s)FromData instead getItem(s)FromData
..

Use findItem(s)FromData instead getItem(s)FromData

Depends-on: Ia2110f71d1642f61451cb8acc7e8a930d0feb31f
Bug: T76630
Change-Id: I1fe6d194a87579dc457708d88dd01b30c5b8a1c3
---
M modules/tools/ext.cx.tools.template.editor.js
M modules/tools/mw.cx.tools.MachineTranslationTool.js
M modules/ui/mw.cx.ui.ToolsColumn.js
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/17/398217/1

diff --git a/modules/tools/ext.cx.tools.template.editor.js 
b/modules/tools/ext.cx.tools.template.editor.js
index e2f5c05..ab0ca62 100644
--- a/modules/tools/ext.cx.tools.template.editor.js
+++ b/modules/tools/ext.cx.tools.template.editor.js
@@ -433,7 +433,7 @@
selectedOption = selector.getMenu().getSelectedItem();
selectedKeys.forEach( function ( key ) {
if ( !selectedOption || key !== 
selectedOption.getData() ) {
-   selector.getMenu().getItemFromData( key 
).setDisabled( true );
+   selector.getMenu().findItemFromData( 
key ).setDisabled( true );
}
} );
} );
diff --git a/modules/tools/mw.cx.tools.MachineTranslationTool.js 
b/modules/tools/mw.cx.tools.MachineTranslationTool.js
index 5ef2cf8..68c26b3 100644
--- a/modules/tools/mw.cx.tools.MachineTranslationTool.js
+++ b/modules/tools/mw.cx.tools.MachineTranslationTool.js
@@ -153,7 +153,7 @@
}
 
// Validate and fix the given provider if required
-   item = menu.getItemFromData( provider );
+   item = menu.findItemFromData( provider );
if ( provider === undefined || !item ) {
// Fallback to something that always exists
provider = 'source';
diff --git a/modules/ui/mw.cx.ui.ToolsColumn.js 
b/modules/ui/mw.cx.ui.ToolsColumn.js
index 9511043..6eddfd9 100644
--- a/modules/ui/mw.cx.ui.ToolsColumn.js
+++ b/modules/ui/mw.cx.ui.ToolsColumn.js
@@ -95,7 +95,7 @@
  * @param {mw.cx.tools.TranslationTool} tool The translation tool instance
  */
 mw.cx.ui.ToolsColumn.prototype.showTool = function ( tool ) {
-   if ( !this.toolContainer.getItemsFromData( tool.getData() ).length ) {
+   if ( !this.toolContainer.findItemsFromData( tool.getData() ).length ) {
this.toolContainer.addItems( [ tool.getCard() ] );
}
 };
@@ -105,7 +105,7 @@
  * @param {mw.cx.tools.TranslationTool} tool The translation tool instance
  */
 mw.cx.ui.ToolsColumn.prototype.hideTool = function ( tool ) {
-   var items = this.toolContainer.getItemsFromData( tool.getData() );
+   var items = this.toolContainer.findItemsFromData( tool.getData() );
this.toolContainer.removeItems( items );
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/398217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fe6d194a87579dc457708d88dd01b30c5b8a1c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits