Merge pull request phpvirtualbox#355 from phpvirtualbox/jquery_upgrades

Fix incompatibilities with new jQuery

Author: anonie-muss

js/chooser.js

@@ -501,8 +501,7 @@ var vboxChooser = {
 		if(!vmUpdate) return;
 
 		// New VM
-		if(newVM) {
-
+		if(newVM === true) {
 			// New VM.. add it to groups..
 			if(!vmUpdate.groups || vmUpdate.groups.length == 0)
 				vmUpdate.groups = ['/'];
@@ -516,16 +515,14 @@ var vboxChooser = {
 
 		// Existing VM. Replace existing elements
 		} else {
-				
 			$('#'+vboxChooser._anchorid).find('table.vboxChooserItem-'+vboxChooser._anchorid+'-'+vmUpdate.id).each(function(i,elm){
-				
+
 				var newHTML = vboxChooser.vmHTML(vmUpdate);
 				if($(elm).hasClass('vboxListItemSelected')) {
 					$(newHTML).addClass('vboxListItemSelected').removeClass('vboxHover');
 				}
-				$(elm).children().replaceWith(newHTML.children());
+				$(elm).empty().append(newHTML.children());
 			});
-				
 		}
 
 	},
@@ -2183,14 +2180,13 @@ $(document).ready(function(){
 	// Event list queue
 	}).on('vboxEvents',function(e, eventList) {
 
-		var redrawVMs = [];
+		const redrawVMs = new Set();
 		var sortGroups = [];
 		var groupsChanged = false;
 		var selectedChanged = false;
 		var resizeElements = false;
 
 		for(var i = 0; i < eventList.length; i++) {
-			
 			switch(eventList[i].eventType) {
 
 				////////////////////////////////
@@ -2212,7 +2208,7 @@ $(document).ready(function(){
 							break;
 						}
 
-						redrawVMs[redrawVMs.length] = vmid;
+						redrawVMs.add(vmid);
 
 						// Make sure VM has root group at least
 						if(data.groups.length == 0) data.groups = ['/'];
@@ -2272,7 +2268,7 @@ $(document).ready(function(){
 				case 'OnSnapshotTaken':
 				case 'OnSnapshotRestored':
 				case 'OnSnapshotChanged':
-					redrawVMs[redrawVMs.length] = eventList[i].machineId;
+					redrawVMs.add(eventList[i].machineId);
 					break;
 
 				/////////////////////////////////////
@@ -2370,7 +2366,7 @@ $(document).ready(function(){
 
 							// redraw when custom icon changes
 							case 'phpvb/icon':
-								redrawVMs[redrawVMs.length] = eventList[i].machineId;
+								redrawVMs.add(eventList[i].machineId);
 								break;
 						}
 					}
@@ -2383,7 +2379,7 @@ $(document).ready(function(){
 				///////////////////////////////////////
 				case 'OnSessionStateChanged':
 				case 'OnMachineStateChanged':
-					redrawVMs[redrawVMs.length] = eventList[i].machineId;
+					redrawVMs.add(eventList[i].machineId);
 					break;
 
 			} // </ switch eventType >>
@@ -2393,17 +2389,13 @@ $(document).ready(function(){
 
 		// Now redraw each VM
 		///////////////////////////
-		var redrawn = {};
 		var updateMenus = false;
-		for(var i = 0; i < redrawVMs.length; i++) {
-			
-			if(redrawn[redrawVMs[i]]) continue;
-			redrawn[redrawVMs[i]] = true;
+		for(const vmId of redrawVMs) {
 
-			vboxChooser.updateVMElement(vboxVMDataMediator.getVMData(redrawVMs[i]));
+			vboxChooser.updateVMElement(vboxVMDataMediator.getVMData(vmId));
 
 			// Update menus if the VM is selected
-			updateMenus = (updateMenus || vboxChooser.isVMSelected(redrawVMs[i]));
+			updateMenus = (updateMenus || vboxChooser.isVMSelected(vmId));
 
 		}
 

js/dialogs.js

@@ -1301,8 +1301,9 @@ function vboxVMsettingsDialog(vm,pane) {
 		 */
 		var presaveCallback = function() {
 
-		    if(!$('#vboxSettingsDialog').data('vboxEncSettingsChanged'))
-		        return true;
+			if(!$('#vboxSettingsDialog').data('vboxEncSettingsChanged')) {
+				return true;
+			}
 
 		    var encMediaSettings = $.Deferred();
 
@@ -1433,15 +1434,13 @@ function vboxVMsettingsDialog(vm,pane) {
 
 			// Always run this
 			.always(function(){
-
 				// No longer watch for changed VM settings
 				$('#vboxPane').unbind('vboxEvents',machineSettingsChanged);
 
 			})
 
 			// Run this when "Save" is clicked
 			.done(function() {
-			    
 				var loader = new vboxLoader();
 				var sdata = $.extend($('#vboxSettingsDialog').data('vboxMachineData'),{'clientConfig':$('#vboxPane').data('vboxConfig')});
 				loader.add('machineSave',function(){return;},sdata);
@@ -1645,29 +1644,37 @@ function vboxSettingsDialog(title,panes,data,pane,icon,langContext,presave) {
 		/* Tell dialog that data is loaded */
 		$('#vboxSettingsDialog').trigger('dataLoaded');
 
-		var buttons = { };
-		buttons[trans('OK','QIMessageBox')] = function() {
+		var buttons = [
+			{
+				text: trans('OK','QIMessageBox'),
+				click: function() {
 
-		    $(this).trigger('save');
+					$(this).trigger('save');
+		
+					// Does some settings pane need to do some presave
+					// work? (ask questions, run wizard, some other asynch task)
+					var promise = true;
+					if(presave) {
+						promise = presave();
+					}
+					var dlg = this;
+					$.when(promise).done(() => {
+						results.resolve();
+					}).then(() => {
+						$(dlg).trigger('close').empty().remove();
+						$(document).trigger('click');                
+					});
+				}
+			}, {
+				text: trans('Cancel','QIMessageBox'),
+				click: function() {
+					results.reject();
+					$(this).trigger('close').empty().remove();
+					$(document).trigger('click');
+				}
+			}
+		];
 
-		    // Does some settings pane need to do some presave
-		    // work? (ask questions, run wizard, some other asynch task)
-		    var promise = true;
-		    if(presave) {
-		        promise = presave();
-		    }
-		    var dlg = this;
-		    $.when(promise).done(function() {
-		        results.resolve(true);
-		        $(dlg).trigger('close').empty().remove();
-		        $(document).trigger('click');                
-            });
-		};
-		buttons[trans('Cancel','QIMessageBox')] = function() {
-			results.reject();
-			$(this).trigger('close').empty().remove();
-			$(document).trigger('click');
-		};
 
 		// Init with "nothing has changed yet"
 		$('#vboxSettingsDialog').data('formDataChanged', false);

js/eventlistener.js

@@ -127,7 +127,7 @@ var vboxEventListener = {
 	},
 
 	/**
-	 * Subscribe to a single machine's events. This should happen
+	 * Subscribe to a single machine's events.
 	 * 
 	 * @param {String} vmid - ID of VM to subscribe to
 	 */