Merge remote-tracking branch 'limetech/master'

plugins/dynamix.docker.manager/include/CreateDocker.php

@@ -256,7 +256,7 @@ function xmlToVar($xml) {
         if ($key == 'Mode') {
           switch (xml_decode($config['Type'])) {
             case 'Path':
-              $value = (strtolower($value) == 'rw' || strtolower($value) == 'rw,slave' || strtolower($value) == 'ro') ? $value : "rw";
+              $value = (strtolower($value) == 'rw' || strtolower($value) == 'rw,slave' || strtolower($value) == 'ro' || strtolower($value) == 'ro,slave') ? $value : "rw";
               break;
             case 'Port':
               $value = (strtolower($value) == 'tcp' || strtolower($value) == 'udp' ) ? $value : "tcp";
@@ -932,7 +932,7 @@ $showAdditionalInfo = '';
               $("#configLocationAdvanced").append(newConf);
             } else {
               $("#configLocation").append(newConf);
-            }            
+            }
           }
           reloadTriggers();
         },
@@ -977,7 +977,7 @@ $showAdditionalInfo = '';
     var index = $(el)[0].selectedIndex;
     if (index == 0) {
       // Path
-      mode.html("<dt>Mode</dt><dd><select name='Mode'><option value='rw'>Read/Write</option><option value='rw,slave'>RW/Slave</option></option><option value='ro'>Read Only</option></select></dd>");
+      mode.html("<dt>Mode</dt><dd><select name='Mode'><option value='rw'>Read/Write</option><option value='rw,slave'>RW/Slave</option><option value='ro'>Read Only</option><option value='ro,slave'>RO/Slave</option></select></dd>");
       value.bind("click", function(){openFileBrowser(this,$(this).val(), 'sh', true, false);});
     } else if (index == 1) {
       // Port
@@ -1518,7 +1518,7 @@ $showAdditionalInfo = '';
 
     // Add dropdownchecklist to Select Categories
     $("#catSelect").dropdownchecklist({emptyText:'Select categories...', maxDropHeight:200, width:300, explicitClose:'...close'});
-    
+
     <?if ($authoringMode){
       echo "$('.advanced-switch').prop('checked','true'); $('.advanced-switch').change();";
       echo "$('.advanced-switch').siblings('.switch-button-background').click();";

plugins/dynamix.vm.manager/classes/libvirt_helpers.php

@@ -772,6 +772,7 @@
 			'fr-ca' => 'French-Canadian (fr-ca)',
 			'fr-ch' => 'French-Switzerland (fr-ch)',
 			'de-ch' => 'German-Switzerland (de-ch)',
+			'de' => 'German (de)',
 			'hu' => 'Hungarian (hu)',
 			'is' => 'Icelandic (is)',
 			'it' => 'Italian (it)',

plugins/dynamix.vm.manager/include/display.js

@@ -471,9 +471,14 @@ var Display;
 
         blitImage: function (x, y, width, height, arr, offset, from_queue) {
             if (this._renderQ.length !== 0 && !from_queue) {
+                // NB(directxman12): it's technically more performant here to use preallocated arrays,
+                // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
+                // this probably isn't getting called *nearly* as much
+                var new_arr = new Uint8Array(width * height * 4);
+                new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length));
                 this.renderQ_push({
                     'type': 'blit',
-                    'data': arr,
+                    'data': new_arr,
                     'x': x,
                     'y': y,
                     'width': width,
@@ -486,11 +491,16 @@ var Display;
             }
         },
 
-        blitRgbImage: function (x, y , width, height, arr, offset, from_queue) {
+        blitRgbImage: function (x, y, width, height, arr, offset, from_queue) {
             if (this._renderQ.length !== 0 && !from_queue) {
+                // NB(directxman12): it's technically more performant here to use preallocated arrays,
+                // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
+                // this probably isn't getting called *nearly* as much
+                var new_arr = new Uint8Array(width * height * 4);
+                new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length));
                 this.renderQ_push({
                     'type': 'blitRgb',
-                    'data': arr,
+                    'data': new_arr,
                     'x': x,
                     'y': y,
                     'width': width,
@@ -506,7 +516,7 @@ var Display;
 
         blitRgbxImage: function (x, y, width, height, arr, offset, from_queue) {
             if (this._renderQ.length !== 0 && !from_queue) {
-                // NB(directxman12): it's technically more performant here to use preallocated arrays, but it
+                // NB(directxman12): it's technically more performant here to use preallocated arrays,
                 // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
                 // this probably isn't getting called *nearly* as much
                 var new_arr = new Uint8Array(width * height * 4);