mirror of
https://github.com/penpot/penpot.git
synced 2025-07-16 18:55:15 +02:00
✨ Change behavior of single set json file import to be coherent (#6211)
This commit is contained in:
parent
ea031a2161
commit
5d600c6715
1 changed files with 2 additions and 3 deletions
|
@ -6,7 +6,6 @@
|
||||||
[app.common.schema :as sm]
|
[app.common.schema :as sm]
|
||||||
[app.common.transit :as t]
|
[app.common.transit :as t]
|
||||||
[app.common.types.tokens-lib :as ctob]
|
[app.common.types.tokens-lib :as ctob]
|
||||||
[app.main.refs :as refs]
|
|
||||||
[app.main.ui.workspace.tokens.errors :as wte]
|
[app.main.ui.workspace.tokens.errors :as wte]
|
||||||
[app.main.ui.workspace.tokens.tinycolor :as tinycolor]
|
[app.main.ui.workspace.tokens.tinycolor :as tinycolor]
|
||||||
[app.main.ui.workspace.tokens.token :as wtt]
|
[app.main.ui.workspace.tokens.token :as wtt]
|
||||||
|
@ -268,11 +267,11 @@
|
||||||
(cond
|
(cond
|
||||||
(and single-set?
|
(and single-set?
|
||||||
(= :json-format/legacy json-format))
|
(= :json-format/legacy json-format))
|
||||||
(ctob/decode-single-set-legacy-json (ctob/ensure-tokens-lib (deref refs/tokens-lib)) file-name json-data)
|
(ctob/decode-single-set-legacy-json (ctob/ensure-tokens-lib nil) file-name json-data)
|
||||||
|
|
||||||
(and single-set?
|
(and single-set?
|
||||||
(= :json-format/dtcg json-format))
|
(= :json-format/dtcg json-format))
|
||||||
(ctob/decode-single-set-json (ctob/ensure-tokens-lib (deref refs/tokens-lib)) file-name json-data)
|
(ctob/decode-single-set-json (ctob/ensure-tokens-lib nil) file-name json-data)
|
||||||
|
|
||||||
(= :json-format/legacy json-format)
|
(= :json-format/legacy json-format)
|
||||||
(ctob/decode-legacy-json (ctob/ensure-tokens-lib nil) json-data)
|
(ctob/decode-legacy-json (ctob/ensure-tokens-lib nil) json-data)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue