upjs-rails 0.15.1 → 0.16.0

data/lib/assets/javascripts/up/syntax.js.coffee

@@ -304,13 +304,15 @@ up.syntax = (($) ->
 
   @function up.hello
   @param {String|Element|jQuery} selectorOrElement
+  @param {String|Element|jQuery} [options.origin]
   @return {jQuery}
     The compiled element
   @stable
   ###
-  hello = (selectorOrElement) ->
+  hello = (selectorOrElement, options) ->
     $element = $(selectorOrElement)
-    up.emit('up:fragment:inserted', $element: $element)
+    eventAttrs = u.options(options, $element: $element)
+    up.emit('up:fragment:inserted', eventAttrs)
     $element
 
   ###*

data/lib/assets/javascripts/up/tooltip.js.coffee

@@ -149,7 +149,7 @@ up.tooltip = (($) ->
   ###*
   Displays a tooltip with HTML content when hovering the mouse over this element:
 
-      <a href="/decks" up-tooltip="Show &lt;b&gt;all&lt;/b&gt; decks">Decks</a>
+      <a href="/decks" up-tooltip-html="Show &lt;b&gt;all&lt;/b&gt; decks">Decks</a>
 
   @selector [up-tooltip-html]
   @stable

data/lib/assets/javascripts/up/util.js.coffee

@@ -913,37 +913,33 @@ up.util = (($) ->
   ###
   cssAnimate = (elementOrSelector, lastFrame, opts) ->
     $element = $(elementOrSelector)
-    if up.browser.canCssTransition()
-      opts = options(opts, 
-        duration: 300, 
-        delay: 0, 
-        easing: 'ease'
-      )
-      # We don't finish an existing animation here, since
-      # the public API `up.motion.animate` already does this.
-      deferred = $.Deferred()
-      transition =
-        'transition-property': Object.keys(lastFrame).join(', ')
-        'transition-duration': "#{opts.duration}ms"
-        'transition-delay': "#{opts.delay}ms"
-        'transition-timing-function': opts.easing
-      withoutCompositing = forceCompositing($element)
-      withoutTransition = temporaryCss($element, transition)
-      $element.css(lastFrame)
-      deferred.then(withoutCompositing)
-      deferred.then(withoutTransition)
-      $element.data(ANIMATION_PROMISE_KEY, deferred)
-      deferred.then(-> $element.removeData(ANIMATION_PROMISE_KEY))
-      endTimeout = setTimeout((-> deferred.resolve()), opts.duration + opts.delay)
-      deferred.then(-> clearTimeout(endTimeout)) # clean up in case we're canceled
-      # Return the whole deferred and not just return a thenable.
-      # Other code will need the possibility to cancel the animation
-      # by resolving the deferred.
-      deferred
-    else
-      $element.css(lastFrame)
-      resolvedDeferred()
-      
+    opts = options(opts,
+      duration: 300,
+      delay: 0,
+      easing: 'ease'
+    )
+    # We don't finish an existing animation here, since
+    # the public API `up.motion.animate` already does this.
+    deferred = $.Deferred()
+    transition =
+      'transition-property': Object.keys(lastFrame).join(', ')
+      'transition-duration': "#{opts.duration}ms"
+      'transition-delay': "#{opts.delay}ms"
+      'transition-timing-function': opts.easing
+    withoutCompositing = forceCompositing($element)
+    withoutTransition = temporaryCss($element, transition)
+    $element.css(lastFrame)
+    deferred.then(withoutCompositing)
+    deferred.then(withoutTransition)
+    $element.data(ANIMATION_PROMISE_KEY, deferred)
+    deferred.then(-> $element.removeData(ANIMATION_PROMISE_KEY))
+    endTimeout = setTimeout((-> deferred.resolve()), opts.duration + opts.delay)
+    deferred.then(-> clearTimeout(endTimeout)) # clean up in case we're canceled
+    # Return the whole deferred and not just return a thenable.
+    # Other code will need the possibility to cancel the animation
+    # by resolving the deferred.
+    deferred
+
   ANIMATION_PROMISE_KEY = 'up-animation-promise'
 
   ###*

data/lib/upjs/rails/version.rb

@@ -4,6 +4,6 @@ module Upjs
     # The current version of the upjs-rails gem.
     # This version number is also used for releases of the Up.js
     # frontend code.
-    VERSION = '0.15.1'
+    VERSION = '0.16.0'
   end
 end

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    upjs-rails (0.14.1)
+    upjs-rails (0.15.1)
       rails (>= 3)
 
 GEM
@@ -210,3 +210,6 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   upjs-rails!
   web-console (~> 2.0)
+
+BUNDLED WITH
+   1.10.6

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

@@ -1,4 +1,6 @@
 describe 'up.modal', ->
+
+  u = up.util
   
   describe 'Javascript functions', ->
 
@@ -64,6 +66,12 @@ describe 'up.modal', ->
             expect(parseInt($anchoredElement.css('right'))).toBeAround(30 , 10)
             done()
 
+      it 'does not explode if the modal was closed before the response was received', ->
+        up.modal.visit('/foo', target: '.container')
+        up.modal.close()
+        respond = => @respondWith('<div class="container">text</div>')
+        expect(respond).not.toThrowError()
+        expect($('.up-error')).not.toExist()
 
     describe 'up.modal.coveredUrl', ->
 
@@ -134,16 +142,64 @@ describe 'up.modal', ->
           expect(wasClosed).toBe(false)
           expect(wasDefaultPrevented).toBe(false)
 
-    describe 'when following links inside a modal', ->
+    describe 'when replacing content', ->
+
+      beforeEach ->
+        up.motion.config.enabled = false
 
       it 'prefers to replace a selector within the modal', ->
         $outside = affix('.foo').text('old outside')
         up.modal.visit('/path', target: '.foo')
         @respondWith("<div class='foo'>old inside</div>")
         up.flow.implant('.foo', "<div class='foo'>new text</div>")
+        expect($outside).toBeInDOM()
         expect($outside).toHaveText('old outside')
         expect($('.up-modal-content')).toHaveText('new text')
 
+      it 'auto-closes the modal when a replacement from inside the modal affects a selector behind the modal', ->
+        affix('.outside').text('old outside')
+        up.modal.visit('/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>")
+        up.flow.implant('.outside', "<div class='outside'>new outside</div>", origin: $('.inside'))
+        expect($('.outside')).toHaveText('new outside')
+        expect($('.up-modal')).not.toExist()
+
+      it 'does not auto-close the modal when a replacement from inside the modal affects a selector inside the modal', ->
+        affix('.outside').text('old outside')
+        up.modal.visit('/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>")
+        up.flow.implant('.inside', "<div class='inside'>new inside</div>", origin: $('.inside'))
+        expect($('.inside')).toHaveText('new inside')
+        expect($('.up-modal')).toExist()
+
+      it 'does not auto-close the modal when a replacement from outside the modal affects a selector outside the modal', ->
+        affix('.outside').text('old outside')
+        up.modal.visit('/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>")
+        up.flow.implant('.outside', "<div class='outside'>new outside</div>", origin: $('.outside'))
+        expect($('.outside')).toHaveText('new outside')
+        expect($('.up-modal')).toExist()
+
+      it 'does not auto-close the modal when a replacement from outside the modal affects a selector inside the modal', ->
+        affix('.outside').text('old outside')
+        up.modal.visit('/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>")
+        up.flow.implant('.inside', "<div class='inside'>new inside</div>", origin: $('.outside'))
+        expect($('.inside')).toHaveText('new inside')
+        expect($('.up-modal')).toExist()
+
+      it 'does not auto-close the modal when the new fragment is within a popup', ->
+        up.modal.visit('/modal', target: '.modal-content')
+        @respondWith("<div class='modal-content'></div>")
+        up.popup.attach('.modal-content', url: '/popup', target: '.popup-content')
+        @respondWith("<div class='popup-content'></div>")
+        expect($('.up-modal')).toExist()
+        expect($('.up-popup')).toExist()
+
+    describe 'when following links inside a modal', ->
+
+      it 'prefers to replace a selector within the modal', ->
+
       it 'auto-closes the modal if a selector behind the modal gets replaced'
 
       it "doesn't auto-close the modal if a selector behind the modal if the modal is sticky"

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

@@ -25,6 +25,16 @@ describe 'up.motion', ->
           up.animate($element, { 'fade-in' }, duration: 100, easing: 'linear')
           expect($element.css('font-size')).toEqual('40px')
 
+        describe 'with animations disabled globally', ->
+
+          beforeEach ->
+            up.motion.config.enabled = false
+
+          it "doesn't animate and directly sets the last frame instead", ->
+            $element = affix('.element').text('content')
+            up.animate($element, { 'font-size': '40px' }, duration: 10000, easing: 'linear')
+            expect($element.css('font-size')).toEqual('40px')
+
       else
 
         it "doesn't animate and directly sets the last frame instead", ->
@@ -185,6 +195,20 @@ describe 'up.motion', ->
             # was at the scroll position before we revealed $new.
             expect($oldGhost.offset().top).toEqual(-300)
 
+
+        describe 'with animations disabled globally', ->
+
+          beforeEach ->
+            up.motion.config.enabled = false
+
+          it "doesn't animate and hides the old element instead", ->
+            $old = affix('.old').text('old content')
+            $new = affix('.new').text('new content')
+            up.morph($old, $new, 'cross-fade', duration: 1000)
+            expect($old).toBeHidden()
+            expect($new).toBeVisible()
+            expect($new.css('opacity')).toEqual('1')
+
       else
 
         it "doesn't animate and hides the old element instead", ->
@@ -193,6 +217,7 @@ describe 'up.motion', ->
           up.morph($old, $new, 'cross-fade', duration: 1000)
           expect($old).toBeHidden()
           expect($new).toBeVisible()
+          expect($new.css('opacity')).toEqual('1')
 
     describe 'up.transition', ->
 

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

@@ -1,10 +1,18 @@
 describe 'up.popup', ->
 
+  u = up.util
+
   describe 'Javascript functions', ->
 
     describe 'up.popup.attach', ->
 
-      it 'should have tests'
+      it 'does not explode if the popup was closed before the response was received', ->
+        $span = affix('span')
+        up.popup.attach($span, url: '/foo', target: '.container')
+        up.popup.close()
+        respond = => @respondWith('<div class="container">text</div>')
+        expect(respond).not.toThrowError()
+        expect($('.up-error')).not.toExist()
 
     describe 'up.popup.coveredUrl', ->
 
@@ -34,6 +42,10 @@ describe 'up.popup', ->
 
       it "loads this link's destination in a popup when clicked", ->
         $link = affix('a[href="/path/to"][up-popup=".middle"]').text('link')
+        $link.css
+          position: 'fixed'
+          left: '100px'
+          top: '50px'
         $link.click()
         expect(@lastRequest().url).toMatch /\/path\/to$/
         @respondWith """
@@ -41,10 +53,19 @@ describe 'up.popup', ->
           <div class="middle">new-middle</div>
           <div class="after">new-after</div>
           """
-        expect($('.up-popup')).toExist()
-        expect($('.up-popup .middle')).toHaveText('new-middle')
-        expect($('.up-popup .before')).not.toExist()
-        expect($('.up-popup .after')).not.toExist()
+
+        $popup = $('.up-popup')
+
+        expect($popup).toExist()
+        expect($popup.find('.middle')).toHaveText('new-middle')
+        expect($popup.find('.before')).not.toExist()
+        expect($popup.find('.after')).not.toExist()
+
+        popupDims = u.measure($popup, full: true)
+        linkDims = u.measure($link, full: true)
+
+        expect(popupDims.right).toBeAround(linkDims.right, 1)
+        expect(popupDims.top).toBeAround(linkDims.top + linkDims.height, 1)
 
     describe '[up-close]', ->
 
@@ -80,4 +101,54 @@ describe 'up.popup', ->
           $link.click()
           expect(wasClosed).toBe(false)
           expect(wasDefaultPrevented).toBe(false)
-      
+
+    describe 'when replacing content', ->
+
+      beforeEach ->
+        up.motion.config.enabled = false
+
+      it 'prefers to replace a selector within the popup', ->
+        $outside = affix('.foo').text('old outside')
+        $link = affix('.link')
+        up.popup.attach($link, href: '/path', target: '.foo')
+        @respondWith("<div class='foo'>old inside</div>")
+        up.flow.implant('.foo', "<div class='foo'>new text</div>")
+        expect($outside).toBeInDOM()
+        expect($outside).toHaveText('old outside')
+        expect($('.up-popup')).toHaveText('new text')
+
+      it 'auto-closes the popup when a replacement from inside the popup affects a selector behind the popup', ->
+        affix('.outside').text('old outside')
+        $link = affix('.link')
+        up.popup.attach($link, href: '/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>")
+        up.flow.implant('.outside', "<div class='outside'>new outside</div>", origin: $('.inside'))
+        expect($('.outside')).toHaveText('new outside')
+        expect($('.up-popup')).not.toExist()
+
+      it 'does not auto-close the popup when a replacement from inside the popup affects a selector inside the popup', ->
+        affix('.outside').text('old outside')
+        $link = affix('.link')
+        up.popup.attach($link, href: '/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>")
+        up.flow.implant('.inside', "<div class='inside'>new inside</div>", origin: $('.inside'))
+        expect($('.inside')).toHaveText('new inside')
+        expect($('.up-popup')).toExist()
+
+      it 'does not auto-close the popup when a replacement from outside the popup affects a selector outside the popup', ->
+        affix('.outside').text('old outside')
+        $link = affix('.link')
+        up.popup.attach($link, href: '/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>")
+        up.flow.implant('.outside', "<div class='outside'>new outside</div>", origin: $('.outside'))
+        expect($('.outside')).toHaveText('new outside')
+        expect($('.up-popup')).toExist()
+
+      it 'does not auto-close the popup when a replacement from outside the popup affects a selector inside the popup', ->
+        affix('.outside').text('old outside')
+        $link = affix('.link')
+        up.popup.attach($link, href: '/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>")
+        up.flow.implant('.inside', "<div class='inside'>new inside</div>", origin: $('.outside'))
+        expect($('.inside')).toHaveText('new inside')
+        expect($('.up-popup')).toExist()

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

@@ -88,7 +88,7 @@ describe 'up.proxy', ->
           u.times 2, -> up.proxy.ajax(url: '/foo', method: method, cache: true)
           expect(jasmine.Ajax.requests.count()).toEqual(1)
 
-      it 'does not responses with a non-200 status code', ->
+      it 'does not cache responses with a non-200 status code', ->
         # Send the same request for the same path, 3 minutes apart
         up.proxy.ajax(url: '/foo')
 
@@ -101,6 +101,26 @@ describe 'up.proxy', ->
 
         expect(jasmine.Ajax.requests.count()).toEqual(2)
 
+      describe 'with config.maxRequests set', ->
+
+        beforeEach ->
+          up.proxy.config.maxRequests = 1
+
+        it 'limits the number of concurrent requests', ->
+          responses = []
+          up.proxy.ajax(url: '/foo').then (html) -> responses.push(html)
+          up.proxy.ajax(url: '/bar').then (html) -> responses.push(html)
+          expect(jasmine.Ajax.requests.count()).toEqual(1) # only one request was made
+          @respondWith('first response', request: jasmine.Ajax.requests.at(0))
+          expect(responses).toEqual ['first response']
+          expect(jasmine.Ajax.requests.count()).toEqual(2) # a second request was made
+          @respondWith('second response', request: jasmine.Ajax.requests.at(1))
+          expect(responses).toEqual ['first response', 'second response']
+
+#        it 'considers preloading links for the request limit', ->
+#          up.proxy.ajax(url: '/foo', preload: true)
+#          up.proxy.ajax(url: '/bar')
+#          expect(jasmine.Ajax.requests.count()).toEqual(1)
 
       describe 'events', ->
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails