Commit 7b3118fb authored by Sven Franck's avatar Sven Franck

switched to url-encoding page ids

parent 122a726b
...@@ -3263,16 +3263,16 @@ ...@@ -3263,16 +3263,16 @@
container = factory.element( container = factory.element(
"div", "div",
{ {
"id": url_dict.id, "id": window.encodeURIComponent(url_dict.id),
//"id": url_dict.id,
"className": " ui-page " + ("ui-page-theme-" + "className": " ui-page " + ("ui-page-theme-" +
content_dict.theme || "") + " " + ((content_dict.fix && content_dict.theme || "") + " " + ((content_dict.fix &&
content_dict.fix === false) ? "" : content_dict.fix === false) ? "" :
" ui-page-header-fixed ui-page-footer-fixed") " ui-page-header-fixed ui-page-footer-fixed")
}, },
{ {
"data-module": url_dict.id,
"data-role": "page", "data-role": "page",
// NOTE: cheat JQM, until deeplinks are possible! // NOTE: cheat JQM, until query-params are possible!
"data-url": split_url[1] ? split_url[1].split("?")[0] : "data-url": split_url[1] ? split_url[1].split("?")[0] :
split_url[0], split_url[0],
"data-external-page": true, "data-external-page": true,
...@@ -5405,7 +5405,6 @@ ...@@ -5405,7 +5405,6 @@
break; break;
case "add": case "add":
config.mode = "add"; config.mode = "add";
//backup = 1;
break; break;
case "config": case "config":
config.mode = "config"; config.mode = "config";
...@@ -6406,7 +6405,9 @@ ...@@ -6406,7 +6405,9 @@
config = app.generateLinkObject(raw_url); config = app.generateLinkObject(raw_url);
if (e) { if (e) {
page = document.getElementById(raw_url.split("#").pop()); page = document.getElementById(
window.encodeURIComponent(raw_url.split("#").pop())
);
base = page ? page.getAttribute("data-external-page") : null; base = page ? page.getAttribute("data-external-page") : null;
first = $.mobile.firstPage[0].id === config.id; first = $.mobile.firstPage[0].id === config.id;
...@@ -6555,7 +6556,6 @@ ...@@ -6555,7 +6556,6 @@
* @method preventFilterableTrigger * @method preventFilterableTrigger
* @params {object} element Filterable element * @params {object} element Filterable element
*/ */
// TODO: make sure this triggers only once!
app.preventFilterableTrigger = function (element) { app.preventFilterableTrigger = function (element) {
$(element).on("filterablebeforefilter", function (e) { $(element).on("filterablebeforefilter", function (e) {
e.preventDefault(); e.preventDefault();
...@@ -6903,7 +6903,7 @@ ...@@ -6903,7 +6903,7 @@
if (kid.tagName === "DIV") { if (kid.tagName === "DIV") {
if (util.testForString("ui-page", kid.className)) { if (util.testForString("ui-page", kid.className)) {
return kid.id || kid.getAttribute("data-module"); return kid.id;
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment