Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

UI fixes for installer dialog #3173

Merged
merged 7 commits into from
Mar 20, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 2 additions & 28 deletions src/extensibility/InstallExtensionDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
/*global define, window, $, PathUtils, Mustache, document */
/*unittests: Install Extension Dialog*/

define(function (require, exports, module) {
"use strict";
Expand Down Expand Up @@ -236,33 +237,6 @@ define(function (require, exports, module) {
}
};

/**
* @private
* Sets the installer backend.
* @param {{install: function(string): $.Promise, cancel: function()}} installer
* The installer backend object to use. Must define two functions:
* install(url): takes the URL of the extension to install, and returns a promise
* that's resolved or rejected when the installation succeeds or fails.
* cancel(): cancels an ongoing installation.
*/
InstallExtensionDialog.prototype._setInstaller = function (installer) {
this._installer = installer;
};

/**
* @private
* Returns the jQuery objects for various dialog fileds. For unit testing only.
* @return {object} fields An object containing "dlg", "okButton", "cancelButton", and "url" fields.
*/
InstallExtensionDialog.prototype._getFields = function () {
return {
$dlg: this.$dlg,
$okButton: this.$okButton,
$cancelButton: this.$cancelButton,
$url: this.$url
};
};

/**
* @private
* Closes the dialog if it's not already closed. For unit testing only.
Expand All @@ -281,7 +255,7 @@ define(function (require, exports, module) {
InstallExtensionDialog.prototype.show = function () {
if (this._state !== STATE_CLOSED) {
// Somehow the dialog got invoked twice. Just ignore this.
return;
return this._dialogDeferred.promise();
}

// We ignore the promise returned by showModalDialogUsingTemplate, since we're managing the
Expand Down
2 changes: 1 addition & 1 deletion src/nls/root/strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ define({
// Extension Management strings
"INSTALL_EXTENSION_TITLE" : "Install Extension",
"INSTALL_EXTENSION_LABEL" : "Extension URL",
"INSTALL_EXTENSION_HINT" : "URL of the extension's ZIP package",
"INSTALL_EXTENSION_HINT" : "URL of the extension's ZIP file or GitHub repo",
"INSTALLING_FROM" : "Installing extension from {0}...",
"INSTALL_SUCCEEDED" : "Installation successful!",
"INSTALL_FAILED" : "Installation failed.",
Expand Down
6 changes: 1 addition & 5 deletions src/styles/brackets.less
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,8 @@ a, img {
white-space: nowrap;

&>div {
display: inline;
display: inline-block;
margin-left: 20px;

&.spinner {
display: inline-block;
}
}
}

Expand Down
Loading