forked from cybrespace/pinafore
		
	Revert "add observeSafely()"
it doesn't actually work
This reverts commit 321a90251a.
			
			
This commit is contained in:
		
							parent
							
								
									8dcf72d144
								
							
						
					
					
						commit
						c3a82a15bf
					
				
					 1 changed files with 4 additions and 17 deletions
				
			
		| 
						 | 
				
			
			@ -32,10 +32,10 @@
 | 
			
		|||
 | 
			
		||||
  export default {
 | 
			
		||||
    oncreate () {
 | 
			
		||||
      this.observeSafely('showFooter', showFooter => {
 | 
			
		||||
      this.observe('showFooter', showFooter => {
 | 
			
		||||
        this.store.setForRealm({showFooter: showFooter})
 | 
			
		||||
      })
 | 
			
		||||
      this.observeSafely('items', (items) => {
 | 
			
		||||
      this.observe('items', (items) => {
 | 
			
		||||
        mark('set items')
 | 
			
		||||
        this.store.setForRealm({items: items})
 | 
			
		||||
        stop('set items')
 | 
			
		||||
| 
						 | 
				
			
			@ -44,7 +44,7 @@
 | 
			
		|||
        }, SCROLL_TO_BOTTOM_DELAY)
 | 
			
		||||
      })
 | 
			
		||||
 | 
			
		||||
      this.observeSafely('allVisibleItemsHaveHeight', allVisibleItemsHaveHeight => {
 | 
			
		||||
      this.observe('allVisibleItemsHaveHeight', allVisibleItemsHaveHeight => {
 | 
			
		||||
        if (allVisibleItemsHaveHeight) {
 | 
			
		||||
          this.fire('initializedVisibleItems')
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			@ -52,7 +52,7 @@
 | 
			
		|||
 | 
			
		||||
      let observedOnce = false
 | 
			
		||||
 | 
			
		||||
      this.observeSafely('distanceFromBottom', (distanceFromBottom) => {
 | 
			
		||||
      this.observe('distanceFromBottom', (distanceFromBottom) => {
 | 
			
		||||
        if (!observedOnce) {
 | 
			
		||||
          observedOnce = true // TODO: the first time is always 0... need better way to handle this
 | 
			
		||||
          return
 | 
			
		||||
| 
						 | 
				
			
			@ -77,19 +77,6 @@
 | 
			
		|||
      },
 | 
			
		||||
      // TODO: bug in svelte store, shouldn't need to do this
 | 
			
		||||
      allVisibleItemsHaveHeight: ($allVisibleItemsHaveHeight) => $allVisibleItemsHaveHeight
 | 
			
		||||
    },
 | 
			
		||||
    ondestroy() {
 | 
			
		||||
      this.__destroyed = true
 | 
			
		||||
    },
 | 
			
		||||
    methods: {
 | 
			
		||||
      observeSafely(val, callback) {
 | 
			
		||||
        // TODO: feels like this shouldn't be necessary... bug in Svelte?
 | 
			
		||||
        this.observe(val, val => {
 | 
			
		||||
          if (!this.__destroyed) {
 | 
			
		||||
            callback(val)
 | 
			
		||||
          }
 | 
			
		||||
        })
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
</script>
 | 
			
		||||
		Loading…
	
	Add table
		
		Reference in a new issue