unpoly-rails 0.27.1 → 0.27.2

data/lib/assets/javascripts/unpoly/form.js.coffee

@@ -126,6 +126,7 @@ up.form = (($) ->
     options.cache = u.option(options.cache, u.castedAttr($form, 'up-cache'))
     options.restoreScroll = u.option(options.restoreScroll, u.castedAttr($form, 'up-restore-scroll'))
     options.origin = u.option(options.origin, $form)
+    options.layer = u.option(options.layer, $form.attr('up-layer'), 'auto')
     options.data = up.util.requestDataFromForm($form)
     options = u.merge(options, up.motion.animateOptions(options, $form))
 

data/lib/assets/javascripts/unpoly/link.js.coffee

@@ -158,6 +158,13 @@ up.link = (($) ->
   @param {Object} [options.headers={}]
     An object of additional header key/value pairs to send along
     with the request.
+  @param {String} [options.layer='auto']
+    The name of the layer that ought to be updated. Valid values are
+    `auto`, `page`, `modal` and `popup`.
+
+    If set to `auto` (default), Unpoly will try to find a match in the
+    same layer as the given link. If no match was found in that layer,
+    Unpoly will search in other layers, starting from the topmost layer.
   @return {Promise}
     A promise that will be resolved when the link destination
     has been loaded and rendered.
@@ -179,6 +186,7 @@ up.link = (($) ->
     options.restoreScroll = u.option(options.restoreScroll, u.castedAttr($link, 'up-restore-scroll'))
     options.method = followMethod($link, options)
     options.origin = u.option(options.origin, $link)
+    options.layer = u.option(options.layer, $link.attr('up-layer'), 'auto')
     options.confirm = u.option(options.confirm, $link.attr('up-confirm'))
     options = u.merge(options, up.motion.animateOptions(options, $link))
 
@@ -330,7 +338,14 @@ up.link = (($) ->
   @param {String} [up-cache]
     Whether to force the use of a cached response (`true`)
     or never use the cache (`false`)
-    or make an educated guess (`undefined`).
+    or make an educated guess (default).
+  @param {String} [up-layer='auto']
+    The name of the layer that ought to be updated. Valid values are
+    `auto`, `page`, `modal` and `popup`.
+
+    If set to `auto` (default), Unpoly will try to find a match in the
+    same layer as the given link. If no match was found in that layer,
+    Unpoly will search in other layers, starting from the topmost layer.
   @param [up-history]
     Whether to push an entry to the browser history when following the link.
 

data/lib/assets/javascripts/unpoly/modal.js.coffee

@@ -189,6 +189,10 @@ up.modal = (($) ->
     else
       template
 
+  discardHistory = ->
+    state.coveredTitle = null
+    state.coveredUrl = null
+
   createFrame = (target, options) ->
     $modal = $(templateHtml())
     $modal.attr('up-flavor', state.flavor)
@@ -380,6 +384,7 @@ up.modal = (($) ->
     options.sticky = u.option(options.sticky, u.castedAttr($link, 'up-sticky'), flavorDefault('sticky', options.flavor))
     options.confirm = u.option(options.confirm, $link.attr('up-confirm'))
     options.method = up.link.followMethod($link, options)
+    options.layer = 'modal'
     animateOptions = up.motion.animateOptions(options, $link, duration: flavorDefault('openDuration', options.flavor), easing: flavorDefault('openEasing', options.flavor))
 
     # Although we usually fall back to full page loads if a browser doesn't support pushState,
@@ -518,7 +523,9 @@ up.modal = (($) ->
   ###
 
   autoclose = ->
-    closeAsap() unless state.sticky
+    unless state.sticky
+      discardHistory()
+      closeAsap()
 
   ###*
   Returns whether the given element or selector is contained

data/lib/assets/javascripts/unpoly/popup.js.coffee

@@ -149,6 +149,10 @@ up.popup = (($) ->
     state.$popup.attr('up-position', state.position)
     state.$popup.css(css)
 
+  discardHistory = ->
+    state.coveredTitle = null
+    state.coveredUrl = null
+
   createFrame = (target) ->
     $popup = u.$createElementFromSelector('.up-popup')
     # Create an empty element that will match the
@@ -224,6 +228,7 @@ up.popup = (($) ->
     options.history = if up.browser.canPushState() then u.option(options.history, u.castedAttr($anchor, 'up-history'), config.history) else false
     options.confirm = u.option(options.confirm, $anchor.attr('up-confirm'))
     options.method = up.link.followMethod($anchor, options)
+    options.layer = 'popup'
     animateOptions = up.motion.animateOptions(options, $anchor, duration: config.openDuration, easing: config.openEasing)
 
     up.browser.whenConfirmed(options).then ->
@@ -328,7 +333,9 @@ up.popup = (($) ->
   ###
       
   autoclose = ->
-    closeAsap() unless state.sticky
+    unless state.sticky
+      discardHistory()
+      closeAsap()
 
   ###*
   Returns whether the given element or selector is contained

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

@@ -199,7 +199,7 @@ up.util = (($) ->
 
     openTag = (tag) -> "<#{tag}(?: [^>]*)?>"
     closeTag = (tag) -> "</#{tag}>"
-    anything = '(?:.|\\n)*?'
+    anything = '(?:.|\\s)*?'
     capture = (pattern) -> "(#{pattern})"
     
     titlePattern = new RegExp(
@@ -618,7 +618,7 @@ up.util = (($) ->
     merged
 
   ###*
-  Returns the first argument that is considered present.
+  Returns the first argument that is considered [given](/up.util.isGiven).
 
   This function is useful when you have multiple option sources and the value can be boolean.
   In that case you cannot change the sources with a `||` operator

data/lib/unpoly/rails/version.rb

@@ -4,6 +4,6 @@ module Unpoly
     # The current version of the unpoly-rails gem.
     # This version number is also used for releases of the Unpoly
     # frontend code.
-    VERSION = '0.27.1'
+    VERSION = '0.27.2'
   end
 end

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    unpoly-rails (0.27.0)
+    unpoly-rails (0.27.1)
       rails (>= 3)
 
 GEM

data/spec_app/spec/javascripts/helpers/to_be_jquery.js.coffee

@@ -0,0 +1,5 @@
+beforeEach ->
+  jasmine.addMatchers
+    toBeJQuery: (util, customEqualityTesters) ->
+      compare: (actual) ->
+        pass: up.util.isJQuery(actual)

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

@@ -566,7 +566,7 @@ describe 'up.flow', ->
       it "throws an error if the selector can't be found on the current page", ->
         html = '<div class="foo-bar">text</div>'
         extract = -> up.extract('.foo-bar', html)
-        expect(extract).toThrowError(/Could not find selector ".foo-bar" in current body/i)
+        expect(extract).toThrowError(/Could not find selector ".foo-bar"/i)
 
       it "throws an error if the selector can't be found in the given HTML string", ->
         affix('.foo-bar')

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

@@ -365,6 +365,30 @@ describe 'up.link', ->
           expect($('.target')).toHaveText('new text')
           expect(location.pathname).toEqual('/other/path')
 
+        it 'prefers to update a container in the same layer as the clicked link', ->
+          up.motion.config.enabled = false
+
+          $popupOpener = affix('a[href="/popup"]')
+          up.popup.attach($popupOpener, html: "<div class='target'>old popup text</div>", target: '.target')
+
+          affix('.document').affix('.target').text('old document text')
+          $linkInDocument = affix('a[href="/foo"][up-target=".target"]')
+          $linkInDocument.click()
+
+          @respondWith '<div class="target">new text from document link</div>'
+
+          expect($('.document .target')).toHaveText('new text from document link')
+          expect($('.up-popup .target')).toHaveText('old popup text')
+
+          $linkInPopup = $('.up-popup').affix('a[href="/bar"][up-target=".target"]')
+          $linkInPopup.click()
+
+          @respondWith '<div class="target">new text from popup link</div>'
+
+          expect($('.document .target')).toHaveText('new text from document link')
+          expect($('.up-popup .target')).toHaveText('new text from popup link')
+
+
         describe 'with [up-transition] modifier', ->
 
           describeCapability 'canCssTransition', ->

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

@@ -463,6 +463,23 @@ describe 'up.modal', ->
         expect($('.outside')).toHaveText('new outside')
         expect($('.up-modal')).not.toExist()
 
+      it 'does not restore the covered URL when auto-closing', (done) ->
+        up.motion.config.enabled = true
+        up.modal.config.openDuration = 0
+        up.modal.config.closeDuration = 20
+
+        affix('.outside').text('old outside')
+        whenModalOpen = up.modal.visit('/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>") # Populate modal
+
+        whenModalOpen.then ->
+          up.extract('.outside', "<div class='outside'>new outside</div>",
+            origin: $('.inside'), history: '/new-location') # Provoke auto-close
+
+          u.setTimer 50, ->
+            expect(location.href).toEndWith '/new-location'
+            done()
+
       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')

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

@@ -300,7 +300,7 @@ describe 'up.popup', ->
       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')
+        up.popup.attach($link, target: '.foo')
         @respondWith("<div class='foo'>old inside</div>")
         up.extract('.foo', "<div class='foo'>new text</div>")
         expect($outside).toBeInDOM()
@@ -310,16 +310,35 @@ describe 'up.popup', ->
       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')
+        up.popup.attach($link, target: '.inside')
         @respondWith("<div class='inside'>old inside</div>")
         up.extract('.outside', "<div class='outside'>new outside</div>", origin: $('.inside'))
         expect($('.outside')).toHaveText('new outside')
         expect($('.up-popup')).not.toExist()
 
+      it 'does not restore the covered URL when auto-closing', (done) ->
+        up.motion.config.enabled = true
+        up.popup.config.openDuration = 0
+        up.popup.config.closeDuration = 20
+        up.popup.config.history = true
+
+        affix('.outside').text('old outside')
+        $link = affix('.link')
+        whenPopupOpen = up.popup.attach($link, url: '/path', target: '.inside')
+        @respondWith("<div class='inside'>old inside</div>") # Populate popup
+
+        whenPopupOpen.then ->
+          up.extract('.outside', "<div class='outside'>new outside</div>",
+            origin: $('.inside'), history: '/new-location') # Provoke auto-close
+
+          u.setTimer 50, ->
+            expect(location.href).toEndWith '/new-location'
+            done()
+
       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')
+        up.popup.attach($link, target: '.inside')
         @respondWith("<div class='inside'>old inside</div>")
         up.extract('.inside', "<div class='inside'>new inside</div>", origin: $('.inside'))
         expect($('.inside')).toHaveText('new inside')
@@ -328,7 +347,7 @@ describe 'up.popup', ->
       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')
+        up.popup.attach($link, target: '.inside')
         @respondWith("<div class='inside'>old inside</div>")
         up.extract('.outside', "<div class='outside'>new outside</div>", origin: $('.outside'))
         expect($('.outside')).toHaveText('new outside')
@@ -337,7 +356,7 @@ describe 'up.popup', ->
       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')
+        up.popup.attach($link, target: '.inside')
         @respondWith("<div class='inside'>old inside</div>")
         up.extract('.inside', "<div class='inside'>new inside</div>", origin: $('.outside'))
         expect($('.inside')).toHaveText('new inside')
@@ -351,7 +370,7 @@ describe 'up.popup', ->
       it 'closes a popup on mousedown (in case an [up-instant] link removes its parent and thus a click event never fires)', ->
         affix('.outside').text('old outside')
         $link = affix('.link')
-        up.popup.attach($link, href: '/path', target: '.inside')
+        up.popup.attach($link, target: '.inside')
         @respondWith("<div class='inside'>inside</div>")
         Trigger.mousedown($('body'))
         expect($('.up-popup')).not.toExist()

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

@@ -2,6 +2,42 @@ describe 'up.util', ->
   
   describe 'Javascript functions', ->
 
+    describe 'up.util.createElementFromHtml', ->
+
+      it 'parses a string that contains a serialized HTML document', ->
+        string = """
+          <html lang="foo">
+            <head>
+              <title>document title</title>
+            </head>
+            <body data-env='production'>
+              <div>line 1</div>
+              <div>line 2</div>
+            </body>
+          </html>
+          """
+
+        element = up.util.createElementFromHtml(string)
+
+        expect(element.querySelector('head title').textContent).toEqual('document title')
+        expect(element.querySelectorAll('body div').length).toBe(2)
+        expect(element.querySelectorAll('body div')[0].textContent).toEqual('line 1')
+        expect(element.querySelectorAll('body div')[1].textContent).toEqual('line 2')
+
+      it 'parses a string that contains carriage returns (bugfix)', ->
+        string = """
+          <html>\r
+            <body>\r
+              <div>line</div>\r
+            </body>\r
+          </html>\r
+          """
+
+        $element = up.util.createElementFromHtml(string)
+        expect($element.querySelector('body')).toBeGiven()
+        expect($element.querySelector('body div').textContent).toEqual('line')
+
+
     describe 'up.util.cssAnimate', ->
 
       it 'returns a deferred that eventually resolves if called with a duration of 0 (bugfix)', (done) ->
@@ -197,6 +233,12 @@ describe 'up.util', ->
       it 'returns false for an array with at least one element', ->
         expect(up.util.isBlank(['element'])).toBe(false)
 
+      it 'returns true for an empty jQuery collection', ->
+        expect(up.util.isBlank($([]))).toBe(true)
+
+      it 'returns false for a jQuery collection with at least one element', ->
+        expect(up.util.isBlank($('body'))).toBe(false)
+
       it 'returns true for an empty object', ->
         expect(up.util.isBlank({})).toBe(true)
 
@@ -254,6 +296,22 @@ describe 'up.util', ->
           object.reset()
           expect(object.reset).toBeDefined()
 
+    describe 'up.util.remove', ->
+
+      it 'removes the given string from the given array', ->
+        array = ['a', 'b', 'c']
+        up.util.remove(array, 'b')
+        expect(array).toEqual ['a', 'c']
+
+      it 'removes the given object from the given array', ->
+        obj1 = { 'key': 1 }
+        obj2 = { 'key': 2 }
+        obj3 = { 'key': 3 }
+        array = [obj1, obj2, obj3]
+        up.util.remove(array, obj2)
+        expect(array).toEqual [obj1, obj3]
+
+
     describe 'up.util.requestDataAsQuery', ->
 
       encodedOpeningBracket = '%5B'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.27.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -216,6 +216,7 @@ files:
 - spec_app/spec/javascripts/helpers/to_be_around.js.coffee
 - spec_app/spec/javascripts/helpers/to_be_blank.js.coffee
 - spec_app/spec/javascripts/helpers/to_be_given.js.coffee
+- spec_app/spec/javascripts/helpers/to_be_jquery.js.coffee
 - spec_app/spec/javascripts/helpers/to_be_missing.js.coffee
 - spec_app/spec/javascripts/helpers/to_be_present.js.coffee
 - spec_app/spec/javascripts/helpers/to_contain.js.coffee