diff --git a/frontend/src/uxbox/config.cljs b/frontend/src/uxbox/config.cljs index 5df7ff139..3d86b0f81 100644 --- a/frontend/src/uxbox/config.cljs +++ b/frontend/src/uxbox/config.cljs @@ -5,20 +5,16 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2016-2020 Andrey Antukh +;; Copyright (c) 2020 UXBOX Labs SL (ns uxbox.config (:require [uxbox.util.object :as obj])) -(defn- get-current-origin - [] - (let [location (obj/get goog.global "location")] - (obj/get location "origin"))) +(this-as global + (let [config (obj/get global "uxboxConfig") + public-url (obj/get config "publicURL" "http://localhost:6060")] + (def default-language "en") + (def demo-warning (obj/get config "demoWarning" true)) + (def url public-url) + (def default-theme "default"))) -(let [config (obj/get goog.global "uxboxConfig") - public-url (obj/get config "publicURL" "http://localhost:6060")] - - (def default-language "en") - (def demo-warning (obj/get config "demoWarning" true)) - (def url public-url) - (def default-theme "default")) diff --git a/frontend/src/uxbox/main/data/workspace/common.cljs b/frontend/src/uxbox/main/data/workspace/common.cljs index 69bfbd51c..887eec84e 100644 --- a/frontend/src/uxbox/main/data/workspace/common.cljs +++ b/frontend/src/uxbox/main/data/workspace/common.cljs @@ -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 (:require [beicon.core :as rx]