unpoly-rails 0.32.0 → 0.33.0

data/lib/assets/javascripts/unpoly/{util.js.coffee → util.coffee}

@@ -18,6 +18,12 @@ up.util = (($) ->
   noop = $.noop
 
   ###*
+  Ensures that the given function can only be called a single time.
+  Subsequent calls will return the return value of the first call.
+
+  Note that this is a simple implementation that
+  doesn't distinguish between argument lists.
+
   @function up.util.memoize
   @internal
   ###
@@ -233,15 +239,21 @@ up.util = (($) ->
       # we possibly received a layout-less fragment
       createElement('div', html)
 
+  assignPolyfill = (target, sources...) ->
+    for source in sources
+      for own key, value of source
+        target[key] = value
+    target
+
   ###*
-  Merge the contents of two or more objects together into the first object.
+  Merge the own properties of one or more `sources` into the `target` object.
 
-  @function up.util.extend
+  @function up.util.assign
   @param {Object} target
   @param {Array<Object>} sources...
   @stable
   ###
-  extend = $.extend
+  assign = Object.assign || assignPolyfill
 
   ###*
   Returns a new string with whitespace removed from the beginning
@@ -330,7 +342,7 @@ up.util = (($) ->
 
   Note that empty strings or zero are *not* considered to be "missing".
 
-  For the opposite of `up.util.isMissing` see [`up.util.isGiven`](/up.util.isGiven).
+  For the opposite of `up.util.isMissing()` see [`up.util.isGiven()`](/up.util.isGiven).
 
   @function up.util.isMissing
   @param object
@@ -345,7 +357,7 @@ up.util = (($) ->
 
   Note that empty strings or zero *are* considered to be "given".
 
-  For the opposite of `up.util.isGiven` see [`up.util.isMissing`](/up.util.isMissing).
+  For the opposite of `up.util.isGiven()` see [`up.util.isMissing()`](/up.util.isMissing).
 
   @function up.util.isGiven
   @param object
@@ -457,7 +469,7 @@ up.util = (($) ->
   Returns whether the given argument is an object.
 
   This also returns `true` for functions, which may behave like objects in JavaScript.
-  For an alternative that returns `false` for functions, see [`up.util.isHash`](/up.util.isHash).
+  For an alternative that returns `false` for functions, see [`up.util.isHash()`](/up.util.isHash).
 
   @function up.util.isObject
   @param object
@@ -563,7 +575,7 @@ up.util = (($) ->
     if isArray(object)
       object.slice()
     else if isHash(object)
-      extend({}, object)
+      assign({}, object)
 
   ###*
   If given a jQuery collection, returns the underlying array of DOM element.
@@ -588,7 +600,7 @@ up.util = (($) ->
   @stable
   ###
   merge = (sources...) ->
-    extend({}, sources...)
+    assign({}, sources...)
 
   ###*
   Creates an options hash from the given argument and some defaults.
@@ -766,7 +778,7 @@ up.util = (($) ->
   Waits for the given number of milliseconds, the nruns the given callback.
 
   If the number of milliseconds is zero, the callback is run in the current execution frame.
-  See [`up.util.nextFrame`] for running a function in the next executation frame.
+  See [`up.util.nextFrame()`] for running a function in the next executation frame.
 
   @function up.util.setTimer
   @param {Number} millis
@@ -970,7 +982,7 @@ up.util = (($) ->
       return resolvedDeferred()
 
     # We don't finish an existing animation here, since the public API
-    # we expose as `up.motion.animate` already does this.
+    # we expose as `up.motion.animate()` already does this.
     deferred = $.Deferred()
 
     transitionProperties = Object.keys(lastFrame)
@@ -981,29 +993,19 @@ up.util = (($) ->
       'transition-timing-function': opts.easing
     oldTransition = $element.css(Object.keys(transition))
 
-    $element.addClass('up-animating')
-
-    transitionFinished = ->
-      $element.removeClass('up-animating')
-      $element.off('transitionend', onTransitionEnd)
-
     onTransitionEnd = (event) ->
       completedProperty = event.originalEvent.propertyName
+      # Check if the transitionend event was caused by our own transition,
+      # and not by some other transition that happens to live on the same element.
       if contains(transitionProperties, completedProperty)
         deferred.resolve() # unless isDetached($element)
-        transitionFinished()
 
     $element.on('transitionend', onTransitionEnd)
 
-    # Clean up in case we're canceled through some other code that resolves our deferred.
-    deferred.then(transitionFinished)
-
-    withoutCompositing = forceCompositing($element)
-    $element.css(transition)
-    $element.css(lastFrame)
-    $element.data(ANIMATION_DEFERRED_KEY, deferred)
-
     deferred.then ->
+      $element.removeClass('up-animating')
+      $element.off('transitionend', onTransitionEnd)
+
       $element.removeData(ANIMATION_DEFERRED_KEY)
       withoutCompositing()
 
@@ -1023,6 +1025,12 @@ up.util = (($) ->
         forceRepaint($element) # :(
         $element.css(oldTransition)
 
+    $element.addClass('up-animating')
+    withoutCompositing = forceCompositing($element)
+    $element.css(transition)
+    $element.data(ANIMATION_DEFERRED_KEY, deferred)
+    $element.css(lastFrame)
+
     # Return the whole deferred and not just return a thenable.
     # Other code will need the possibility to cancel the animation
     # by resolving the deferred.
@@ -1037,7 +1045,7 @@ up.util = (($) ->
   
   Does nothing if the given element is not currently animating.
   
-  Also see [`up.motion.finish`](/up.motion.finish).
+  Also see [`up.motion.finish()`](/up.motion.finish).
   
   @function up.util.finishCssAnimate
   @param {Element|jQuery|String} elementOrSelector
@@ -1048,6 +1056,17 @@ up.util = (($) ->
       if existingAnimation = pluckData(this, ANIMATION_DEFERRED_KEY)
         existingAnimation.resolve()
 
+  ###*
+  @internal
+  ###
+  margins = (selectorOrElement) ->
+    $element = $(selectorOrElement)
+    withUnits = $element.css(['margin-top', 'margin-right', 'margin-bottom', 'margin-left'])
+    top:    parseFloat(withUnits['margin-top'])
+    right:  parseFloat(withUnits['margin-right'])
+    bottom: parseFloat(withUnits['margin-bottom'])
+    left:   parseFloat(withUnits['margin-left'])
+
   ###*
   Measures the given element.
 
@@ -1055,7 +1074,7 @@ up.util = (($) ->
   @internal
   ###
   measure = ($element, opts) ->
-    opts = options(opts, relative: false, inner: false)
+    opts = options(opts, relative: false, inner: false, includeMargin: false)
 
     if opts.relative
       if opts.relative == true
@@ -1086,6 +1105,13 @@ up.util = (($) ->
       box.width = $element.outerWidth()
       box.height = $element.outerHeight()
 
+    if opts.includeMargin
+      mgs = margins($element)
+      box.left -= mgs.left
+      box.top -= mgs.top
+      box.height += mgs.top + mgs.bottom
+      box.width += mgs.left + mgs.right
+
     box
 
   ###*
@@ -1218,23 +1244,59 @@ up.util = (($) ->
   already resolved.
 
   @function up.util.resolvedDeferred
+  @param {Array<Object>} [args...]
+    The resolution values that will be passed to callbacks
   @return {Deferred}
   @stable
   ###
-  resolvedDeferred = ->
+  resolvedDeferred = (args...) ->
     deferred = $.Deferred()
-    deferred.resolve()
+    deferred.resolve(args...)
     deferred
 
   ###*
   Returns a promise that is already resolved.
 
   @function up.util.resolvedPromise
+  @param {Array<Object>} [args...]
+    The resolution values that will be passed to callbacks
   @return {Promise}
   @stable
   ###
-  resolvedPromise = ->
-    resolvedDeferred().promise()
+  resolvedPromise = (args...) ->
+    resolvedDeferred(args...).promise()
+
+  ###*
+  Returns a promise that is already rejected.
+
+  @function up.util.rejectedPromise
+  @param {Array<Object>} [args...]
+    The rejection values that will be passed to callbacks
+  @return {Promise}
+  @stable
+  ###
+  rejectedPromise = (args...) ->
+    deferred = $.Deferred()
+    deferred.reject(args...)
+    deferred.promise()
+
+  ###*
+  Returns whether the given argument is a resolved jQuery promise.
+
+  @return {Boolean}
+  @internal
+  ###
+  isResolvedPromise = (promise) ->
+    isPromise(promise) && promise.state?() == 'resolved'
+
+  ###*
+  Returns whether the given argument is a resolved jQuery promise.
+
+  @return {Boolean}
+  @internal
+  ###
+  isResolvedPromise = (promise) ->
+    isPromise(promise) && promise.state?() == 'resolved'
 
   ###*
   Returns a [Deferred object](https://api.jquery.com/category/deferred-object/) that will never be resolved.
@@ -1524,7 +1586,7 @@ up.util = (($) ->
     hash.reset = ->
       newOptions = blueprint
       newOptions = newOptions() if isFunction(newOptions)
-      extend(hash, newOptions)
+      assign(hash, newOptions)
     hash.reset()
     hash
 
@@ -1920,6 +1982,28 @@ up.util = (($) ->
     $insertion.replaceWith($new)
     $old
 
+  ###*
+  Flattens the given `array` a single level deep.
+
+  @function up.util.flatten
+  @param {Array} array
+    An array which might contain other arrays
+  @return {Array}
+    The flattened array
+  @internal
+  ###
+  flatten = (array) ->
+    flattened = []
+    for object in array
+      if isArray(object)
+        flattened = flattened.concat(object)
+      else
+        flattened.push(object)
+    flattened
+
+  isTruthy = (object) ->
+    !!object
+
   isDetached: isDetached
   requestDataAsArray: requestDataAsArray
   requestDataAsQuery: requestDataAsQuery
@@ -1937,7 +2021,8 @@ up.util = (($) ->
   $createElementFromSelector: $createElementFromSelector
   $createPlaceholder: $createPlaceholder
   selectorForElement: selectorForElement
-  extend: extend
+  assign: assign
+  assignPolyfill: assignPolyfill
   copy: copy
   merge: merge
   options: options
@@ -1970,6 +2055,7 @@ up.util = (($) ->
   isElement: isElement
   isJQuery: isJQuery
   isPromise: isPromise
+  isResolvedPromise: isResolvedPromise
   isDeferred: isDeferred
   isHash: isHash
   isArray: isArray
@@ -1991,8 +2077,6 @@ up.util = (($) ->
   findWithSelf: findWithSelf
   contains: contains
   toArray: toArray
-#  castsToTrue: castsToTrue
-#  castsToFalse: castsToFalse
   castedAttr: castedAttr
   locationFromXhr: locationFromXhr
   titleFromXhr: titleFromXhr
@@ -2004,6 +2088,7 @@ up.util = (($) ->
   unresolvableDeferred: unresolvableDeferred
   unresolvablePromise: unresolvablePromise
   resolvedPromise: resolvedPromise
+  rejectedPromise: rejectedPromise
   resolvedDeferred: resolvedDeferred
   resolvableWhen: resolvableWhen
   setMissingAttrs: setMissingAttrs
@@ -2034,6 +2119,8 @@ up.util = (($) ->
   evalOption: evalOption
   horizontalScreenHalf: horizontalScreenHalf
   detachWith: detachWith
+  flatten: flatten
+  isTruthy: isTruthy
 
 )($)
 

data/lib/assets/javascripts/unpoly-bootstrap3/{navigation-ext.js.coffee → navigation-ext.coffee}

@@ -1,3 +1,3 @@
 # Bootstrap uses the class `active` to highlight the current section
 # of a navigation bar.
-up.navigation.config.currentClasses.push('active')
+up.feedback.config.currentClasses.push('active')

data/lib/assets/javascripts/unpoly.coffee

@@ -0,0 +1,22 @@
+#= require ./unpoly/namespace
+#= require ./unpoly/util
+#= require ./unpoly/browser
+#= require ./unpoly/bus
+#= require ./unpoly/log
+#= require ./unpoly/toast
+#= require ./unpoly/syntax
+#= require ./unpoly/history
+#= require ./unpoly/layout
+#= require ./unpoly/dom
+#= require_tree ./unpoly/dom
+#= require ./unpoly/motion
+#= require ./unpoly/proxy
+#= require ./unpoly/link
+#= require ./unpoly/form
+#= require ./unpoly/popup
+#= require ./unpoly/modal
+#= require ./unpoly/tooltip
+#= require ./unpoly/feedback
+#= require ./unpoly/rails
+
+up.boot()

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.32.0'
+    VERSION = '0.33.0'
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unpoly",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "description": "Unobtrusive JavaScript framework",
   "main": "dist/unpoly.js",
   "files": [

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    unpoly-rails (0.31.2)
+    unpoly-rails (0.32.0)
       rails (>= 3)
 
 GEM
@@ -51,7 +51,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
     bower-rails (0.9.2)
-    builder (3.2.2)
+    builder (3.2.3)
     byebug (3.5.1)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
@@ -93,11 +93,11 @@ GEM
       phantomjs (>= 1.9)
       railties (>= 3.2.0)
       sprockets-rails
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    json (1.8.6)
     libv8 (3.16.14.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
@@ -105,14 +105,12 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (2.99)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     multi_json (1.12.1)
-    nokogiri (1.6.8)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     phantomjs (2.1.1.0)
-    pkg-config (1.1.7)
-    rack (1.6.4)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
@@ -128,9 +126,9 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -139,7 +137,7 @@ GEM
       activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
+    rake (12.0.0)
     ref (1.0.5)
     rspec-core (3.4.1)
       rspec-support (~> 3.4.0)
@@ -182,7 +180,7 @@ GEM
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tilt (1.4.1)
     tzinfo (1.2.2)

data/spec_app/app/assets/javascripts/jasmine_specs.coffee

@@ -1,4 +1,4 @@
-#= require jquery
+#= require jquery2
 #= require jquery_ujs
 #= require jasmine-jquery
 #= require jasmine-fixture

data/spec_app/app/assets/stylesheets/_helpers.sass

@@ -1,5 +1,5 @@
 =clear_after
   &:after
     content: ""
-    display: table
+    display: block
     clear: both

data/spec_app/config/initializers/assets.rb

@@ -4,15 +4,11 @@
 Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
+Rails.application.config.assets.paths += Dir["#{Rails.root}/vendor/asset-libs/*"].sort_by { |dir| -dir.size }
 
 # Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-
-
 Rails.application.config.assets.precompile += %w( application.js application.css )
 Rails.application.config.assets.precompile += %w( jasmine_specs.js jasmine_specs.css )
 Rails.application.config.assets.precompile += %w( integration_test.js integration_test.css )
 Rails.application.config.assets.precompile += %w( bootstrap_manifest.js bootstrap_manifest.css )
 Rails.application.config.assets.precompile += %w( unpoly-bootstrap3.js unpoly-bootstrap3.css )
-