Skip to content

Commit 2cc0eeb

Browse files
Fix linter errors
1 parent 3038187 commit 2cc0eeb

File tree

2 files changed

+55
-42
lines changed

2 files changed

+55
-42
lines changed

Source/dom/layers/__tests__/SymbolMaster.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* globals expect, test */
22
/* eslint-disable no-param-reassign */
3-
import { SymbolMaster, Text, Artboard } from '../..'
3+
import { SymbolInstance, SymbolMaster, Text, Artboard } from '../..'
44
import { createSymbolMaster, canBeLogged } from '../../../test-utils'
55

66
test('should create a symbol master from an artboard', (_context, document) => {
@@ -132,7 +132,7 @@ test('should have overrides', (_context, document) => {
132132
isDefault: true,
133133
editable: true,
134134
affectedLayer: text.toJSON(),
135-
selected: false
135+
selected: false,
136136
}
137137
delete result.affectedLayer.selected
138138
result.affectedLayer.style = master.overrides[0].affectedLayer.style.toJSON()

Source/dom/models/Override.js

Lines changed: 53 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { toArray } from 'util'
21
import { DefinedPropertiesKey, WrappedObject } from '../WrappedObject'
32
import { Types } from '../enums'
43
import { Factory } from '../Factory'
@@ -7,45 +6,55 @@ import { wrapNativeObject } from '../wrapNativeObject'
76
import { Rectangle } from './Rectangle'
87

98
export class Override extends WrappedObject {
10-
// Returns any override directly set on the symbol instance or null if none is set or this is an override point on a symbol source
9+
// Returns any override directly set on the symbol instance or null if none is set or this is an override point on a symbol source
1110
getValueSetOnInstance() {
1211
if (!this.__symbolInstance) {
1312
return null
1413
}
1514
var overrideValues = this.__symbolInstance.sketchObject.overrideValues()
1615
for (var i = 0; i < overrideValues.length; i++) {
17-
if (overrideValues[i].overridePath().isEqual(this._object.overridePath())) {
16+
if (
17+
overrideValues[i].overridePath().isEqual(this._object.overridePath())
18+
) {
1819
return overrideValues[i].value()
1920
}
2021
}
2122
return null
2223
}
23-
24+
2425
// Returns the current value of the override point. This is the value set on the layer in the detached version of the symbol. It may be
2526
// out-of-date if the detached symbol hasn't yet updated.
2627
getResolvedValueOnDetachedSymbol() {
27-
return this.affectedLayer.sketchObject.valueForOverrideAttribute(this.property)
28+
return this.affectedLayer.sketchObject.valueForOverrideAttribute(
29+
this.property
30+
)
2831
}
29-
32+
3033
// Returns the value the override point will have if there is no override set on this instance.
3134
getDefaultValue() {
3235
if (!this.__symbolInstance) {
3336
return this.getResolvedValueOnDetachedSymbol()
3437
}
35-
return this.__symbolInstance.sketchObject.defaultValueForOverridePoint(this._object)
38+
return this.__symbolInstance.sketchObject.defaultValueForOverridePoint(
39+
this._object
40+
)
3641
}
37-
42+
3843
// Returns a SelectionItem representing this override point
3944
selectionItem() {
4045
if (this.__symbolInstance) {
41-
return this.__symbolInstance.sketchObject.selectionItemForOverridePoint(this.sketchObject)
46+
return this.__symbolInstance.sketchObject.selectionItemForOverridePoint(
47+
this.sketchObject
48+
)
4249
}
4350
if (this.__symbolMaster) {
44-
return this.__symbolMaster.sketchObject.selectionItemForOverridePoint(this.sketchObject)
51+
return this.__symbolMaster.sketchObject.selectionItemForOverridePoint(
52+
this.sketchObject
53+
)
4554
}
4655
return null
4756
}
48-
57+
4958
getOwningPage() {
5059
if (this.__symbolInstance) {
5160
return this.__symbolInstance.sketchObject.parentPage()
@@ -55,7 +64,7 @@ export class Override extends WrappedObject {
5564
}
5665
return null
5766
}
58-
67+
5968
getFrame() {
6069
return new Rectangle(this._object.layer().frame().rect())
6170
}
@@ -131,7 +140,7 @@ Override.define('value', {
131140
Override.define('isDefault', {
132141
get() {
133142
return this.getValueSetOnInstance() == null
134-
}
143+
},
135144
})
136145

137146
Override.define('editable', {
@@ -145,11 +154,15 @@ Override.define('editable', {
145154
master = masterGetter()
146155
}
147156
}
148-
157+
149158
if (typeof master == 'undefined') {
150159
throw new Error('Unable to find the symbol source for this override')
151160
}
152-
if (master.allowsOverrides() && master.isOverridePointEditable(this._object) && this._object.isConfigurable()) {
161+
if (
162+
master.allowsOverrides() &&
163+
master.isOverridePointEditable(this._object) &&
164+
this._object.isConfigurable()
165+
) {
153166
return true
154167
} else {
155168
return false
@@ -165,29 +178,29 @@ Override.define('editable', {
165178
editable
166179
)
167180
},
168-
})
169-
170-
Override.define('selected', {
171-
get() {
172-
let item = this.selectionItem()
173-
if (this.getOwningPage().selection().isItemSelected(item)) {
174-
return true
175-
}
176-
return false
177-
},
178-
set(selected) {
179-
let item = this.selectionItem()
180-
if (!item) {
181-
return
182-
}
183-
let page = this.getOwningPage()
184-
if (!page) {
185-
return
186-
}
187-
if (selected) {
188-
page.changeSelectionByAddingItems_extendExisting([item], true)
189-
} else {
190-
page.changeSelectionByRemovingItems([item])
191-
}
181+
})
182+
183+
Override.define('selected', {
184+
get() {
185+
let item = this.selectionItem()
186+
if (this.getOwningPage().selection().isItemSelected(item)) {
187+
return true
188+
}
189+
return false
190+
},
191+
set(selected) {
192+
let item = this.selectionItem()
193+
if (!item) {
194+
return
195+
}
196+
let page = this.getOwningPage()
197+
if (!page) {
198+
return
199+
}
200+
if (selected) {
201+
page.changeSelectionByAddingItems_extendExisting([item], true)
202+
} else {
203+
page.changeSelectionByRemovingItems([item])
204+
}
192205
},
193-
})
206+
})

0 commit comments

Comments
 (0)