diff options
author | Rasmus Andersson <rasmus@figma.com> | 2019-02-04 06:13:58 +0300 |
---|---|---|
committer | Rasmus Andersson <rasmus@figma.com> | 2019-02-04 06:13:58 +0300 |
commit | bc88ea81bed4adfb7dfa554013ced94c45638b99 (patch) | |
tree | dd89e6a10d549b6152370dd970d2596b4db27982 /docs/res | |
parent | f9f044531f88858e5849c176b60d09a4e4b0971a (diff) | |
download | inter-bc88ea81bed4adfb7dfa554013ced94c45638b99.tar.xz |
website: fix bug in ctxedit where default explicit tracking was ignored
Diffstat (limited to 'docs/res')
-rw-r--r-- | docs/res/ctxedit.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/docs/res/ctxedit.js b/docs/res/ctxedit.js index 2b75d5382..1ab896b08 100644 --- a/docs/res/ctxedit.js +++ b/docs/res/ctxedit.js @@ -45,6 +45,7 @@ class FloatProp { } class FontStyleProp { + valueInStyle(s) { let italic = s['font-style'] == 'italic' || s['font-style'].indexOf('oblique') != -1 let weight = parseFloat(s['font-weight']) @@ -146,9 +147,9 @@ class Editable { this.el = el this.key = key this.defaultValues = valuesFromStyle(getComputedStyle(this.el)) - // console.log('default values:', this.defaultValues) this.values = Object.assign({}, this.defaultValues) - this.explicitTracking = false + this.defaultExplicitTracking = this.defaultValues['tracking'] != 0 + this.explicitTracking = this.defaultExplicitTracking this.explicitTrackingKey = this.key + ":etracking" this.loadValues() this.updateSizeDependantProps() @@ -162,7 +163,7 @@ class Editable { } rmLocalObject(this.key) rmLocalObject(this.explicitTrackingKey) - this.explicitTracking = false + this.explicitTracking = this.defaultExplicitTracking this.updateSizeDependantProps() } @@ -216,10 +217,7 @@ class Editable { // console.log(`loaded values for ${this}:`, values) } let etr = getLocalObject(this.explicitTrackingKey) - this.explicitTracking = false - if (etr) { - this.explicitTracking = true - } + this.explicitTracking = this.defaultExplicitTracking || etr } isDefaultValues() { |