diff options
| author | Ian Moore <imoore76@yahoo.com> | 2015-09-09 08:51:46 -0400 |
|---|---|---|
| committer | Ian Moore <imoore76@yahoo.com> | 2015-09-09 08:51:46 -0400 |
| commit | b43db21f8963d49890531354ec3a3151b249be0e (patch) | |
| tree | 1a1fdea61550778cfb1b9fd2386d4d0497a70d9e /js | |
| parent | cfae402eee8881fcb5cce0e45d2b67ee25335254 (diff) | |
| download | phpvirtualbox-b43db21f8963d49890531354ec3a3151b249be0e.zip phpvirtualbox-b43db21f8963d49890531354ec3a3151b249be0e.tar.gz phpvirtualbox-b43db21f8963d49890531354ec3a3151b249be0e.tar.bz2 | |
See Changelog
Diffstat (limited to 'js')
| -rw-r--r-- | js/jquery.projectPlugins.js | 7 | ||||
| -rw-r--r-- | js/phpvirtualbox.js | 19 |
2 files changed, 17 insertions, 9 deletions
diff --git a/js/jquery.projectPlugins.js b/js/jquery.projectPlugins.js index 1386b2f..702d14f 100644 --- a/js/jquery.projectPlugins.js +++ b/js/jquery.projectPlugins.js @@ -532,9 +532,10 @@ if(jQuery) (function($){ return $('<li/>').addClass("folder") .addClass(data.expanded ? 'expanded' : 'collapsed') .addClass('vboxListItem') - .addClass(data.selected ? 'vboxListItemSelected' : '') .append( - $('<a/>').attr({'href':'#','name':data.path,'rel':data.path}).text(data.name) + $('<a/>').attr({'href':'#','name':data.path,'rel':data.path}) + .addClass(data.selected ? 'vboxListItemSelected' : '') + .text(data.name) ); } @@ -552,7 +553,7 @@ if(jQuery) (function($){ return a.type == 'folder' ? 1 : -1 }); - + var elms = []; for(var i = 0; i < data.length; i++) { diff --git a/js/phpvirtualbox.js b/js/phpvirtualbox.js index 1b7225e..f6f818a 100644 --- a/js/phpvirtualbox.js +++ b/js/phpvirtualbox.js @@ -1602,7 +1602,8 @@ var vboxVMActions = { }, /* Start a single VM */ _startVM: function(vm) { - + + var reqPromise = $.Deferred(); $.when(vm,vboxAjaxRequest('machineSetState',{'vm':vm.id,'state':'powerUp'})) // VM started and / or progress op returned @@ -1613,10 +1614,15 @@ var vboxVMActions = { if(vboxVMStates.isSaved(evm)) icon = 'progress_state_restore_90px.png'; else icon = 'progress_start_90px.png'; + reqPromise.resolve(); + vboxProgress({'progress':d.responseData.progress,'persist':d.persist}, function(){return;}, - icon, trans('Start selected virtual machines','UIActionPool'),evm.name); + icon, trans('Start selected virtual machines','UIActionPool'), evm.name); + } else { + reqPromise.reject(); } }); + return reqPromise; }, click: function (btn) { @@ -1689,10 +1695,11 @@ var vboxVMActions = { // Save the fact that we started this VM vboxVMActions.start._startedVMs[vm.id] = true; - vboxVMActions.start._startVM(vm); + $.when(vboxVMActions.start._startVM(vm)).done(function() { + // Loop + runVMsToStart(vms); + }); - // Loop - runVMsToStart(vms); })); })(vmsToStart); @@ -3132,7 +3139,7 @@ function vboxWizard() { function vboxToolbar(options) { var self = this; - this.buttons = options.buttons; + this.buttons = options.buttons ? options.buttons : []; this.size = options.size ? options.size : 22; this.addHeight = 24; this.lastItem = null; |