dist/up.js in upjs-rails-0.7.1 vs dist/up.js in upjs-rails-0.7.2
- old
+ new
@@ -4361,11 +4361,11 @@
up.navigation = (function() {
var CLASS_ACTIVE, CLASS_CURRENT, SELECTORS_SECTION, SELECTOR_ACTIVE, SELECTOR_SECTION, SELECTOR_SECTION_INSTANT, enlargeClickArea, locationChanged, normalizeUrl, sectionClicked, sectionUrls, selector, u, unmarkActive;
u = up.util;
CLASS_ACTIVE = 'up-active';
CLASS_CURRENT = 'up-current';
- SELECTORS_SECTION = ['a', '[up-href]'];
+ SELECTORS_SECTION = ['a', '[up-href]', '[up-alias]'];
SELECTOR_SECTION = SELECTORS_SECTION.join(', ');
SELECTOR_SECTION_INSTANT = ((function() {
var i, len, results;
results = [];
for (i = 0, len = SELECTORS_SECTION.length; i < len; i++) {
@@ -4382,29 +4382,34 @@
stripTrailingSlash: true
});
}
};
sectionUrls = function($section) {
- var attr, i, len, ref, url, urls;
+ var aliases, attr, i, len, ref, urls, value, values;
urls = [];
- ref = ['up-href', 'href'];
+ ref = ['href', 'up-href'];
for (i = 0, len = ref.length; i < len; i++) {
attr = ref[i];
- if (url = u.presentAttr($section, attr)) {
- url = normalizeUrl(url);
- urls.push(url);
+ if (value = u.presentAttr($section, attr)) {
+ urls.push(value);
}
}
- return urls;
+ if (aliases = u.presentAttr($section, 'up-alias')) {
+ values = aliases.split(' ');
+ urls = urls.concat(values);
+ }
+ return urls.map(normalizeUrl);
};
locationChanged = function() {
var currentUrls;
currentUrls = u.stringSet([normalizeUrl(up.browser.url()), normalizeUrl(up.modal.source()), normalizeUrl(up.popup.source())]);
+ console.log("current urls", normalizeUrl(up.browser.url()), normalizeUrl(up.modal.source()), normalizeUrl(up.popup.source()));
return u.each($(SELECTOR_SECTION), function(section) {
var $section, urls;
$section = $(section);
urls = sectionUrls($section);
+ console.log("urls %o", urls);
if (currentUrls.includesAny(urls)) {
return $section.addClass(CLASS_CURRENT);
} else {
return $section.removeClass(CLASS_CURRENT);
}
@@ -4488,9 +4493,10 @@
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
+ - a space-separated list of URLs in the link's `up-alias` attribute
@method [up-current]
@ujs
*/
up.bus.on('fragment:ready', function() {