From 62324167ff4ca195916ae321d23c053ff7a13676 Mon Sep 17 00:00:00 2001 From: Trevor Parscal Date: Fri, 2 May 2014 15:47:17 -0700 Subject: [PATCH] Update VE core submodule to master (a1e9df1) Also adjust calls to InputWidget methods changed in I324dfc2 in OOUI. New changes: 9da32d7 Update OOjs UI to v0.1.0-pre (e6edd86d37) b6aa671 Localisation updates from https://translatewiki.net. 1cba6e0 Update OOjs UI to v0.1.0-pre (9a6c625f5f) 94629f9 Localisation updates from https://translatewiki.net. Change-Id: Id58d199c7ce3332a104ab2a5c395561ab94ae060 --- lib/ve | 2 +- modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js | 4 ++-- modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js | 5 +++-- modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/ve b/lib/ve index ca76a5bb43..a1e9df14f6 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit ca76a5bb43f5716a7949975f250a007751a86643 +Subproject commit a1e9df14f6107948f296bbeeb15fb7ea93ca83e2 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js index c73e911bcc..6d6ea01523 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js @@ -189,7 +189,7 @@ ve.ui.MWMediaInsertDialog.prototype.setup = function ( data ) { // Initialization // This must be done only after there are proper // sources defined - this.search.getQuery().$input.focus().select(); + this.search.getQuery().focus().select(); this.search.getResults().selectItem(); this.search.getResults().highlightItem(); }, this ) ); @@ -199,7 +199,7 @@ ve.ui.MWMediaInsertDialog.prototype.setup = function ( data ) { * @inheritdoc */ ve.ui.MWMediaInsertDialog.prototype.teardown = function ( data ) { - this.search.clear(); + this.search.getQuery().setValue( '' ); // Parent method ve.ui.Dialog.prototype.teardown.call( this, data ); diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js index 2104b331f7..090db168e4 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js @@ -282,7 +282,7 @@ ve.ui.MWReferenceDialog.prototype.initialize = function () { this.applyButton.$element.hide(); this.selectButton.$element.hide(); this.panels.setItem( this.searchPanel ); - this.search.getQuery().$input.focus().select(); + this.search.getQuery().focus().select(); } } ); this.backButton.connect( this, { 'click': function () { this.backButton.$element.hide(); @@ -333,7 +333,8 @@ ve.ui.MWReferenceDialog.prototype.setup = function ( data ) { * @inheritdoc */ ve.ui.MWReferenceDialog.prototype.teardown = function ( data ) { - this.search.clear(); + this.search.getQuery().setValue( '' ); + this.referenceSurface.destroy(); this.referenceSurface = null; this.referenceModel = null; diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js index f2228fe48c..8325e8eda4 100644 --- a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js +++ b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js @@ -111,7 +111,7 @@ ve.ui.MWExtensionInspector.prototype.ready = function () { ve.ui.Inspector.prototype.ready.call( this ); // Focus the input - this.input.$input.focus().select(); + this.input.focus().select(); }; /**