upjs-rails 0.12.4 → 0.12.5

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

@@ -36,8 +36,7 @@ up.tooltip = (($) ->
   ###*
   Sets default options for future tooltips.
 
-  @method up.tooltip.config
-  @property
+  @property up.tooltip.config
   @param {String} [config.position]
     The default position of tooltips relative to the element.
     Can be either `"top"` or `"bottom"`.
@@ -85,7 +84,7 @@ up.tooltip = (($) ->
         html: 'Enter multiple words or phrases'
       });
   
-  @method up.tooltip.attach
+  @function up.tooltip.attach
   @param {Element|jQuery|String} elementOrSelector
   @param {String} [options.html]
     The HTML to display in the tooltip.
@@ -110,7 +109,7 @@ up.tooltip = (($) ->
   Closes a currently shown tooltip.
   Does nothing if no tooltip is currently shown.
   
-  @method up.tooltip.close
+  @function up.tooltip.close
   @param {Object} options
     See options for [`up.animate`](/up.animate).
   ###
@@ -131,7 +130,7 @@ up.tooltip = (($) ->
 
       <a href="/decks" up-tooltip="Show all decks" up-position="bottom">Decks</a>
 
-  @method [up-tooltip]
+  @selector [up-tooltip]
   @param {String} [up-animation]
     The animation used to open the tooltip.
     Defaults to [`up.tooltip.config.openAnimation`](/up.tooltip.config).
@@ -139,7 +138,6 @@ up.tooltip = (($) ->
     The default position of tooltips relative to the element.
     Can be either `"top"` or `"bottom"`.
     Defaults to [`up.tooltip.config.position`](/up.tooltip.config).
-  @ujs
   ###
 
   ###*
@@ -147,8 +145,7 @@ up.tooltip = (($) ->
 
       <a href="/decks" up-tooltip="Show &lt;b&gt;all&lt;/b&gt; decks">Decks</a>
 
-  @method [up-tooltip-html]
-  @ujs
+  @selector [up-tooltip-html]
   ###
   up.compiler('[up-tooltip], [up-tooltip-html]', ($link) ->
     # Don't register these events on document since *every*

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

@@ -32,7 +32,7 @@ up.util = (($) ->
     $.ajax(request)
 
   ###*
-  @method up.util.isStandardPort
+  @function up.util.isStandardPort
   @private
   ###  
   isStandardPort = (protocol, port) ->
@@ -44,22 +44,17 @@ up.util = (($) ->
   
   By default hashes are ignored, search queries are included.
   
-  @method up.util.normalizeUrl
+  @function up.util.normalizeUrl
   @param {Boolean} [options.hash=false]
+    Whether to include an `#hash` anchor in the normalized URL
   @param {Boolean} [options.search=true]
+    Whether to include a `?query` string in the normalized URL
+  @param {Boolean} [options.stripTrailingSlash=false]
+    Whether to strip a trailing slash from the pathname
   @protected
   ###
   normalizeUrl = (urlOrAnchor, options) ->
-    anchor = null
-    if isString(urlOrAnchor)
-      anchor = $('<a>').attr(href: urlOrAnchor).get(0)
-      # In IE11 the #hostname and #port properties of such a link are empty
-      # strings. However, we can fix this by assigning the anchor its own
-      # href because computer:
-      # https://gist.github.com/jlong/2428561#comment-1461205
-      anchor.href = anchor.href if isBlank(anchor.hostname)
-    else
-      anchor = unJquery(urlOrAnchor)
+    anchor = parseUrl(urlOrAnchor)
     normalized = anchor.protocol + "//" + anchor.hostname
     normalized += ":#{anchor.port}" unless isStandardPort(anchor.protocol, anchor.port)
     pathname = anchor.pathname
@@ -74,7 +69,24 @@ up.util = (($) ->
     normalized
 
   ###*
-  @method up.util.normalizeMethod
+  @function up.util.parseUrl
+  @private
+  ###
+  parseUrl = (urlOrAnchor) ->
+    anchor = null
+    if isString(urlOrAnchor)
+      anchor = $('<a>').attr(href: urlOrAnchor).get(0)
+      # In IE11 the #hostname and #port properties of such a link are empty
+      # strings. However, we can fix this by assigning the anchor its own
+      # href because computer:
+      # https://gist.github.com/jlong/2428561#comment-1461205
+      anchor.href = anchor.href if isBlank(anchor.hostname)
+    else
+      anchor = unJquery(urlOrAnchor)
+    anchor
+
+  ###*
+  @function up.util.normalizeMethod
   @protected
   ###
   normalizeMethod = (method) ->
@@ -115,7 +127,7 @@ up.util = (($) ->
     element
 
   ###*
-  @method up.debug
+  @function up.debug
   @protected
   ###
   debug = (message, args...) ->
@@ -123,7 +135,7 @@ up.util = (($) ->
     up.browser.puts('debug', message, args...)
 
   ###*
-  @method up.warn
+  @function up.warn
   @protected
   ###
   warn = (message, args...) ->
@@ -142,7 +154,7 @@ up.util = (($) ->
       up.error('Division by zero')
       up.error('Unexpected result %o', result)
 
-  @method up.error
+  @function up.error
   ###
   error = (args...) ->
     args[0] = "[UP] #{args[0]}"
@@ -349,7 +361,7 @@ up.util = (($) ->
   In that case you cannot change the sources with a `||` operator
   (since that doesn't short-circuit at `false`).
   
-  @method up.util.option
+  @function up.util.option
   @param {Array} args...
   ###
   option = (args...) ->
@@ -429,7 +441,7 @@ up.util = (($) ->
   Modifies the given function so it only runs once.
   Subsequent calls will return the previous return value.
 
-  @method up.util.once
+  @function up.util.once
   @private
   ###
   once = (fun) ->
@@ -442,7 +454,7 @@ up.util = (($) ->
   ###*
   # Temporarily sets the CSS for the given element.
   #
-  # @method up.util.temporaryCss
+  # @function up.util.temporaryCss
   # @param {jQuery} $element
   # @param {Object} css
   # @param {Function} [block]
@@ -483,7 +495,7 @@ up.util = (($) ->
   To improve performance, the element will be forced into compositing for
   the duration of the animation.
 
-  @method up.util.cssAnimate
+  @function up.util.cssAnimate
   @param {Element|jQuery|String} elementOrSelector
     The element to animate.
   @param {Object} lastFrame
@@ -544,7 +556,7 @@ up.util = (($) ->
   
   Also see [`up.motion.finish`](/up.motion.finish).
   
-  @method up.util.finishCssAnimate
+  @function up.util.finishCssAnimate
   @protected
   @param {Element|jQuery|String} elementOrSelector
   ###
@@ -655,6 +667,9 @@ up.util = (($) ->
   resolvedPromise = ->
     resolvedDeferred().promise()
 
+  unresolvablePromise = ->
+    $.Deferred().promise()
+
   nullJquery = ->
     is: -> false
     attr: ->
@@ -734,7 +749,7 @@ up.util = (($) ->
     obj
 
   ###*
-  @method up.util.cache
+  @function up.util.cache
   @param {Number|Function} [config.size]
     Maximum number of cache entries.
     Set to `undefined` to not limit the cache size.
@@ -899,6 +914,7 @@ up.util = (($) ->
   fixedToAbsolute: fixedToAbsolute
   presentAttr: presentAttr
   createElement: createElement
+  parseUrl: parseUrl
   normalizeUrl: normalizeUrl
   normalizeMethod: normalizeMethod
   createElementFromHtml: createElementFromHtml
@@ -966,6 +982,7 @@ up.util = (($) ->
   clientSize: clientSize
   only: only
   trim: trim
+  unresolvablePromise: unresolvablePromise
   resolvedPromise: resolvedPromise
   resolvedDeferred: resolvedDeferred
   resolvableWhen: resolvableWhen

data/lib/upjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Upjs
   module Rails
-    VERSION = '0.12.4'
+    VERSION = '0.12.5'
   end
 end

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

@@ -161,6 +161,36 @@ describe 'up.flow', ->
               expect(@revealedHTML).toContain('new-middle')
               done()
 
+          describe 'when there is an anchor #hash in the URL', ->
+
+            it 'reveals a child with the ID of that #hash', (done) ->
+              @request = up.replace('.middle', '/path#three', reveal: true)
+              @responseText =
+                """
+                <div class="middle">
+                  <div id="one">one</div>
+                  <div id="two">two</div>
+                  <div id="three">three</div>
+                </div>
+                """
+              @respond()
+              @request.then =>
+                expect(@revealedHTML).toEqual('<div id="three">three</div>')
+                done()
+
+            it "reveals the entire element if it has no child with the ID of that #hash", (done) ->
+              @request = up.replace('.middle', '/path#four', reveal: true)
+              @responseText =
+                """
+                <div class="middle">
+                  new-middle
+                </div>
+                """
+              @respond()
+              @request.then =>
+                expect(@revealedHTML).toContain('new-middle')
+                done()
+
           it 'reveals a new element that is being appended', (done) ->
             @request = up.replace('.middle:after', '/path', reveal: true)
             @respond()

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

@@ -135,6 +135,12 @@ describe 'up.link', ->
 
             expect($viewport.scrollTop()).toEqual(65)
 
+#        describe "when the browser is already on the link's destination", ->
+#
+#          it "doesn't make a request and reveals the target container"
+#
+#          it "doesn't make a request and reveals the target of a #hash in the URL"
+
       else
         
         it 'follows the given link', ->

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

@@ -106,7 +106,7 @@ describe 'up.proxy', ->
         beforeEach ->
           up.proxy.config.busyDelay = 0
           @events = []
-          u.each ['up:proxy:load', 'up:proxy:receive', 'up:proxy:busy', 'up:proxy:idle'], (eventName) =>
+          u.each ['up:proxy:load', 'up:proxy:received', 'up:proxy:busy', 'up:proxy:idle'], (eventName) =>
             up.on eventName, =>
               @events.push eventName
 
@@ -136,7 +136,7 @@ describe 'up.proxy', ->
             'up:proxy:load',
             'up:proxy:busy',
             'up:proxy:load',
-            'up:proxy:receive'
+            'up:proxy:received'
           ])
   
           jasmine.Ajax.requests.at(1).respondWith
@@ -148,8 +148,8 @@ describe 'up.proxy', ->
             'up:proxy:load',
             'up:proxy:busy',
             'up:proxy:load',
-            'up:proxy:receive',
-            'up:proxy:receive',
+            'up:proxy:received',
+            'up:proxy:received',
             'up:proxy:idle'
           ])
   
@@ -180,7 +180,7 @@ describe 'up.proxy', ->
           expect(@events).toEqual([
             'up:proxy:load',
             'up:proxy:busy',
-            'up:proxy:receive',
+            'up:proxy:received',
             'up:proxy:idle'
           ])
           expect(up.proxy.busy()).toBe(false)
@@ -213,7 +213,7 @@ describe 'up.proxy', ->
           expect(@events).toEqual([
             'up:proxy:load',
             'up:proxy:busy',
-            'up:proxy:receive',
+            'up:proxy:received',
             'up:proxy:idle'
           ])
 
@@ -237,7 +237,7 @@ describe 'up.proxy', ->
 
           expect(@events).toEqual([
             'up:proxy:load',
-            'up:proxy:receive'
+            'up:proxy:received'
           ])
 
         it 'emits up:proxy:idle if a request returned but failed', ->
@@ -257,7 +257,7 @@ describe 'up.proxy', ->
           expect(@events).toEqual([
             'up:proxy:load',
             'up:proxy:busy',
-            'up:proxy:receive',
+            'up:proxy:received',
             'up:proxy:idle'
           ])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,7 +92,6 @@ files:
 - lib/assets/javascripts/up-bootstrap/modal-ext.js.coffee
 - lib/assets/javascripts/up-bootstrap/navigation-ext.js.coffee
 - lib/assets/javascripts/up.js.coffee
-- lib/assets/javascripts/up/boot.js.coffee
 - lib/assets/javascripts/up/browser.js.coffee
 - lib/assets/javascripts/up/bus.js.coffee
 - lib/assets/javascripts/up/flow.js.coffee

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

@@ -1,3 +0,0 @@
-if up.browser.isSupported()
-  up.emit('up:framework:boot')
-  up.emit('up:framework:booted')