diff options
author | Ian Moore <imoore76@yahoo.com> | 2015-12-07 08:47:17 -0500 |
---|---|---|
committer | Ian Moore <imoore76@yahoo.com> | 2015-12-07 08:47:17 -0500 |
commit | e3a53018b9fb292654a30fe8a4115ed685231614 (patch) | |
tree | e1f08f80d94d0440d9df8502d9da332576ac9b00 /js | |
parent | 94e17f57f3f16628f140cdd5fd5ca00806ca208f (diff) | |
download | phpvirtualbox-e3a53018b9fb292654a30fe8a4115ed685231614.zip phpvirtualbox-e3a53018b9fb292654a30fe8a4115ed685231614.tar.gz phpvirtualbox-e3a53018b9fb292654a30fe8a4115ed685231614.tar.bz2 |
See CHANGELOG
Diffstat (limited to 'js')
-rw-r--r-- | js/jquery.projectPlugins.js | 3 | ||||
-rw-r--r-- | js/phpvirtualbox.js | 22 |
2 files changed, 14 insertions, 11 deletions
diff --git a/js/jquery.projectPlugins.js b/js/jquery.projectPlugins.js index 702d14f..fa8bd85 100644 --- a/js/jquery.projectPlugins.js +++ b/js/jquery.projectPlugins.js @@ -550,8 +550,7 @@ if(jQuery) (function($){ data.sort(function(a,b){ if(a.type == b.type) return strnatcasecmp(a.path, b.path); - - return a.type == 'folder' ? 1 : -1 + return a.type == 'folder' ? -1 : 1 }); var elms = []; diff --git a/js/phpvirtualbox.js b/js/phpvirtualbox.js index f6f818a..19fd02e 100644 --- a/js/phpvirtualbox.js +++ b/js/phpvirtualbox.js @@ -1,7 +1,6 @@ /** * @fileOverview Common classes and objects used * @author Ian Moore (imoore76 at yahoo dot com) - * @version $Id: phpvirtualbox.js 599 2015-07-27 10:40:37Z imoore76 $ * @copyright Copyright (C) 2010-2015 Ian Moore (imoore76 at yahoo dot com) */ @@ -166,7 +165,9 @@ var vboxHostDetailsSections = { var netRows = []; - d['networkInterfaces'].sort(strnatcasecmp); + d['networkInterfaces'].sort(function(a,b){ + return strnatcasecmp(a.name, b.name); + }); for(var i = 0; i < d['networkInterfaces'].length; i++) { @@ -338,7 +339,9 @@ var vboxVMDetailsSections = { if(d['HWVirtExProperties'].Enabled) acList[acList.length] = trans('VT-x/AMD-V'); if(d['HWVirtExProperties'].NestedPaging) acList[acList.length] = trans('Nested Paging'); if(d['CpuProperties']['PAE']) acList[acList.length] = trans('PAE/NX'); - + if(d['EffectiveParavirtProvider'] != 'None') + acList[acList.length] = trans(d['EffectiveParavirtProvider'] + ' Paravirtualization'); + if($('#vboxPane').data('vboxConfig').enableAdvancedConfig) { if(d['HWVirtExProperties'].LargePages) acList[acList.length] = trans('Large Pages'); if(d['HWVirtExProperties'].UnrestrictedExecution) acList[acList.length] = trans('VT-x unrestricted execution'); @@ -3139,8 +3142,8 @@ function vboxWizard() { function vboxToolbar(options) { var self = this; - this.buttons = options.buttons ? options.buttons : []; - this.size = options.size ? options.size : 22; + this.buttons = options.buttons || []; + this.size = options.size || 22; this.addHeight = 24; this.lastItem = null; this.buttonStyle = options.buttonStyle; @@ -3394,10 +3397,11 @@ function vboxToolbar(options) { */ function vboxToolbarSingle(options) { + var self = this; this.parentClass = vboxToolbarSmall; - options.buttons = [options.button] - renderTo = options.renderTo - options.renderTo = undefined + options.buttons = [options.button]; + renderTo = options.renderTo; + options.renderTo = undefined; this.parentClass(options); this._buttonElement = this.buttonElement; /* copy orig */ @@ -3743,7 +3747,7 @@ function vboxButtonMediaMenu(type,callback,mediumPath) { * @return {Object} jQuery object containing button element */ this.getButtonElm = function () { - return this._buttonElement; + return self._buttonElement; }; /** |