From fadf0325925460e44fed855259d05e113bcd0178 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Fri, 12 Jul 2013 11:00:51 +0200
Subject: [PATCH] Ox.URL: invoke getSpan for durations

---
 source/Ox.UI/js/Core/URL.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/Ox.UI/js/Core/URL.js b/source/Ox.UI/js/Core/URL.js
index 1f327497..126df534 100644
--- a/source/Ox.UI/js/Core/URL.js
+++ b/source/Ox.UI/js/Core/URL.js
@@ -25,11 +25,11 @@ Ox.URL <f> URL controller
             state <o> State object
             string <s> The string to be tested
             callback <f> callback function
-        getSpan <f> Tests if a string matches a span
+        getSpan <f> Tests if a value matches a span
             May modify the state's view and span properties
             (state, string, callback) -> <u> undefined
             state <o> State object
-            string <s> The string to be tested
+            value <[n]|s> The value to be tested
             callback <f> Callback function
         pages <[s]> List of pages
         sortKeys <o> Sort keys for list and item views for all types
@@ -773,7 +773,7 @@ Ox.URL = function(options) {
             parts.shift();
             if (parts.length) {
                 // may modify state.part
-                self.options.getPart(state, parts[0], getHash);
+                self.options.getPart(state, decodeValue(parts[0]), getHash);
             } else {
                 getHash();
             }
@@ -796,7 +796,7 @@ Ox.URL = function(options) {
                     parseBeyondItem();
                 } else {
                     // test for item id or name
-                    self.options.getItem(state, parts[0].replace(/%20/g, ' '), function() {
+                    self.options.getItem(state, decodeValue(parts[0]), function() {
                         // may have modified state.item
                         if (state.item) {
                             parts.shift();
@@ -857,7 +857,10 @@ Ox.URL = function(options) {
                         }
                     }
                 }
-                if (!state.span && /^[A-Z@]/.test(parts[0])) {
+                if (state.span && spanType == 'duration') {
+                    // test duration, may modify state.span
+                    self.options.getSpan(state, state.span, parseBeyondSpan);
+                } else if (!state.span && /^[A-Z@]/.test(parts[0])) {
                     // test for span id or name
                     self.options.getSpan(state, decodeValue(parts[0]), function() {
                         // may have modified state.view and state.span