[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: getSelectedItem() -> findSelectedItem()
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404667 ) Change subject: getSelectedItem() -> findSelectedItem() .. getSelectedItem() -> findSelectedItem() Change-Id: Idf55594aa0bdf57083cf60e4ecfc2c67f93d35b8 --- M demos/ve/ve.demo.SurfaceContainer.js M demos/ve/ve.demo.init.js M src/ui/widgets/ve.ui.LanguageInputWidget.js M src/ui/widgets/ve.ui.MediaSizeWidget.js 4 files changed, 7 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/demos/ve/ve.demo.SurfaceContainer.js b/demos/ve/ve.demo.SurfaceContainer.js index 2203dcd..5368887 100644 --- a/demos/ve/ve.demo.SurfaceContainer.js +++ b/demos/ve/ve.demo.SurfaceContainer.js @@ -339,5 +339,5 @@ } localStorage.setItem( 've-demo-saved-markup', html ); this.pageMenu.selectItemByData( 'localStorage/ve-demo-saved-markup' ); - this.pageMenu.getSelectedItem().setDisabled( false ); + this.pageMenu.findSelectedItem().setDisabled( false ); }; diff --git a/demos/ve/ve.demo.init.js b/demos/ve/ve.demo.init.js index 03a4877..b7840f2 100644 --- a/demos/ve/ve.demo.init.js +++ b/demos/ve/ve.demo.init.js @@ -128,7 +128,7 @@ } if ( history.replaceState ) { for ( i = 0; i < ve.demo.surfaceContainers.length; i++ ) { - pages.push( ve.demo.surfaceContainers[ i ].pageMenu.getSelectedItem().getData() ); + pages.push( ve.demo.surfaceContainers[ i ].pageMenu.findSelectedItem().getData() ); } history.replaceState( null, document.title, '#!' + pages.join( ',' ) ); } @@ -138,7 +138,7 @@ var surfaceContainer; if ( !page && ve.demo.surfaceContainers.length ) { - page = ve.demo.surfaceContainers[ ve.demo.surfaceContainers.length - 1 ].pageMenu.getSelectedItem().getData(); + page = ve.demo.surfaceContainers[ ve.demo.surfaceContainers.length - 1 ].pageMenu.findSelectedItem().getData(); } surfaceContainer = new ve.demo.SurfaceContainer( target, page, currentLang, currentDir ); diff --git a/src/ui/widgets/ve.ui.LanguageInputWidget.js b/src/ui/widgets/ve.ui.LanguageInputWidget.js index 47893d3..e1059d0 100644 --- a/src/ui/widgets/ve.ui.LanguageInputWidget.js +++ b/src/ui/widgets/ve.ui.LanguageInputWidget.js @@ -151,7 +151,7 @@ return; } - selectedItem = this.directionSelect.getSelectedItem(); + selectedItem = this.directionSelect.findSelectedItem(); this.setLangAndDir( this.languageCodeTextInput.getValue(), selectedItem ? selectedItem.getData() : null diff --git a/src/ui/widgets/ve.ui.MediaSizeWidget.js b/src/ui/widgets/ve.ui.MediaSizeWidget.js index 3c80a62..2a7e9c1 100644 --- a/src/ui/widgets/ve.ui.MediaSizeWidget.js +++ b/src/ui/widgets/ve.ui.MediaSizeWidget.js @@ -320,7 +320,7 @@ * @return {string} The size type */ ve.ui.MediaSizeWidget.prototype.getSizeType = function () { - return this.sizeTypeSelectWidget.getSelectedItem() ? this.sizeTypeSelectWidget.getSelectedItem().getData() : ''; + return this.sizeTypeSelectWidget.findSelectedItem() ? this.sizeTypeSelectWidget.findSelectedItem().getData() : ''; }; /** @@ -593,8 +593,8 @@ * @return {boolean} Valid or invalid dimension values */ ve.ui.MediaSizeWidget.prototype.isValid = function () { - var itemType = this.sizeTypeSelectWidget.getSelectedItem() ? - this.sizeTypeSelectWidget.getSelectedItem().getData() : 'custom'; + var itemType = this.sizeTypeSelectWidget.findSelectedItem() ? + this.sizeTypeSelectWidget.findSelectedItem().getData() : 'custom'; // TODO: when upright is supported by Parsoid add validation for scale -- To view, visit https://gerrit.wikimedia.org/r/404667 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf55594aa0bdf57083cf60e4ecfc2c67f93d35b8 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: getSelectedItem() -> findSelectedItem()
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404667 ) Change subject: getSelectedItem() -> findSelectedItem() .. getSelectedItem() -> findSelectedItem() Change-Id: Idf55594aa0bdf57083cf60e4ecfc2c67f93d35b8 --- M demos/ve/ve.demo.SurfaceContainer.js M demos/ve/ve.demo.init.js M src/ui/widgets/ve.ui.LanguageInputWidget.js M src/ui/widgets/ve.ui.MediaSizeWidget.js 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/67/404667/1 diff --git a/demos/ve/ve.demo.SurfaceContainer.js b/demos/ve/ve.demo.SurfaceContainer.js index 2203dcd..5368887 100644 --- a/demos/ve/ve.demo.SurfaceContainer.js +++ b/demos/ve/ve.demo.SurfaceContainer.js @@ -339,5 +339,5 @@ } localStorage.setItem( 've-demo-saved-markup', html ); this.pageMenu.selectItemByData( 'localStorage/ve-demo-saved-markup' ); - this.pageMenu.getSelectedItem().setDisabled( false ); + this.pageMenu.findSelectedItem().setDisabled( false ); }; diff --git a/demos/ve/ve.demo.init.js b/demos/ve/ve.demo.init.js index 03a4877..b7840f2 100644 --- a/demos/ve/ve.demo.init.js +++ b/demos/ve/ve.demo.init.js @@ -128,7 +128,7 @@ } if ( history.replaceState ) { for ( i = 0; i < ve.demo.surfaceContainers.length; i++ ) { - pages.push( ve.demo.surfaceContainers[ i ].pageMenu.getSelectedItem().getData() ); + pages.push( ve.demo.surfaceContainers[ i ].pageMenu.findSelectedItem().getData() ); } history.replaceState( null, document.title, '#!' + pages.join( ',' ) ); } @@ -138,7 +138,7 @@ var surfaceContainer; if ( !page && ve.demo.surfaceContainers.length ) { - page = ve.demo.surfaceContainers[ ve.demo.surfaceContainers.length - 1 ].pageMenu.getSelectedItem().getData(); + page = ve.demo.surfaceContainers[ ve.demo.surfaceContainers.length - 1 ].pageMenu.findSelectedItem().getData(); } surfaceContainer = new ve.demo.SurfaceContainer( target, page, currentLang, currentDir ); diff --git a/src/ui/widgets/ve.ui.LanguageInputWidget.js b/src/ui/widgets/ve.ui.LanguageInputWidget.js index 47893d3..e1059d0 100644 --- a/src/ui/widgets/ve.ui.LanguageInputWidget.js +++ b/src/ui/widgets/ve.ui.LanguageInputWidget.js @@ -151,7 +151,7 @@ return; } - selectedItem = this.directionSelect.getSelectedItem(); + selectedItem = this.directionSelect.findSelectedItem(); this.setLangAndDir( this.languageCodeTextInput.getValue(), selectedItem ? selectedItem.getData() : null diff --git a/src/ui/widgets/ve.ui.MediaSizeWidget.js b/src/ui/widgets/ve.ui.MediaSizeWidget.js index 3c80a62..2a7e9c1 100644 --- a/src/ui/widgets/ve.ui.MediaSizeWidget.js +++ b/src/ui/widgets/ve.ui.MediaSizeWidget.js @@ -320,7 +320,7 @@ * @return {string} The size type */ ve.ui.MediaSizeWidget.prototype.getSizeType = function () { - return this.sizeTypeSelectWidget.getSelectedItem() ? this.sizeTypeSelectWidget.getSelectedItem().getData() : ''; + return this.sizeTypeSelectWidget.findSelectedItem() ? this.sizeTypeSelectWidget.findSelectedItem().getData() : ''; }; /** @@ -593,8 +593,8 @@ * @return {boolean} Valid or invalid dimension values */ ve.ui.MediaSizeWidget.prototype.isValid = function () { - var itemType = this.sizeTypeSelectWidget.getSelectedItem() ? - this.sizeTypeSelectWidget.getSelectedItem().getData() : 'custom'; + var itemType = this.sizeTypeSelectWidget.findSelectedItem() ? + this.sizeTypeSelectWidget.findSelectedItem().getData() : 'custom'; // TODO: when upright is supported by Parsoid add validation for scale -- To view, visit https://gerrit.wikimedia.org/r/404667 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf55594aa0bdf57083cf60e4ecfc2c67f93d35b8 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits