Skip to content

Commit f4f8662

Browse files
committed
Merge remote-tracking branch 'stash/main'
2 parents 9e46ebd + b9d0b39 commit f4f8662

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Source/Chatbook/Common.wl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,6 +1224,7 @@ chatbookIcon[ name_String ] := chatbookIcon[ name, TrueQ @ $inlineChatbookExpres
12241224
chatbookIcon[ name_String, True ] := chatbookIcon[ name, Lookup[ $chatbookIcons, name ] ];
12251225
chatbookIcon[ name_String, False ] := Dynamic @ RawBoxes @ FEPrivate`FrontEndResource[ "ChatbookExpressions", name ];
12261226
chatbookIcon[ name_String, False, args__ ] := Dynamic @ RawBoxes @ FEPrivate`FrontEndResource[ "ChatbookExpressions", name ][ args ]; (* Function resources *)
1227+
chatbookIcon[ name_String, False, args__ ] /; $CloudEvaluation := RawBoxes @ FrontEndResource[ "ChatbookExpressions", name ][ args ]; (* CLOUD-25597 *)
12271228
chatbookIcon[ name_String, icon: Except[ _Missing ] ] := icon;
12281229
chatbookIcon // endDefinition;
12291230

Source/Chatbook/FrontEnd.wl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,6 +1253,7 @@ $statelessProgressIndicator =
12531253
mouseDown // beginDefinition;
12541254
(* Workaround for dynamics freezing in attached cells when mousing over docked cell: *)
12551255
mouseDown[ a_, b_, c_ ] /; $OperatingSystem === "Windows" := Mouseover[ a, b ];
1256+
mouseDown[ a_, b_, c_ ] /; $CloudEvaluation := Mouseover[ a, b ];
12561257
mouseDown[ a_, b_, c_ ] := NotebookTools`Mousedown[ a, b, c ];
12571258
mouseDown // endDefinition;
12581259

Source/Chatbook/UI.wl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,12 @@ Options[ errorMessageCloseButton ] = { Appearance -> "NonFatal" };
606606
errorMessageCloseButton[ OptionsPattern[ ] ] :=
607607
Button[
608608
errorMessageCloseButtonAppearance[ OptionValue[ Appearance ] ],
609-
NotebookDelete[ EvaluationCell[ ] ],
609+
(* Cloud-25777:
610+
We need to coerce the cloud to send the evaluation through the kernel instead of the JS evaluator.
611+
We accomplish this with a hack: include an unknown symbol with no side effects. *)
612+
(
613+
CloudSystem`Private`NoValue`Cloud25777;
614+
NotebookDelete[ EvaluationCell[ ] ] ),
610615
Appearance -> "Suppressed",
611616
BaselinePosition -> Baseline,
612617
ImageSize -> Automatic

0 commit comments

Comments
 (0)