Merge pull request #6 from imoore76/develop

5.0-3

6 files changed, 36 insertions, 11 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d833683..6f877e6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,19 @@
 -------------------------------------

+    5.0-3   2015-09-09

+-------------------------------------

+Fixed file browser header content type causing blank file / folder

+contents

+https://sourceforge.net/p/phpvirtualbox/bugs/49/

+

+Fixed selection highlighting in file / folder browser

+

+Fixed all VMs in a group starting on the same RDP port

+https://sourceforge.net/p/phpvirtualbox/bugs/46/

+

+Fixed missing en.xml language file

+https://sourceforge.net/p/phpvirtualbox/bugs/45/

+

+-------------------------------------

     5.0-2   2015-08-12

 -------------------------------------

 Translation fixes

diff --git a/endpoints/jqueryFileTree.php b/endpoints/jqueryFileTree.php
index e9e6871..016a29d 100644
--- a/endpoints/jqueryFileTree.php
+++ b/endpoints/jqueryFileTree.php
@@ -207,7 +207,7 @@ if($request['dir'] == DSEP && count($allowed_folders)) {
 

 }

 

-header('Content-type', 'application/json');

+header('Content-type: application/json');

 echo(json_encode($returnData));

 

 

diff --git a/endpoints/lib/config.php b/endpoints/lib/config.php
index ebe34c2..bf90398 100644
--- a/endpoints/lib/config.php
+++ b/endpoints/lib/config.php
@@ -14,7 +14,7 @@
 /*

  * This version of phpVirtualBox

  */

-define('PHPVBOX_VER', '5.0-2');

+define('PHPVBOX_VER', '5.0-3');

 

 class phpVBoxConfigClass {

 

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;
diff --git a/languages/en.xml b/languages/en.xml
new file mode 100644
index 0000000..1ab635a
--- /dev/null
+++ b/languages/en.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<language />
\ No newline at end of file