Merge branch 'pr/1841' into dev

Author: Lionel Laské

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - CSV View data not updated in chart activity without saving #1809
 - Undo button for Gears activity #838
 - Replace Enyo by vue.js #257
+- UUID v4 generation bug: incorrect bitwise operation forces variant to 8 #1840
 
 ## [1.9.0] - 2025-03-25
 ### Added

activities/3DVolume.activity/lib/sugar-web/datastore/sugarizer.js

@@ -29,7 +29,8 @@ define(["sugar-web/bus", "sugar-web/env"], function(bus, env) {
 			s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
 		}
 		s[14] = "4";
-		s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+		var pos19 = parseInt(s[19], 16);
+		s[19] = hexDigits.substr((pos19 & 0x3) | 0x8, 1);
 		s[8] = s[13] = s[18] = s[23] = "-";
 
 		var uuid = s.join("");

activities/Abacus.activity/lib/sugar-web/datastore/sugarizer.js

@@ -29,7 +29,8 @@ define(["sugar-web/bus", "sugar-web/env"], function(bus, env) {
 			s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
 		}
 		s[14] = "4";
-		s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+		var pos19 = parseInt(s[19], 16);
+		s[19] = hexDigits.substr((pos19 & 0x3) | 0x8, 1);
 		s[8] = s[13] = s[18] = s[23] = "-";
 
 		var uuid = s.join("");

activities/Abecedarium.activity/lib/sugar-web/datastore/sugarizer.js

@@ -29,7 +29,8 @@ define(["sugar-web/bus", "sugar-web/env"], function(bus, env) {
 			s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
 		}
 		s[14] = "4";
-		s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+		var pos19 = parseInt(s[19], 16);
+		s[19] = hexDigits.substr((pos19 & 0x3) | 0x8, 1);
 		s[8] = s[13] = s[18] = s[23] = "-";
 
 		var uuid = s.join("");

activities/ActivityTemplate/VanillaJS/lib/sugar-web/datastore/sugarizer.js

@@ -29,7 +29,8 @@ define(["sugar-web/bus", "sugar-web/env"], function(bus, env) {
 			s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
 		}
 		s[14] = "4";
-		s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+		var pos19 = parseInt(s[19], 16);
+		s[19] = hexDigits.substr((pos19 & 0x3) | 0x8, 1);
 		s[8] = s[13] = s[18] = s[23] = "-";
 
 		var uuid = s.join("");

activities/ActivityTemplate/VueJS/lib/sugar-web/datastore/sugarizer.js

@@ -29,7 +29,8 @@ define(["sugar-web/bus", "sugar-web/env"], function(bus, env) {
 			s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
 		}
 		s[14] = "4";
-		s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+		var pos19 = parseInt(s[19], 16);
+		s[19] = hexDigits.substr((pos19 & 0x3) | 0x8, 1);
 		s[8] = s[13] = s[18] = s[23] = "-";
 
 		var uuid = s.join("");

activities/Blockrain.activity/lib/sugar-web/datastore/sugarizer.js

@@ -29,7 +29,8 @@ define(["sugar-web/bus", "sugar-web/env"], function(bus, env) {
 			s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
 		}
 		s[14] = "4";
-		s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+		var pos19 = parseInt(s[19], 16);
+		s[19] = hexDigits.substr((pos19 & 0x3) | 0x8, 1);
 		s[8] = s[13] = s[18] = s[23] = "-";
 
 		var uuid = s.join("");

activities/Calculate.activity/lib/sugar-web/datastore/sugarizer.js

@@ -29,7 +29,8 @@ define(["sugar-web/bus", "sugar-web/env"], function(bus, env) {
 			s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
 		}
 		s[14] = "4";
-		s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+		var pos19 = parseInt(s[19], 16);
+		s[19] = hexDigits.substr((pos19 & 0x3) | 0x8, 1);
 		s[8] = s[13] = s[18] = s[23] = "-";
 
 		var uuid = s.join("");

activities/Calligra.activity/lib/sugar-web/datastore/sugarizer.js

@@ -29,7 +29,8 @@ define(["sugar-web/bus", "sugar-web/env"], function(bus, env) {
 			s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
 		}
 		s[14] = "4";
-		s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+		var pos19 = parseInt(s[19], 16);
+		s[19] = hexDigits.substr((pos19 & 0x3) | 0x8, 1);
 		s[8] = s[13] = s[18] = s[23] = "-";
 
 		var uuid = s.join("");

activities/Chart.activity/lib/sugar-web/datastore/sugarizer.js

@@ -29,7 +29,8 @@ define(["sugar-web/bus", "sugar-web/env"], function(bus, env) {
 			s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
 		}
 		s[14] = "4";
-		s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+		var pos19 = parseInt(s[19], 16);
+		s[19] = hexDigits.substr((pos19 & 0x3) | 0x8, 1);
 		s[8] = s[13] = s[18] = s[23] = "-";
 
 		var uuid = s.join("");