👾 [BUG]: Fixed an issue that would fail when registering JavaScriptOb…

…ject.
XuanchenLin · May 26, 2024 · 22f53fa · 22f53fa
1 parent 22a68fc
commit 22f53fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/WinFormium/Sources/Formium/Formium.IRenderHandler.cs b/src/WinFormium/Sources/Formium/Formium.IRenderHandler.cs
@@ -243,9 +243,12 @@ private void StartDragging(CefDragData dragData, CefDragOperationsMask allowedOp
 
         var dataObj = new DataObject();
 
-        dataObj.SetText(dragData.FragmentText ?? "", TextDataFormat.Text);
-        dataObj.SetText(dragData.FragmentText ?? "", TextDataFormat.UnicodeText);
-        dataObj.SetText(dragData.FragmentHtml ?? "", TextDataFormat.Html);
+
+        if(!string.IsNullOrEmpty(dragData.FragmentText))
+            dataObj.SetText(dragData.FragmentText, TextDataFormat.Text);
+        else if(!string.IsNullOrEmpty(dragData.FragmentHtml))
+            dataObj.SetText(dragData.FragmentHtml, TextDataFormat.Html);
+
 
         var result = HostWindow.DoDragDrop(dataObj, GetDragDropEffects(allowedOps));
 

diff --git a/src/WinFormium/Sources/JavaScript/ObjectMapping/JavaScriptObjectMappingBridge.cs b/src/WinFormium/Sources/JavaScript/ObjectMapping/JavaScriptObjectMappingBridge.cs
@@ -76,6 +76,11 @@ public bool RegisterJavaScriptObject(JavaScriptObjectRegisterHandle handle, stri
             return false;
         }
 
+        if(Objects.Keys.Any(x=>x.frame.Identifier == frame.Identifier && x.name == name))
+        {
+            return false;
+        }
+
         jsObject.AssociateToFrame(frame);
 
         Objects.Add((frame, name), jsObject);