0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

revert 3624

Browse source
This commit is contained in:
rolux 2015-02-05 11:02:38 +05:30
parent 5835cbc38c
commit 36ffd07203
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/UI/js/Core/URL.js
View file

@ -21,10 +21,9 @@ Ox.URL <f> URL controller
callback <f> callback function callback <f> callback function
getPart <f> Tests if a string matches a part (page section) getPart <f> Tests if a string matches a part (page section)
May modify the state's part property May modify the state's part property
(state, string, parts, callback) -> <u> undefined (state, string, callback) -> <u> undefined
state <o> State object state <o> State object
string <s> The string to be tested string <s> The string to be tested
parts <[s]> Array of additional parts
callback <f> callback function callback <f> callback function
getSort <f> Tests if a sort object is valid (for the current item) getSort <f> Tests if a sort object is valid (for the current item)
May modify the state's sort properties May modify the state's sort properties
@ -538,9 +537,6 @@ Ox.URL = function(options) {
parts.push(state.page); parts.push(state.page);
if (state.part) { if (state.part) {
parts.push(state.part); parts.push(state.part);
if (state.parts) {
parts = parts.concat(state.parts);
}
} }
} else { } else {
if (self.options.types.indexOf(state.type) > 0) { if (self.options.types.indexOf(state.type) > 0) {
@ -794,8 +790,8 @@ Ox.URL = function(options) {
state.page = parts[0]; state.page = parts[0];
parts.shift(); parts.shift();
if (parts.length) { if (parts.length) {
// may modify state.part, state.page // may modify state.part
self.options.getPart(state, decodeValue(parts[0]), parts.slice(1), getHash); self.options.getPart(state, decodeValue(parts[0]), getHash);
} else { } else {
getHash(); getHash();
} }