3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-09 11:21:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix config loading.

Browse source
This commit is contained in:
Andrey Antukh 2020-05-05 12:03:34 +02:00
parent e92688f37e
commit bee543da74
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
frontend/src/uxbox/config.cljs
View file

@ -5,20 +5,16 @@
;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; This Source Code Form is "Incompatible With Secondary Licenses", as
;; defined by the Mozilla Public License, v. 2.0. ;; defined by the Mozilla Public License, v. 2.0.
;; ;;
;; Copyright (c) 2016-2020 Andrey Antukh <niwi@niwi.nz> ;; Copyright (c) 2020 UXBOX Labs SL
(ns uxbox.config (ns uxbox.config
(:require [uxbox.util.object :as obj])) (:require [uxbox.util.object :as obj]))
(defn- get-current-origin (this-as global
[] (let [config (obj/get global "uxboxConfig")
(let [location (obj/get goog.global "location")]
(obj/get location "origin")))
(let [config (obj/get goog.global "uxboxConfig")
public-url (obj/get config "publicURL" "http://localhost:6060")] public-url (obj/get config "publicURL" "http://localhost:6060")]
(def default-language "en") (def default-language "en")
(def demo-warning (obj/get config "demoWarning" true)) (def demo-warning (obj/get config "demoWarning" true))
(def url public-url) (def url public-url)
(def default-theme "default")) (def default-theme "default")))

9
frontend/src/uxbox/main/data/workspace/common.cljs
View file

@ -1,3 +1,12 @@
;; This Source Code Form is subject to the terms of the Mozilla Public
;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;;
;; This Source Code Form is "Incompatible With Secondary Licenses", as
;; defined by the Mozilla Public License, v. 2.0.
;;
;; Copyright (c) 2020 UXBOX Labs SL
(ns uxbox.main.data.workspace.common (ns uxbox.main.data.workspace.common
(:require (:require
[beicon.core :as rx] [beicon.core :as rx]