unpoly-rails 0.37.0 → 0.50.0

data/spec_app/spec/javascripts/up/layout_spec.js.coffee

@@ -29,78 +29,89 @@ describe 'up.layout', ->
         afterEach ->
           @$container.remove()
 
-        it 'reveals the given element', ->
+        it 'reveals the given element', asyncSpec (next) ->
           up.reveal(@$elements[0])
-          # ---------------------
-          # [0] 0 .......... ch-1
-          # ---------------------
-          # [1] ch+0 ...... ch+49
-          # [2] ch+50 ... ch+5049
-          expect($(document).scrollTop()).toBe(0)
 
-          up.reveal(@$elements[1])
-          # ---------------------
-          # [0] 0 .......... ch-1
-          # [1] ch+0 ...... ch+49
-          # ---------------------
-          # [2] ch+50 ... ch+5049
-          expect($(document).scrollTop()).toBe(50)
+          next =>
+            # ---------------------
+            # [0] 0 .......... ch-1
+            # ---------------------
+            # [1] ch+0 ...... ch+49
+            # [2] ch+50 ... ch+5049
+            expect($(document).scrollTop()).toBe(0)
 
-          up.reveal(@$elements[2])
-          # [0] 0 .......... ch-1
-          # [1] ch+0 ...... ch+49
-          # ---------------------
-          # [2] ch+50 ... ch+5049
-          # ---------------------
-          expect($(document).scrollTop()).toBe(@clientHeight + 50)
-
-        it "includes the element's top margin in the revealed area", ->
+            up.reveal(@$elements[1])
+
+          next =>
+            # ---------------------
+            # [0] 0 .......... ch-1
+            # [1] ch+0 ...... ch+49
+            # ---------------------
+            # [2] ch+50 ... ch+5049
+            expect($(document).scrollTop()).toBe(50)
+
+            up.reveal(@$elements[2])
+
+          next =>
+            # [0] 0 .......... ch-1
+            # [1] ch+0 ...... ch+49
+            # ---------------------
+            # [2] ch+50 ... ch+5049
+            # ---------------------
+            expect($(document).scrollTop()).toBe(@clientHeight + 50)
+
+        it "includes the element's top margin in the revealed area", asyncSpec (next) ->
           @$elements[1].css('margin-top': '20px')
           up.reveal(@$elements[1])
-          expect($(document).scrollTop()).toBe(50 + 20)
+          next => expect($(document).scrollTop()).toBe(50 + 20)
 
-        it "includes the element's bottom margin in the revealed area", ->
+        it "includes the element's bottom margin in the revealed area", asyncSpec (next) ->
           @$elements[1].css('margin-bottom': '20px')
           up.reveal(@$elements[2])
-          expect($(document).scrollTop()).toBe(@clientHeight + 50 + 20)
-
-        it 'snaps to the top if the space above the future-visible area is smaller than the value of config.snap', ->
+          next => expect($(document).scrollTop()).toBe(@clientHeight + 50 + 20)
 
+        it 'snaps to the top if the space above the future-visible area is smaller than the value of config.snap', asyncSpec (next) ->
           up.layout.config.snap = 30
 
           @$elements[0].css(height: '20px')
 
           up.reveal(@$elements[2])
-          # [0] 0 ............ 19
-          # [1] 20 ........... 69
-          # ---------------------
-          # [2] 70 ......... 5069
-          # ---------------------
-          expect($(document).scrollTop()).toBe(70)
-
-          # Even though we're revealing the second element, the viewport
-          # snaps to the top edge.
-          up.reveal(@$elements[1])
-          # ---------------------
-          # [0] 0 ............ 19
-          # [1] 20 ........... 69
-          # ---------------------
-          # [2] 70 ......... 5069
-          expect($(document).scrollTop()).toBe(0)
-
-        it 'does not snap to the top if it would un-reveal an element at the bottom edge of the screen (bugfix)', ->
+
+          next =>
+            # [0] 0 ............ 19
+            # [1] 20 ........... 69
+            # ---------------------
+            # [2] 70 ......... 5069
+            # ---------------------
+            expect($(document).scrollTop()).toBe(70)
+
+            # Even though we're revealing the second element, the viewport
+            # snaps to the top edge.
+            up.reveal(@$elements[1])
+
+          next =>
+            # ---------------------
+            # [0] 0 ............ 19
+            # [1] 20 ........... 69
+            # ---------------------
+            # [2] 70 ......... 5069
+            expect($(document).scrollTop()).toBe(0)
+
+        it 'does not snap to the top if it would un-reveal an element at the bottom edge of the screen (bugfix)', asyncSpec (next) ->
           up.layout.config.snap = 100
 
           up.reveal(@$elements[1])
-          # ---------------------
-          # [0] 0 .......... ch-1
-          # [1] ch+0 ...... ch+49
-          # ---------------------
-          # [2] ch+50 ... ch+5049
-          expect($(document).scrollTop()).toBe(50)
+
+          next =>
+            # ---------------------
+            # [0] 0 .......... ch-1
+            # [1] ch+0 ...... ch+49
+            # ---------------------
+            # [2] ch+50 ... ch+5049
+            expect($(document).scrollTop()).toBe(50)
 
 
-        it 'scrolls far enough so the element is not obstructed by an element fixed to the top', ->
+        it 'scrolls far enough so the element is not obstructed by an element fixed to the top', asyncSpec (next) ->
           $topNav = affix('[up-fixed=top]').css(
             position: 'fixed',
             top: '0',
@@ -110,44 +121,51 @@ describe 'up.layout', ->
           )
 
           up.reveal(@$elements[0], viewport: @viewport)
-          # ---------------------
-          # [F] 0 ............ 99
-          # [0] 0 .......... ch-1
-          # ---------------------
-          # [1] ch+0 ...... ch+49
-          # [2] ch+50 ... ch+5049
-          expect($(document).scrollTop()).toBe(0) # would need to be -100
 
-          up.reveal(@$elements[1])
-          # ---------------------
-          # [F] 0 ............ 99
-          # [0] 00000 ...... ch-1
-          # [1] ch+0 ...... ch+49
-          # ---------------------
-          # [2] ch+50 ... ch+5049
+          next =>
+            # ---------------------
+            # [F] 0 ............ 99
+            # [0] 0 .......... ch-1
+            # ---------------------
+            # [1] ch+0 ...... ch+49
+            # [2] ch+50 ... ch+5049
+            expect($(document).scrollTop()).toBe(0) # would need to be -100
 
-          expect($(document).scrollTop()).toBe(50)
+            up.reveal(@$elements[1])
 
-          up.reveal(@$elements[2])
-          # [0] 00000 ...... ch-1
-          # [1] ch+0 ...... ch+49
-          # ---------------------
-          # [F] 0 ............ 99
-          # [2] ch+50 ... ch+5049
-          # ----------------
-          expect($(document).scrollTop()).toBe(@clientHeight + 50 - 100)
+          next =>
+            # ---------------------
+            # [F] 0 ............ 99
+            # [0] 00000 ...... ch-1
+            # [1] ch+0 ...... ch+49
+            # ---------------------
+            # [2] ch+50 ... ch+5049
+            expect($(document).scrollTop()).toBe(50)
 
-          up.reveal(@$elements[1])
-          # [0] 00000 ...... ch-1
-          # ---------------------
-          # [F] 0 ............ 99
-          # [1] ch+0 ...... ch+49
-          # [2] ch+50 ... ch+5049
-          # ----------------
-          expect($(document).scrollTop()).toBe(@clientHeight + 50 - 100 - 50)
+            up.reveal(@$elements[2])
+
+          next =>
+            # [0] 00000 ...... ch-1
+            # [1] ch+0 ...... ch+49
+            # ---------------------
+            # [F] 0 ............ 99
+            # [2] ch+50 ... ch+5049
+            # ----------------
+            expect($(document).scrollTop()).toBe(@clientHeight + 50 - 100)
+
+            up.reveal(@$elements[1])
+
+          next =>
+            # [0] 00000 ...... ch-1
+            # ---------------------
+            # [F] 0 ............ 99
+            # [1] ch+0 ...... ch+49
+            # [2] ch+50 ... ch+5049
+            # ----------------
+            expect($(document).scrollTop()).toBe(@clientHeight + 50 - 100 - 50)
 
 
-        it 'scrolls far enough so the element is not obstructed by an element fixed to the bottom', ->
+        it 'scrolls far enough so the element is not obstructed by an element fixed to the bottom', asyncSpec (next) ->
           $bottomNav = affix('[up-fixed=bottom]').css(
             position: 'fixed',
             bottom: '0',
@@ -157,50 +175,57 @@ describe 'up.layout', ->
           )
 
           up.reveal(@$elements[0])
-          # ---------------------
-          # [0] 0 .......... ch-1
-          # [F] 0 ............ 99
-          # ---------------------
-          # [1] ch+0 ...... ch+49
-          # [2] ch+50 ... ch+5049
-          expect($(document).scrollTop()).toBe(0)
 
-          up.reveal(@$elements[1])
-          # ---------------------
-          # [0] 0 .......... ch-1
-          # [1] ch+0 ...... ch+49
-          # [F] 0 ............ 99
-          # ---------------------
-          # [2] ch+50 ... ch+5049
-          expect($(document).scrollTop()).toBe(150)
+          next =>
+            # ---------------------
+            # [0] 0 .......... ch-1
+            # [F] 0 ............ 99
+            # ---------------------
+            # [1] ch+0 ...... ch+49
+            # [2] ch+50 ... ch+5049
+            expect($(document).scrollTop()).toBe(0)
 
-          up.reveal(@$elements[2])
-          # ---------------------
-          # [0] 0 .......... ch-1
-          # [1] ch+0 ...... ch+49
-          # ---------------------
-          # [2] ch+50 ... ch+5049
-          # [F] 0 ............ 99
-          expect($(document).scrollTop()).toBe(@clientHeight + 50)
+            up.reveal(@$elements[1])
 
-        describe 'with { top: true } option', ->
+          next =>
+            # ---------------------
+            # [0] 0 .......... ch-1
+            # [1] ch+0 ...... ch+49
+            # [F] 0 ............ 99
+            # ---------------------
+            # [2] ch+50 ... ch+5049
+            expect($(document).scrollTop()).toBe(150)
 
-          it 'scrolls the viewport to the first row of the element, even if that element is already fully revealed', ->
+            up.reveal(@$elements[2])
 
+          next =>
+            # ---------------------
+            # [0] 0 .......... ch-1
+            # [1] ch+0 ...... ch+49
+            # ---------------------
+            # [2] ch+50 ... ch+5049
+            # [F] 0 ............ 99
+            expect($(document).scrollTop()).toBe(@clientHeight + 50)
+
+        describe 'with { top: true } option', ->
+
+          it 'scrolls the viewport to the first row of the element, even if that element is already fully revealed', asyncSpec (next) ->
             @$elements[0].css(height: '20px')
 
             up.reveal(@$elements[1], { top: true })
-            # [0] 0 ............ 19
-            # [1] 20 ........... 69
-            # ---------------------
-            # [2] 70 ......... 5069
-            # ---------------------
-            expect($(document).scrollTop()).toBe(20)
+
+            next =>
+              # [0] 0 ............ 19
+              # [1] 20 ........... 69
+              # ---------------------
+              # [2] 70 ......... 5069
+              # ---------------------
+              expect($(document).scrollTop()).toBe(20)
 
 
       describe 'when the viewport is a container with overflow-y: scroll', ->
 
-        it 'reveals the given element', ->
+        it 'reveals the given element', asyncSpec (next) ->
           $viewport = affix('div').css
             'position': 'absolute'
             'top': '50px'
@@ -227,48 +252,56 @@ describe 'up.layout', ->
           # See that the view only scrolls down as little as possible
           # in order to reveal the element
           up.reveal($elements[3], viewport: $viewport)
-          # [0] 000..049
-          # [1] 050..099
-          # ------------
-          # [2] 100..149
-          # [3] 150..199
-          # ------------
-          # [4] 200..249
-          # [5] 250..299
-          expect($viewport.scrollTop()).toBe(100)
 
-          # See that the view doesn't move if the element
-          # is already revealed
-          up.reveal($elements[2], viewport: $viewport)
-          expect($viewport.scrollTop()).toBe(100)
-
-          # See that the view scrolls as far down as it cans
-          # to show the bottom element
-          up.reveal($elements[5], viewport: $viewport)
-          # [0] 000..049
-          # [1] 050..099
-          # [2] 100..149
-          # [3] 150..199
-          # ------------
-          # [4] 200..249
-          # [5] 250..299
-          # ------------
-          expect($viewport.scrollTop()).toBe(200)
-
-          # See that the view only scrolls up as little as possible
-          # in order to reveal the element
-          up.reveal($elements[1], viewport: $viewport)
-          # [0] 000..049
-          # ------------
-          # [1] 050..099
-          # [2] 100..149
-          # ------------
-          # [3] 150..199
-          # [4] 200..249
-          # [5] 250..299
-          expect($viewport.scrollTop()).toBe(50)
-
-      it 'only reveals the top number of pixels defined in config.substance', ->
+          next =>
+            # [0] 000..049
+            # [1] 050..099
+            # ------------
+            # [2] 100..149
+            # [3] 150..199
+            # ------------
+            # [4] 200..249
+            # [5] 250..299
+            expect($viewport.scrollTop()).toBe(100)
+
+            # See that the view doesn't move if the element
+            # is already revealed
+            up.reveal($elements[2], viewport: $viewport)
+
+          next =>
+            expect($viewport.scrollTop()).toBe(100)
+
+            # See that the view scrolls as far down as it cans
+            # to show the bottom element
+            up.reveal($elements[5], viewport: $viewport)
+
+          next =>
+            # [0] 000..049
+            # [1] 050..099
+            # [2] 100..149
+            # [3] 150..199
+            # ------------
+            # [4] 200..249
+            # [5] 250..299
+            # ------------
+            expect($viewport.scrollTop()).toBe(200)
+
+            up.reveal($elements[1], viewport: $viewport)
+
+          next =>
+            # See that the view only scrolls up as little as possible
+            # in order to reveal the element
+            # [0] 000..049
+            # ------------
+            # [1] 050..099
+            # [2] 100..149
+            # ------------
+            # [3] 150..199
+            # [4] 200..249
+            # [5] 250..299
+            expect($viewport.scrollTop()).toBe(50)
+
+      it 'only reveals the top number of pixels defined in config.substance', asyncSpec (next) ->
 
         up.layout.config.substance = 20
 
@@ -298,55 +331,67 @@ describe 'up.layout', ->
         # See that the view only scrolls down as little as possible
         # in order to reveal the first 20 rows of the element
         up.reveal($elements[3], viewport: $viewport)
-        # Viewing 70 to 169
-        expect($viewport.scrollTop()).toBe(50 + 20)
-
-        # See that the view doesn't move if the element
-        # is already revealed
-        up.reveal($elements[2], viewport: $viewport)
-        expect($viewport.scrollTop()).toBe(50 + 20)
-
-        # See that the view scrolls as far down as it cans
-        # to show the first 20 rows of the bottom element
-        up.reveal($elements[5], viewport: $viewport)
-        # Viewing 170 to 269
-        expect($viewport.scrollTop()).toBe(150 + 20)
-
-        # See that the view only scrolls up as little as possible
-        # in order to reveal the first 20 rows element
-        up.reveal($elements[2], viewport: $viewport)
-        # Viewing 100 to 199
-        expect($viewport.scrollTop()).toBe(100)
+
+        next =>
+          # Viewing 70 to 169
+          expect($viewport.scrollTop()).toBe(50 + 20)
+
+          # See that the view doesn't move if the element
+          # is already revealed
+          up.reveal($elements[2], viewport: $viewport)
+
+        next =>
+          expect($viewport.scrollTop()).toBe(50 + 20)
+
+          # See that the view scrolls as far down as it cans
+          # to show the first 20 rows of the bottom element
+          up.reveal($elements[5], viewport: $viewport)
+
+        next =>
+          # Viewing 170 to 269
+          expect($viewport.scrollTop()).toBe(150 + 20)
+
+          # See that the view only scrolls up as little as possible
+          # in order to reveal the first 20 rows element
+          up.reveal($elements[2], viewport: $viewport)
+
+        next =>
+          # Viewing 100 to 199
+          expect($viewport.scrollTop()).toBe(100)
 
     describe 'revealHash', ->
 
-      it 'reveals an element with an ID matching the hash in the location', ->
+      it 'reveals an element with an ID matching the hash in the location', asyncSpec (next) ->
         revealSpy = up.layout.knife.mock('reveal')
         $match = affix('div#hash')
         location.hash = '#hash'
         up.layout.revealHash()
-        expect(revealSpy).toHaveBeenCalledWith($match)
+        next => expect(revealSpy).toHaveBeenCalledWith($match)
 
-      it 'reveals a named anchor matching the hash in the location', ->
+      it 'reveals a named anchor matching the hash in the location', asyncSpec (next) ->
         revealSpy = up.layout.knife.mock('reveal')
         $match = affix('a[name="hash"]')
         location.hash = '#hash'
         up.layout.revealHash()
-        expect(revealSpy).toHaveBeenCalledWith($match)
+        next => expect(revealSpy).toHaveBeenCalledWith($match)
 
-      it 'does nothing and returns a rejected promise if no element or anchor matches the hash in the location', ->
+      it 'does nothing and returns a fulfilled promise if no element or anchor matches the hash in the location', (done) ->
         revealSpy = up.layout.knife.mock('reveal')
         location.hash = '#hash'
         promise = up.layout.revealHash()
         expect(revealSpy).not.toHaveBeenCalled()
-        expect(promise.state()).toEqual('rejected')
+        promiseState(promise).then (result) ->
+          expect(result.state).toEqual('fulfilled')
+          done()
 
-      it 'does nothing and returns a resolved promise if the location has no hash', ->
+      it 'does nothing and returns a fulfilled promise if the location has no hash', (done) ->
         revealSpy = up.layout.knife.mock('reveal')
         location.hash = ''
         promise = up.layout.revealHash()
         expect(revealSpy).not.toHaveBeenCalled()
-        expect(promise.state()).toEqual('resolved')
+        promiseState(promise).then (result) ->
+          expect(result.state).toEqual('fulfilled')
+          done()
 
     describe 'up.layout.viewportsWithin', ->
 
@@ -379,6 +424,29 @@ describe 'up.layout', ->
         lookup = -> up.layout.viewportOf($element)
         expect(lookup).toThrowError(/Could not find viewport/i)
 
+    describe 'up.layout.restoreScroll', ->
+
+      it "restores a viewport's previously saved scroll position", (done) ->
+        $viewport = affix('#viewport[up-viewport]').css(height: '100px', overflowY: 'scroll')
+        $content = $viewport.affix('.content').css(height: '1000px')
+        up.hello($viewport)
+        $viewport.scrollTop(50)
+        up.layout.saveScroll()
+        $viewport.scrollTop(70)
+
+        up.layout.restoreScroll().then ->
+          expect($viewport.scrollTop()).toEqual(50)
+          done()
+
+      it "scrolls a viewport to the top (and does not crash) if no previous scroll position is known", (done) ->
+        $viewport = affix('#viewport[up-viewport]').css(height: '100px', overflowY: 'scroll')
+        $content = $viewport.affix('.content').css(height: '1000px')
+        $viewport.scrollTop(70)
+
+        up.layout.restoreScroll().then ->
+          expect($viewport.scrollTop()).toEqual(0)
+          done()
+
     describe 'up.scroll', ->
 
       it 'should have tests'