Skip to content

Commit 22ba5a6

Browse files
author
dnolen
committed
CLJS-1285: load-file regression
refactor aset -> goog.object/set also attempt to just remove the source path without prepending goog.basePath
1 parent f165420 commit 22ba5a6

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
:author "Bobby Calderwood and Alex Redington"}
1717
clojure.browser.repl
1818
(:require [goog.dom :as gdom]
19+
[goog.object :as gobj]
1920
[goog.userAgent.product :as product]
2021
[clojure.browser.net :as net]
2122
[clojure.browser.event :as event]
@@ -134,11 +135,11 @@
134135
(.appendChild js/document.body
135136
(as-> (.createElement js/document "script") script
136137
(doto script
137-
(aset "type" "text/javascript")
138-
(aset "onload" onload)
139-
(aset "onreadystatechange" onload)) ;; IE
138+
(gobj/set "type" "text/javascript")
139+
(gobj/set "onload" onload)
140+
(gobj/set "onreadystatechange" onload)) ;; IE
140141
(if (nil? opt_sourceText)
141-
(doto script (aset "src" src))
142+
(doto script (gobj/set "src" src))
142143
(doto script (gdom/setTextContext opt_sourceText))))))))
143144
;; queue or load
144145
(set! (.-writeScriptTag_ js/goog)
@@ -157,8 +158,9 @@
157158
(let [reload? (or reload (.-cljsReloadAll__ js/goog))]
158159
(when reload?
159160
(let [path (aget js/goog.dependencies_.nameToPath src)]
160-
(js-delete js/goog.dependencies_.visited path)
161-
(js-delete js/goog.dependencies_.written
161+
(gobj/remove js/goog.dependencies_.visited path)
162+
(gobj/remove js/goog.dependencies_.written path)
163+
(gobj/remove js/goog.dependencies_.written
162164
(str js/goog.basePath path))))
163165
(let [ret (.require__ js/goog src)]
164166
(when (= reload "reload-all")

0 commit comments

Comments
 (0)