navigation.js.coffee in upjs-rails-0.12.2

- old
+ new

@@ -19,11 +19,11 @@
   Sets default options for this module.
 
   @method up.navigation.config
   @property
   @param {Number} [config.currentClasses]
-    An array of classes to set on [links that point the current location](#up-current).
+    An array of classes to set on [links that point the current location](/up-current).
   ###
   config = u.config
     currentClasses: ['up-current']
 
   reset = ->
@@ -79,15 +79,16 @@
       u.detect(testUrls, matches)
 
     matchesAny: matchesAny
 
   locationChanged = ->
-
     currentUrls = urlSet([
       normalizeUrl(up.browser.url()),
-      normalizeUrl(up.modal.source()),
-      normalizeUrl(up.popup.source())
+      normalizeUrl(up.modal.url()),
+      normalizeUrl(up.modal.coveredUrl()),
+      normalizeUrl(up.popup.url()),
+      normalizeUrl(up.popup.coveredUrl())
     ])
 
     klass = currentClass()
 
     u.each $(SELECTOR_SECTION), (section) ->
@@ -174,10 +175,10 @@
   - the source URL of a currently opened [popup overlay](/up.popup)
 
   A link matches the current location (and is marked as `.up-current`) if it matches either:
 
   - the link's `href` attribute
-  - the link's [`up-href`](/up.link#turn-any-element-into-a-link) attribute
+  - the link's [`up-href`](#turn-any-element-into-a-link) attribute
   - a space-separated list of URLs in the link's `up-alias` attribute
 
   \#\#\#\# Matching URL by prefix
 
   You can mark a link as `.up-current` whenever the current URL matches a prefix.