Fix embedded features and icon badging in Firefox

chrispederick · chrispederick · commit 5684a4d539a8 · 2024-06-19T10:25:31.000-07:00
diff --git a/chrome/config/config.properties b/chrome/config/config.properties
@@ -1 +1 @@
-version=3.0
+version=3.0.1
diff --git a/common/js/common/storage.js b/common/js/common/storage.js
@@ -180,13 +180,12 @@ WebDeveloper.Storage.toggleFeatureOnTab = function(feature, tab, callback)
       newFeaturesOnTab = feature;
     }
 
-    WebDeveloper.Storage.setItem(featureTabId, newFeaturesOnTab, callback);
-    WebDeveloper.Storage.updateBadgeText(featureTabId);
+    WebDeveloper.Storage.setItem(featureTabId, newFeaturesOnTab, function() { WebDeveloper.Storage.updateBadgeText(featureTabId, callback); });
   });
 };
 
 // Updates the badge text for a tab
-WebDeveloper.Storage.updateBadgeText = function(featureTabId)
+WebDeveloper.Storage.updateBadgeText = function(featureTabId, callback)
 {
   var badgeText    = "";
   var badgeTooltip = "@name@";
@@ -211,6 +210,12 @@ WebDeveloper.Storage.updateBadgeText = function(featureTabId)
 
     chrome.action.setBadgeText({ text: badgeText, tabId: featureTabId });
     chrome.action.setTitle({ title: badgeTooltip, tabId: featureTabId });
+
+    // If a callback is set
+    if(callback)
+    {
+      callback();
+    }
   });
 };
 
diff --git a/common/js/embedded/dashboard/element-information.js b/common/js/embedded/dashboard/element-information.js
@@ -954,3 +954,6 @@ WebDeveloper.ElementInformation.selectParentElement = function(eventTarget)
     }
   }
 };
+
+// Fixes a non-structured-clonable data error in Firefox
+""; // eslint-disable-line no-unused-expressions
diff --git a/common/js/embedded/toolbar/color-picker.js b/common/js/embedded/toolbar/color-picker.js
@@ -233,3 +233,6 @@ WebDeveloper.ColorPicker.setColor = function(color, type)
 
   WebDeveloper.ColorPicker.toolbarDocument.getElementById("web-developer-color-picker-" + type + "-hex").textContent = color;
 };
+
+// Fixes a non-structured-clonable data error in Firefox
+""; // eslint-disable-line no-unused-expressions
diff --git a/common/js/embedded/toolbar/line-guides.js b/common/js/embedded/toolbar/line-guides.js
@@ -487,3 +487,6 @@ WebDeveloper.LineGuides.updateLineGuideInformation = function(lineGuide)
     WebDeveloper.LineGuides.updateInformation(position, previousPosition, nextPosition);
   }
 };
+
+// Fixes a non-structured-clonable data error in Firefox
+""; // eslint-disable-line no-unused-expressions
diff --git a/common/js/embedded/toolbar/ruler.js b/common/js/embedded/toolbar/ruler.js
@@ -561,3 +561,6 @@ WebDeveloper.Ruler.updateWidth = function()
     WebDeveloper.Ruler.updateInformation();
   }
 };
+
+// Fixes a non-structured-clonable data error in Firefox
+""; // eslint-disable-line no-unused-expressions
diff --git a/edge/config/config.properties b/edge/config/config.properties
@@ -1 +1 @@
-version=3.0
+version=3.0.1
diff --git a/firefox/config/config.properties b/firefox/config/config.properties
@@ -1 +1 @@
-version=3.0
+version=3.0.1
diff --git a/opera/config/config.properties b/opera/config/config.properties
@@ -1 +1 @@
-version=3.0
+version=3.0.1

Original file line number	Diff line number	Diff line change
`@@ -954,3 +954,6 @@ WebDeveloper.ElementInformation.selectParentElement = function(eventTarget)`
`954`	`954`	`}`
`955`	`955`	`}`
`956`	`956`	`};`
	`957`	`+`
	`958`	`+// Fixes a non-structured-clonable data error in Firefox`
	`959`	`+""; // eslint-disable-line no-unused-expressions`
Original file line number	Diff line number	Diff line change
`@@ -487,3 +487,6 @@ WebDeveloper.LineGuides.updateLineGuideInformation = function(lineGuide)`
`487`	`487`	`WebDeveloper.LineGuides.updateInformation(position, previousPosition, nextPosition);`
`488`	`488`	`}`
`489`	`489`	`};`
	`490`	`+`
	`491`	`+// Fixes a non-structured-clonable data error in Firefox`
	`492`	`+""; // eslint-disable-line no-unused-expressions`
Original file line number	Diff line number	Diff line change
`@@ -561,3 +561,6 @@ WebDeveloper.Ruler.updateWidth = function()`
`561`	`561`	`WebDeveloper.Ruler.updateInformation();`
`562`	`562`	`}`
`563`	`563`	`};`
	`564`	`+`
	`565`	`+// Fixes a non-structured-clonable data error in Firefox`
	`566`	`+""; // eslint-disable-line no-unused-expressions`