From 19364482954ba8e72c94c02837edc117b71cefde Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 1 Mar 2014 19:44:06 +0100 Subject: [PATCH 1/2] Strip leading/trailing whitespace from extension url --- src/extensibility/ExtensionManagerDialog.js | 2 +- src/extensibility/InstallExtensionDialog.js | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/extensibility/ExtensionManagerDialog.js b/src/extensibility/ExtensionManagerDialog.js index 5e05f0ed118..57045af6f55 100644 --- a/src/extensibility/ExtensionManagerDialog.js +++ b/src/extensibility/ExtensionManagerDialog.js @@ -296,7 +296,7 @@ define(function (require, exports, module) { $dlg.find(".nav-tabs a:first").tab("show"); }); - // Handle the install button. + // Handle the install button. $(".extension-manager-dialog .install-from-url") .click(function () { InstallExtensionDialog.showDialog().done(ExtensionManager.updateFromDownload); diff --git a/src/extensibility/InstallExtensionDialog.js b/src/extensibility/InstallExtensionDialog.js index 6a1dfd982e2..ceefd5570a6 100644 --- a/src/extensibility/InstallExtensionDialog.js +++ b/src/extensibility/InstallExtensionDialog.js @@ -134,7 +134,7 @@ define(function (require, exports, module) { break; case STATE_INSTALLING: - url = this.$url.val(); + url = $.trim(this.$url.val()); this.$inputArea.hide(); this.$browseExtensionsButton.hide(); this.$msg.text(StringUtils.format(Strings.INSTALLING_FROM, url)) @@ -297,9 +297,10 @@ define(function (require, exports, module) { * @private * Handle typing in the URL field. */ - InstallExtensionDialog.prototype._handleUrlInput = function () { - var url = this.$url.val(), - valid = (url !== ""); + InstallExtensionDialog.prototype._handleUrlInput = function (e) { + var url = this.$url.val(), + trimmedUrl = $.trim(url), + valid = (trimmedUrl !== ""); if (!valid && this._state === STATE_VALID_URL) { this._enterState(STATE_START); } else if (valid && this._state === STATE_START) { From 47151d622b76cbc0358bab2e66e505cd65543796 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sun, 2 Mar 2014 19:05:55 +0100 Subject: [PATCH 2/2] Code review changes --- src/extensibility/InstallExtensionDialog.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/extensibility/InstallExtensionDialog.js b/src/extensibility/InstallExtensionDialog.js index ceefd5570a6..6105642b3db 100644 --- a/src/extensibility/InstallExtensionDialog.js +++ b/src/extensibility/InstallExtensionDialog.js @@ -134,7 +134,7 @@ define(function (require, exports, module) { break; case STATE_INSTALLING: - url = $.trim(this.$url.val()); + url = this.$url.val().trim(); this.$inputArea.hide(); this.$browseExtensionsButton.hide(); this.$msg.text(StringUtils.format(Strings.INSTALLING_FROM, url)) @@ -298,9 +298,8 @@ define(function (require, exports, module) { * Handle typing in the URL field. */ InstallExtensionDialog.prototype._handleUrlInput = function (e) { - var url = this.$url.val(), - trimmedUrl = $.trim(url), - valid = (trimmedUrl !== ""); + var url = this.$url.val().trim(), + valid = (url !== ""); if (!valid && this._state === STATE_VALID_URL) { this._enterState(STATE_START); } else if (valid && this._state === STATE_START) {