mirror of
https://github.com/penpot/penpot.git
synced 2025-05-12 18:06:38 +02:00
⬆️ Upgrade to beicon2 (part1)
This commit is contained in:
parent
ecee15af5b
commit
96f5a33f5f
151 changed files with 482 additions and 433 deletions
|
@ -18,7 +18,7 @@
|
|||
[app.config :as cf]
|
||||
[app.util.dom :as dom]
|
||||
[app.util.http :as http]
|
||||
[beicon.core :as rx]
|
||||
[beicon.v2.core :as rx]
|
||||
[cuerdas.core :as str]))
|
||||
|
||||
(defonce ready? false)
|
||||
|
@ -123,18 +123,18 @@
|
|||
(log/err :hint "rasterizer iframe blocked by adblocker" :origin origin :cause cause)
|
||||
(rx/of false)))
|
||||
|
||||
(rx/subs (fn [allowed?]
|
||||
(if allowed?
|
||||
(do
|
||||
(dom/append-child! js/document.body iframe)
|
||||
(set! instance iframe))
|
||||
(rx/subs! (fn [allowed?]
|
||||
(if allowed?
|
||||
(do
|
||||
(dom/append-child! js/document.body iframe)
|
||||
(set! instance iframe))
|
||||
|
||||
(let [new-origin (dm/str (assoc cf/public-uri :path "/rasterizer.html"))]
|
||||
(log/warn :hint "fallback to main domain" :origin new-origin)
|
||||
(let [new-origin (dm/str (assoc cf/public-uri :path "/rasterizer.html"))]
|
||||
(log/warn :hint "fallback to main domain" :origin new-origin)
|
||||
|
||||
(dom/set-attribute! iframe "src" new-origin)
|
||||
(dom/append-child! js/document.body iframe)
|
||||
(dom/set-attribute! iframe "src" new-origin)
|
||||
(dom/append-child! js/document.body iframe)
|
||||
|
||||
(set! origin new-origin)
|
||||
(set! cf/rasterizer-uri cf/public-uri)
|
||||
(set! instance iframe))))))))
|
||||
(set! origin new-origin)
|
||||
(set! cf/rasterizer-uri cf/public-uri)
|
||||
(set! instance iframe))))))))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue