Skip to content

Commit aac4993

Browse files
author
dnolen
committed
style, js/goog -> goog/
1 parent 3706313 commit aac4993

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/main/cljs/cljs/core.cljs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
([array idx]
454454
(when-assert
455455
(try
456-
(assert (or (array? array) (js/goog.isArrayLike array)))
456+
(assert (or (array? array) (goog/isArrayLike array)))
457457
(assert (number? idx))
458458
(assert (not (neg? idx)))
459459
(assert (< idx (alength array)))
@@ -467,7 +467,7 @@
467467
([array idx val]
468468
(when-assert
469469
(try
470-
(assert (or (array? array) (js/goog.isArrayLike array)))
470+
(assert (or (array? array) (goog/isArrayLike array)))
471471
(assert (number? idx))
472472
(assert (not (neg? idx)))
473473
(assert (< idx (alength array)))
@@ -479,15 +479,15 @@
479479

480480
(defn- checked-aget'
481481
([array idx]
482-
{:pre [(or (array? array) (js/goog.isArrayLike array))
482+
{:pre [(or (array? array) (goog/isArrayLike array))
483483
(number? idx) (not (neg? idx)) (< idx (alength array))]}
484484
(unchecked-get array idx))
485485
([array idx & idxs]
486486
(apply checked-aget' (checked-aget' array idx) idxs)))
487487

488488
(defn- checked-aset'
489489
([array idx val]
490-
{:pre [(or (array? array) (js/goog.isArrayLike array))
490+
{:pre [(or (array? array) (goog/isArrayLike array))
491491
(number? idx) (not (neg? idx)) (< idx (alength array))]}
492492
(unchecked-set array idx val))
493493
([array idx idx2 & idxv]

src/main/cljs/cljs/nodejscli.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
(:require [cljs.nodejs :as nodejs]
1414
[goog.object :as gobj]))
1515

16-
;; need to set js/goog.global if COMPILED
16+
;; need to set goog.global if COMPILED
1717
(when ^boolean js/COMPILED
18-
(set! js/goog.global js/global))
18+
(set! goog/global js/global))
1919

2020
;; Call the user's main function
2121
(when (fn? cljs.core/*main-cli-fn*)

src/main/clojure/cljs/core.cljc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2961,7 +2961,7 @@
29612961

29622962
;; INTERNAL - do not use, only for Node.js
29632963
(core/defmacro load-file* [f]
2964-
`(. js/goog (~'nodeGlobalRequire ~f)))
2964+
`(goog/nodeGlobalRequire ~f))
29652965

29662966
(core/defmacro macroexpand-1
29672967
"If form represents a macro form, returns its expansion,

0 commit comments

Comments
 (0)