Skip to content

Commit 0f93467

Browse files
committed
pass the name of the current thread to the client
1 parent 7779dc4 commit 0f93467

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

src/main/cljs/clojure/browser/repl.cljs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
(:require [goog.dom :as gdom]
1919
[goog.object :as gobj]
2020
[goog.array :as garray]
21+
[goog.json :as json]
2122
[goog.userAgent.product :as product]
2223
[clojure.browser.net :as net]
2324
[clojure.browser.event :as event]
@@ -228,11 +229,12 @@
228229
(flush-print-queue! repl-connection))))
229230
(net/register-service repl-connection
230231
:evaluate-javascript
231-
(fn [js]
232-
(net/transmit
233-
repl-connection
234-
:send-result
235-
(evaluate-javascript repl-connection js))))
232+
(fn [json]
233+
(let [obj (json/parse json)]
234+
(net/transmit
235+
repl-connection
236+
:send-result
237+
(evaluate-javascript repl-connection (gobj/get obj "form"))))))
236238
(net/connect repl-connection
237239
(constantly nil)
238240
(fn [iframe]

src/main/clojure/cljs/repl/browser.clj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@
7070
(send-for-eval @(server/connection) form return-value-fn))
7171
([conn form return-value-fn]
7272
(set-return-value-fn return-value-fn)
73-
(server/send-and-close conn 200 form "text/javascript")))
73+
(server/send-and-close conn 200
74+
(json/write-str
75+
{"thread" (.getName (Thread/currentThread))
76+
"form" form})
77+
"application/json")))
7478

7579
(defn- return-value
7680
"Called by the server when a return value is received."

0 commit comments

Comments
 (0)