forked from cybrespace/pinafore
fix animations and cleanup store/component get() usage (#185)
fixes #181
This commit is contained in:
parent
bfc3c46462
commit
77ba91c712
|
@ -107,7 +107,7 @@
|
|||
export default {
|
||||
oncreate () {
|
||||
this.observe('animation', animation => {
|
||||
let reduceMotion = this.store.get()
|
||||
let { reduceMotion } = this.store.get()
|
||||
if (!animation || reduceMotion) {
|
||||
return
|
||||
}
|
||||
|
|
|
@ -40,7 +40,7 @@ export class LocalStorageStore extends Store {
|
|||
return
|
||||
}
|
||||
Object.keys(this._keysToSave).forEach(key => {
|
||||
LS.setItem(`store_${key}`, JSON.stringify(this.get(key)))
|
||||
LS.setItem(`store_${key}`, JSON.stringify(this.get()[key]))
|
||||
})
|
||||
this._keysToSave = {}
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@ export function timelineMixins (Store) {
|
|||
let valuesToSet = {}
|
||||
for (let key of Object.keys(obj)) {
|
||||
let rootKey = `timelineData_${key}`
|
||||
let root = this.get(rootKey) || {}
|
||||
let root = this.get()[rootKey] || {}
|
||||
let instanceData = root[instanceName] = root[instanceName] || {}
|
||||
instanceData[timelineName] = obj[key]
|
||||
valuesToSet[rootKey] = root
|
||||
|
@ -16,7 +16,7 @@ export function timelineMixins (Store) {
|
|||
|
||||
Store.prototype.getForTimeline = function (instanceName, timelineName, key) {
|
||||
let rootKey = `timelineData_${key}`
|
||||
let root = this.get(rootKey)
|
||||
let root = this.get()[rootKey]
|
||||
return root && root[instanceName] && root[instanceName][timelineName]
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@ export function timelineMixins (Store) {
|
|||
}
|
||||
|
||||
Store.prototype.getAllTimelineData = function (instanceName, key) {
|
||||
let root = this.get(`timelineData_${key}`) || {}
|
||||
let root = this.get()[`timelineData_${key}`] || {}
|
||||
return root[instanceName] || {}
|
||||
}
|
||||
|
||||
|
|
|
@ -17,8 +17,7 @@ export class RealmStore extends Store {
|
|||
}
|
||||
|
||||
setForRealm (obj) {
|
||||
let { currentRealm } = this.get()
|
||||
let { realms } = this.get()
|
||||
let { currentRealm, realms } = this.get()
|
||||
realms.set(currentRealm, Object.assign(realms.get(currentRealm) || {}, obj))
|
||||
this.set({realms: realms})
|
||||
}
|
||||
|
@ -58,7 +57,7 @@ export class RealmStore extends Store {
|
|||
return
|
||||
}
|
||||
mark('batchUpdate')
|
||||
let obj = this.get(key)
|
||||
let obj = this.get()[key]
|
||||
for (let otherKey of updatedKeys) {
|
||||
obj[otherKey] = batch[otherKey]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue