docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing remaining bugs.

This commit is contained in:
Jeff Morgan 2014-09-11 16:16:19 -07:00
parent 9619b22dd7
commit 388e7a0dc5
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.js
View File

@ -140,7 +140,10 @@ app.on('ready', function() {
// and load the index.html of the app. // and load the index.html of the app.
mainWindow.loadUrl(url); mainWindow.loadUrl(url);
mainWindow.webContents.on('did-finish-load', function () {
mainWindow.show(); mainWindow.show();
mainWindow.focus(); mainWindow.focus();
}); });
}); });
});

8
meteor/client/lib/installer.js
View File

@ -7,7 +7,7 @@ var app = remote.require('app');
Installer = {}; Installer = {};
Installer.CURRENT_VERSION = app.getVersion(); Installer.CURRENT_VERSION = app.getVersion();
Installer.baseURL = 'https://s3.amazonaws.com/kite-installer/'; Installer.BASE_URL = 'https://s3.amazonaws.com/kite-installer/';
Installer.isUpToDate = function () { Installer.isUpToDate = function () {
return !!Installs.findOne({version: Installer.CURRENT_VERSION}); return !!Installs.findOne({version: Installer.CURRENT_VERSION});
@ -25,7 +25,7 @@ Installer.steps = [
run: function (callback, progressCallback) { run: function (callback, progressCallback) {
var installed = VirtualBox.installed(); var installed = VirtualBox.installed();
if (!installed) { if (!installed) {
Util.downloadFile(Installer.baseURL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) { Util.downloadFile(Installer.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) {
if (err) {callback(err); return;} if (err) {callback(err); return;}
VirtualBox.install(function (err) { VirtualBox.install(function (err) {
if (!VirtualBox.installed()) { if (!VirtualBox.installed()) {
@ -43,7 +43,7 @@ Installer.steps = [
if (err) {callback(err); return;} if (err) {callback(err); return;}
if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) { if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) {
// Download a newer version of Virtualbox // Download a newer version of Virtualbox
Util.downloadFile(Installer.baseURL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) { Util.downloadFile(Installer.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) {
if (err) {callback(err); return;} if (err) {callback(err); return;}
VirtualBox.install(function (err) { VirtualBox.install(function (err) {
if (err) {callback(err); return;} if (err) {callback(err); return;}
@ -148,7 +148,7 @@ Installer.steps = [
// Set up the default Kitematic images // Set up the default Kitematic images
{ {
run: function (callback, progressCallback) { run: function (callback, progressCallback) {
Util.downloadFile(Installer.baseURL + Docker.DEFAULT_IMAGES_FILENAME, path.join(Util.getResourceDir(), Docker.DEFAULT_IMAGES_FILENAME), Docker.DEFAULT_IMAGES_CHECKSUM, function (err) { Util.downloadFile(Installer.BASE_URL + Docker.DEFAULT_IMAGES_FILENAME, path.join(Util.getResourceDir(), Docker.DEFAULT_IMAGES_FILENAME), Docker.DEFAULT_IMAGES_CHECKSUM, function (err) {
Docker.reloadDefaultContainers(function (err) { Docker.reloadDefaultContainers(function (err) {
callback(err); callback(err);
}); });

4
meteor/client/main.js
View File

@ -63,6 +63,10 @@ Handlebars.registerHelper('timeSince', function (date) {
return moment(date).fromNow(); return moment(date).fromNow();
}); });
Handlebars.registerHelper('isUpdating', function (date) {
return Session.get('isUpdating');
});
var fixBoot2DockerVM = function (callback) { var fixBoot2DockerVM = function (callback) {
Boot2Docker.check(function (err) { Boot2Docker.check(function (err) {
if (err) { if (err) {

2
meteor/client/views/dashboard/setup/setup-finish.js
View File

@ -6,7 +6,7 @@ Template.setup_finish.events({
if (!settings) { if (!settings) {
Settings.insert({tracking: enableDiagnostics}); Settings.insert({tracking: enableDiagnostics});
} else { } else {
settings.update(settings._id, { Settings.update(settings._id, {
$set: { $set: {
tracking: enableDiagnostics tracking: enableDiagnostics
} }

6
meteor/client/views/dashboard/setup/setup-layout.js
View File

@ -3,9 +3,3 @@ Template.setup_layout.rendered = function () {
$('.header .icons a').tooltip(); $('.header .icons a').tooltip();
}, 1000); }, 1000);
}; };
Template.setup_layout.helpers({
isUpdating: function () {
return Session.get('isUpdating');
}
});