upjs-rails 0.8.0 → 0.8.1

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

@@ -15,8 +15,26 @@ up.navigation = (->
 
   u = up.util
 
+  ###*
+  Sets default options for this module.
+
+  @method up.navigation.defaults
+  @param {Number} [options.currentClass]
+    The class to set on [links that point the current location](#up-current).
+  ###
+  config = u.config
+    currentClass: 'up-current'
+
+  reset = ->
+    config.reset()
+
+  currentClass = ->
+    klass = config.currentClass
+    unless u.contains(klass, 'up-current')
+      klass += ' up-current'
+    klass
+
   CLASS_ACTIVE = 'up-active'
-  CLASS_CURRENT = 'up-current'
   SELECTORS_SECTION = ['a', '[up-href]', '[up-alias]']
   SELECTOR_SECTION = SELECTORS_SECTION.join(', ')
   SELECTOR_SECTION_INSTANT = ("#{selector}[up-instant]" for selector in SELECTORS_SECTION).join(', ')
@@ -67,6 +85,8 @@ up.navigation = (->
       normalizeUrl(up.popup.source())
     ])
 
+    klass = currentClass()
+
     u.each $(SELECTOR_SECTION), (section) ->
       $section = $(section)
       # if $section is marked up with up-follow,
@@ -74,9 +94,9 @@ up.navigation = (->
       urls = sectionUrls($section)
 
       if currentUrls.matchesAny(urls)
-        $section.addClass(CLASS_CURRENT)
+        $section.addClass(klass)
       else
-        $section.removeClass(CLASS_CURRENT)
+        $section.removeClass(klass)
 
   ###*
   Links that are currently loading are assigned the `up-active`
@@ -186,4 +206,9 @@ up.navigation = (->
     if $fragment.is('.up-modal, .up-popup')
       locationChanged()
 
+  # The framework is reset between tests
+  up.bus.on 'framework:reset', reset
+
+  defaults: config.update
+
 )()

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

@@ -27,19 +27,20 @@ up.popup = (->
 
   currentSource = undefined
 
-  config =
-    openAnimation: 'fade-in'
-    closeAnimation: 'fade-out'
-    position: 'bottom-right'
-
   ###*
   @method up.popup.defaults
   @param {String} options.animation
   @param {String} options.position
   ###
-  defaults = (options) ->
-    u.extend(config, options)
-  
+  config = u.config
+    openAnimation: 'fade-in'
+    closeAnimation: 'fade-out'
+    position: 'bottom-right'
+
+  reset = ->
+    close()
+    config.reset()
+
   setPosition = ($link, $popup, position) ->
     linkBox = u.measure($link, full: true)
     css = switch position
@@ -182,6 +183,8 @@ up.popup = (->
       )
       currentSource = undefined
       up.destroy($popup, options)
+    else
+      u.resolvedPromise()
     
   autoclose = ->
     unless $('.up-popup').is('[up-sticky]')
@@ -255,14 +258,13 @@ up.popup = (->
       close()
   )
 
-  # The framework is reset between tests, so also close
-  # a currently open popup.
-  up.bus.on 'framework:reset', close
+  # The framework is reset between tests
+  up.bus.on 'framework:reset', reset
 
   open: open
   close: close
   source: source
-  defaults: defaults
+  defaults: config.update
   contains: contains
   
 )()

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

@@ -58,9 +58,24 @@ up.proxy = (->
   preloadDelayTimer = undefined
   busyDelayTimer = undefined
   pendingCount = undefined
-  config = undefined
   busyEventEmitted = undefined
-  FACTORY_CONFIG =
+
+  ###*
+  @method up.proxy.defaults
+  @param {Number} [options.preloadDelay=75]
+    The number of milliseconds to wait before [`[up-preload]`](#up-preload)
+    starts preloading.
+  @param {Number} [options.cacheSize=70]
+    The maximum number of responses to cache.
+    If the size is exceeded, the oldest items will be dropped from the cache.
+  @param {Number} [options.cacheExpiry=300000]
+    The number of milliseconds until a cache entry expires.
+    Defaults to 5 minutes.
+  @param {Number} [options.busyDelay=300]
+    How long the proxy waits until emitting the `proxy:busy` [event](/up.bus).
+    Use this to prevent flickering of spinners.
+  ###
+  config = u.config
     busyDelay: 300
     preloadDelay: 75
     cacheSize: 70
@@ -80,29 +95,11 @@ up.proxy = (->
     cancelPreloadDelay()
     cancelBusyDelay()
     pendingCount = 0
-    config = u.copy(FACTORY_CONFIG)
+    config.reset()
     busyEventEmitted = false
 
   reset()
 
-  ###*
-  @method up.proxy.defaults
-  @param {Number} [options.preloadDelay=75]
-    The number of milliseconds to wait before [`[up-preload]`](#up-preload)
-    starts preloading.
-  @param {Number} [options.cacheSize=70]
-    The maximum number of responses to cache.
-    If the size is exceeded, the oldest items will be dropped from the cache.
-  @param {Number} [options.cacheExpiry=300000]
-    The number of milliseconds until a cache entry expires.
-    Defaults to 5 minutes.
-  @param {Number} [options.busyDelay=300]
-    How long the proxy waits until emitting the `proxy:busy` [event](/up.bus).
-    Use this to prevent flickering of spinners.
-  ###
-  defaults = (options) ->
-    u.extend(config, options)
-
   cacheKey = (request) ->
     normalizeRequest(request)
     [ request.url,
@@ -336,8 +333,6 @@ up.proxy = (->
       u.debug("Won't preload %o due to unsafe method %o", $link, method)
       u.resolvedPromise()
 
-  up.bus.on 'framework:reset', reset
-
   ###*
   Links with an `up-preload` attribute will silently fetch their target
   when the user hovers over the click area, or when the user puts her
@@ -359,6 +354,8 @@ up.proxy = (->
     unless up.link.childClicked(event, $element) 
       checkPreload($element)
 
+  up.bus.on 'framework:reset', reset
+
   preload: preload
   ajax: ajax
   get: get
@@ -368,6 +365,6 @@ up.proxy = (->
   remove: remove
   idle: idle
   busy: busy
-  defaults: defaults
+  defaults: config.update
   
 )()

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

@@ -12,6 +12,16 @@ If you use them in your own code, you will get hurt.
 ###
 up.util = (->
 
+  memoize = (func) ->
+    cache = undefined
+    cached = false
+    (args...) ->
+      if cached
+        cache
+      else
+        cached = true
+        cache = func(args...)
+
   get = (url, options) ->
     options = options or {}
     options.url = url
@@ -337,7 +347,15 @@ up.util = (->
 
   compact = (array) ->
     select array, isGiven
-    
+
+  uniq = (array) ->
+    seen = {}
+    select array, (element) ->
+      if seen.hasOwnProperty(element)
+        false
+      else
+        seen[element] = true
+
   select = (array, tester) ->
     matches = []
     each array, (element) ->
@@ -359,19 +377,47 @@ up.util = (->
     element = document.documentElement
     width: element.clientWidth
     height: element.clientHeight
-    
+
+  # This is how Bootstrap does it also:
+  # https://github.com/twbs/bootstrap/blob/c591227602996c542b9fd0cb65cff3cc9519bdd5/dist/js/bootstrap.js#L1187
+  scrollbarWidth = memoize ->
+    $outer = $('<div>').css
+      position:  'absolute'
+      top:       '0'
+      left:      '0'
+      width:     '50px'
+      height:    '50px'
+      overflowY: 'scroll'
+    $outer.appendTo(document.body)
+    outer = $outer.get(0)
+    width = outer.offsetWidth - outer.clientWidth
+    $outer.remove()
+    width
+
+
+  ###*
+  Modifies the given function so it only runs once.
+  Subsequent calls will return the previous return value.
+
+  @method up.util.once
+  @private
+  ###
+  once = (fun) ->
+    result = undefined
+    ->
+      result = fun() if fun?
+      fun = undefined
+      result
+
   temporaryCss = ($element, css, block) ->
     oldCss = $element.css(keys(css))
-#    debug("Stored old CSS", oldCss)
     $element.css(css)
-    memo = ->
-#      debug("Restoring CSS %o on %o", oldCss, $element)
-      $element.css(oldCss)
+    memo = -> $element.css(oldCss)
     if block
       block()
       memo()
     else
-      memo
+      once(memo)
       
   forceCompositing = ($element) ->
     oldTransforms = $element.css(['transform', '-webkit-transform'])
@@ -512,8 +558,8 @@ up.util = (->
   escapePressed = (event) ->
     event.keyCode == 27
     
-  contains = (array, element) ->
-    array.indexOf(element) >= 0
+  contains = (stringOrArray, element) ->
+    stringOrArray.indexOf(element) >= 0
 
   castsToTrue = (object) ->
     String(object) == "true"
@@ -574,6 +620,19 @@ up.util = (->
       array.splice(index, 1)
       element
 
+  config = (factoryOptions = {}) ->
+    hash =
+      reset: ->
+        ownKeys = Object.getOwnPropertyNames(hash)
+        for key in ownKeys
+          delete hash[key] unless contains(apiKeys, key)
+        hash.update copy(factoryOptions)
+      update: (options) ->
+        extend(hash, options)
+    apiKeys = Object.getOwnPropertyNames(hash)
+    hash.reset()
+    hash
+
   presentAttr: presentAttr
   createElement: createElement
   normalizeUrl: normalizeUrl
@@ -596,6 +655,7 @@ up.util = (->
   detect: detect
   select: select
   compact: compact
+  uniq: uniq
   last: last
   isNull: isNull
   isDefined: isDefined
@@ -644,5 +704,8 @@ up.util = (->
   resolvableWhen: resolvableWhen
   setMissingAttrs: setMissingAttrs
   remove: remove
+  memoize: memoize
+  scrollbarWidth: scrollbarWidth
+  config: config
 
 )()

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

@@ -12,11 +12,6 @@ up.viewport = (->
 
   u = up.util
 
-  config =
-    duration: 0
-    view: 'body'
-    easing: 'swing'
-
   ###*
   @method up.viewport.defaults
   @param {Number} [options.duration]
@@ -24,8 +19,13 @@ up.viewport = (->
   @param {Number} [options.padding]
   @param {String|Element|jQuery} [options.view]
   ###
-  defaults = (options) ->
-    u.extend(config, options)
+  config = u.config
+    duration: 0
+    view: 'body'
+    easing: 'swing'
+
+  reset = ->
+    config.reset()
 
   SCROLL_PROMISE_KEY = 'up-scroll-promise'
 
@@ -114,10 +114,12 @@ up.viewport = (->
     else
       u.resolvedDeferred()
 
+  up.bus.on 'framework:reset', reset
+
   reveal: reveal
   scroll: scroll
   finishScrolling: finishScrolling
-  defaults: defaults
+  defaults: config.update
 
 )()
 

data/lib/assets/javascripts/up-bootstrap/modal-ext.js.coffee

@@ -0,0 +1,16 @@
+# Use BS `modal-dialog` and `modal-content` classes.
+# Also don't show a close button by default, since BS
+# expects user to add this manually within the content block.
+up.modal.defaults
+  template: """
+            <div class="up-modal">
+              <div class="up-modal-dialog modal-dialog">
+                <div class="up-modal-content modal-content"></div>
+              </div>
+            </div>
+            """
+
+# BS use the class `active` to highlight the current section
+# of a navigation bar.
+up.navigation.defaults
+  currentClass: 'active'

data/lib/assets/javascripts/up-bootstrap.js.coffee

@@ -0,0 +1 @@
+#= require_tree ./up-bootstrap

data/lib/assets/stylesheets/up/modal.css.sass

@@ -1,8 +1,11 @@
 $stratum: 10000
-//$width: 700px
-//$height: 450px
-$close-height: 24px
+$substratum-dialog:  1000
+$substratum-content: 2000
+$substratum-close:   3000
+
+$close-height: 36px
 $close-width: 36px
+$close-font-size: 34px
 
 =transform($transform)
   transform: $transform
@@ -17,22 +20,42 @@ $close-width: 36px
   right: 0
   z-index: $stratum
   background-color: rgba(90, 90, 90, 0.4)
+  overflow-x: hidden
+  overflow-y: scroll
+  // We prefer centering the dialog as an `inline-block`
+  // to giving it a horizontal margin of `auto`. This way
+  // the width of `.up-modal-dialog` is controlled by the
+  // contents of `.up-modal-content`.
+  text-align: center
 
 .up-modal-dialog
-  position: absolute
-  top: 50%
-  left: 50%
-  +transform(translate(-50%, -50%))
-  max-width: 100%
-  max-height: 100%
-  background-color: #fff
-  box-shadow: 0 0 10px 1px rgba(0, 0, 0, 0.3)
+  // The z-index lives in the stacking context of .up-modal
+  z-index: $substratum-dialog
+  // Make sure .up-modal-close is relative to the dialog
+  position: relative
   // In case someone sets padding on the dialog box,
   // the width and height attributes set by up.modal
   // should be honored exactly.
-  box-sizing: border-box 
+  box-sizing: border-box
+  margin: 30px 10px
+
+  // In case someone sets a huge width on the dialog.
+  max-width: 100%
+
+  // Make it grow with the width of .up-modal-content
+  display: inline-block
+  text-align: left
+
+.up-modal-content
+  // The z-index lives in the stacking context of .up-modal
+  z-index: $substratum-content
+  padding: 20px
+  background-color: #fff
+  box-shadow: 0 0 10px 1px rgba(0, 0, 0, 0.3)
 
 .up-modal-close
+  // The z-index lives in the stacking context of .up-modal
+  z-index: $substratum-close
   position: absolute
   right: 0
   top: 0
@@ -40,17 +63,7 @@ $close-width: 36px
   text-align: center
   line-height: $close-height
   height: $close-height
-  background-color: #999
-  color: #fff
-  font-weight: bold
-  text-transform: uppercase
+  font-size: $close-font-size
+  color: #666
   cursor: pointer
-  +transform(translateY(-100%))
 
-.up-modal-content
-  overflow-x: hidden
-  overflow-y: auto
-  width: 100%
-  height: 100%
-  padding: 20px
-  box-sizing: border-box

data/lib/assets/stylesheets/up/popup.css.sass

@@ -1,5 +1,4 @@
-$stratum: 10000
-$stratum-within-modal: 15000
+$stratum: 20000
 
 .up-popup
   z-index: $stratum
@@ -7,7 +6,3 @@ $stratum-within-modal: 15000
   background-color: #fff
   padding: 15px
   box-shadow: 0 0 4px rgba(0, 0, 0, 0.3)
-  
-.up-modal .up-popup
-  z-index: $stratum-within-modal
-  

data/lib/assets/stylesheets/up-bootstrap/modal-ext.css.sass

@@ -0,0 +1,9 @@
+.up-modal-dialog
+  // Up.js: Is an inline-block, centered with text-align
+  // BS: Is a block, centered with a horizontal margin of "auto"
+  display: block
+
+.up-modal-content
+  // Up.js: Gives some default padding
+  // BS: Expects content to set the padding
+  padding: 0

data/lib/assets/stylesheets/up-bootstrap.css.sass

@@ -0,0 +1 @@
+//= require_tree ./up-bootstrap

data/lib/assets/stylesheets/up.css.sass

@@ -0,0 +1,3 @@
+//= require_tree ./up
+
+

data/lib/upjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Upjs
   module Rails
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'
   end
 end

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    upjs-rails (0.7.8)
+    upjs-rails (0.8.0)
       rails (>= 3)
 
 GEM

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

@@ -31,6 +31,32 @@ describe 'up.modal', ->
           expect($('.up-modal-dialog .after')).not.toExist()
           done()
 
+      it "brings its own scrollbar, padding the body on the right in order to prevent jumping", (done) ->
+        promise = up.modal.open(url: '/foo', target: '.container')
+
+        jasmine.Ajax.requests.mostRecent().respondWith
+          status: 200
+          contentType: 'text/html'
+          responseText:
+            """
+            <div class="container">text</div>
+            """
+
+        promise.then ->
+
+          $modal = $('.up-modal')
+          $body = $('body')
+          expect($modal).toExist()
+          expect($modal.css('overflow-y')).toEqual('scroll')
+          expect($body.css('overflow-y')).toEqual('hidden')
+          expect(parseInt($body.css('padding-right'))).toBeAround(15, 10)
+
+          up.modal.close().then ->
+            expect($body.css('overflow-y')).toEqual('scroll')
+            expect(parseInt($body.css('padding-right'))).toBe(0)
+
+            done()
+
     describe 'up.modal.close', ->
 
       it 'should have tests'

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

@@ -34,6 +34,12 @@ describe 'up.navigation', ->
       expect($currentLink).toHaveClass('up-current')
       expect($otherLink).not.toHaveClass('up-current')
 
+    it 'allows to configure a custom "current" class, but always also sets .up-current', ->
+      up.navigation.defaults(currentClass: 'highlight')
+      spyOn(up.browser, 'url').and.returnValue('/foo')
+      $currentLink = up.ready(affix('a[href="/foo"]'))
+      expect($currentLink).toHaveClass('highlight up-current')
+
     if up.browser.canPushState()
       
       it 'marks a link as .up-current if it links to the current URL, but is missing a trailing slash', ->

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

@@ -56,3 +56,27 @@ describe 'up.util', ->
         array = ['foo', 'bar', 'baz']
         tester = (element) -> element[0] == 'z'
         expect(up.util.detect(array, tester)).toBeNull()
+
+    describe '.config', ->
+
+      it 'creates an object with the given attributes', ->
+        object = up.util.config(a: 1, b: 2)
+        expect(object.a).toBe(1)
+        expect(object.b).toBe(2)
+
+      it 'provies an #update method that merges the given options into the object', ->
+        object = up.util.config(a: 1)
+        object.update(b: 2, c: 3)
+        expect(object.b).toBe(2)
+        expect(object.c).toBe(3)
+
+      it 'provides a #reset method that resets the object to its original state', ->
+        object = up.util.config(a: 1)
+        expect(object.b).toBeUndefined()
+        object.b = 2
+        expect(object.b).toBe(2)
+        object.reset()
+        expect(object.b).toBeUndefined()
+        # Make sure that resetting doesn't remove #reset or #update
+        expect(object.reset).toBeDefined()
+        expect(object.update).toBeDefined()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,10 +76,16 @@ files:
 - design/draft.html.erb
 - design/draft.rb
 - design/rename.txt
+- dist/up-bootstrap.css
+- dist/up-bootstrap.js
+- dist/up-bootstrap.min.css
+- dist/up-bootstrap.min.js
 - dist/up.css
 - dist/up.js
 - dist/up.min.css
 - dist/up.min.js
+- lib/assets/javascripts/up-bootstrap.js.coffee
+- lib/assets/javascripts/up-bootstrap/modal-ext.js.coffee
 - lib/assets/javascripts/up.js.coffee
 - lib/assets/javascripts/up/browser.js.coffee
 - lib/assets/javascripts/up/bus.js.coffee
@@ -98,7 +104,9 @@ files:
 - lib/assets/javascripts/up/tooltip.js.coffee
 - lib/assets/javascripts/up/util.js.coffee
 - lib/assets/javascripts/up/viewport.js.coffee
-- lib/assets/stylesheets/up.css
+- lib/assets/stylesheets/up-bootstrap.css.sass
+- lib/assets/stylesheets/up-bootstrap/modal-ext.css.sass
+- lib/assets/stylesheets/up.css.sass
 - lib/assets/stylesheets/up/close.css.sass
 - lib/assets/stylesheets/up/error.css.sass
 - lib/assets/stylesheets/up/link.css.sass

data/lib/assets/stylesheets/up.css

@@ -1,3 +0,0 @@
-/*
- *= require_tree .
- */