Skip to content

Commit a6ededc

Browse files
committed
Revert CLJS-2269
1 parent 6b602b7 commit a6ededc

File tree

2 files changed

+3
-38
lines changed

2 files changed

+3
-38
lines changed

src/main/cljs/cljs/loader.clj

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/main/cljs/cljs/loader.cljs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
; You must not remove this notice, or any other, from this software
88

99
(ns cljs.loader
10-
(:require-macros cljs.loader)
1110
(:require [goog.object :as gobj])
1211
(:import [goog.module ModuleLoader]
1312
[goog.module ModuleManager]))
@@ -53,19 +52,14 @@
5352
(when (some? module)
5453
(.isLoaded module))))
5554

56-
(defn load*
55+
(defn load
5756
"Load a module. module-name should be a keyword matching a :modules module
5857
definition."
5958
([module-name]
60-
(throw (js/Error. "Invalid load call, must provide loader argument")))
61-
([module-name loader]
62-
(load* module-name loader nil))
63-
([module-name loader cb]
59+
(load module-name nil))
60+
([module-name cb]
6461
(assert (contains? module-infos module-name)
6562
(str "Module " module-name " does not exist"))
66-
(assert (loaded? loader)
67-
(str "Module " loader " not fully loaded, but attempted to "
68-
"load module " module-name))
6963
(let [mname (-> module-name name munge)]
7064
(if-not (nil? cb)
7165
(.execOnLoad *module-manager* mname cb)

0 commit comments

Comments
 (0)