Commit eb3d8ccd authored by Sven Franck's avatar Sven Franck

various bugfixes and API cleanup

parent 5b48b8c2
[ [
{ {
"application_image_type": "image", "application_image_type": "image",
"application_image_url": "http://task-manager.site44.com/js/lib/jquerymobile/images/home.png", "application_image_url": "http://www.officejs.com/app/task_manager/js/lib/jquerymobile/images/home.png",
"application_toc_accept": true, "application_toc_accept": true,
"application_published":"08/11/2013", "application_published":"08/11/2013",
"application_submitted":"08/11/2013", "application_submitted":"08/11/2013",
......
...@@ -208,15 +208,15 @@ ...@@ -208,15 +208,15 @@
} }
} }
}, },
"category_href": { "category_url": {
"type":"StringField", "type":"StringField",
"widget": { "widget": {
"id": "category_href", "id": "category_url",
"title": "URL parameter", "title": "URL parameter",
"title_i18n": "category.field_list.url_parameter.title", "title_i18n": "category.field_list.url_parameter.title",
"description": "URL parameter to be used for this category.", "description": "URL parameter to be used for this category.",
"description_i18n": "category.field_list.url_parameter.description", "description_i18n": "category.field_list.url_parameter.description",
"alternate_name": "category_href", "alternate_name": "category_url",
"default_value": null, "default_value": null,
"css_class": null, "css_class": null,
"hidden": null, "hidden": null,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"category_description": "Customer Relationship Management", "category_description": "Customer Relationship Management",
"category_image_url": "group", "category_image_url": "group",
"category_image_type": "icon", "category_image_type": "icon",
"category_href": "#contacts", "category_url": "#contacts",
"category_title_i18n": "category.custom.contacts.title", "category_title_i18n": "category.custom.contacts.title",
"category_description_i18n":"category.custom.contacts.description" "category_description_i18n":"category.custom.contacts.description"
}, },
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"category_description": "Form Workflows", "category_description": "Form Workflows",
"category_image_url": "cogs", "category_image_url": "cogs",
"category_image_type": "icon", "category_image_type": "icon",
"category_href": "#database", "category_url": "#database",
"category_title_i18n": "category.custom.database.title", "category_title_i18n": "category.custom.database.title",
"category_description_i18n":"category.custom.database.description" "category_description_i18n":"category.custom.database.description"
}, },
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"category_description": "Productivity Tools", "category_description": "Productivity Tools",
"category_image_url": "file-text-alt", "category_image_url": "file-text-alt",
"category_image_type": "icon", "category_image_type": "icon",
"category_href": "#documents", "category_url": "#documents",
"category_title_i18n": "category.custom.documents.title", "category_title_i18n": "category.custom.documents.title",
"category_description_i18n":"category.custom.documents.description" "category_description_i18n":"category.custom.documents.description"
}, },
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
"category_description": "Task and Project Management", "category_description": "Task and Project Management",
"category_image_url": "tasks", "category_image_url": "tasks",
"category_image_type": "icon", "category_image_type": "icon",
"category_href": "#projects", "category_url": "#projects",
"category_title_i18n": "category.custom.projects.title", "category_title_i18n": "category.custom.projects.title",
"category_description_i18n":"category.custom.projects.description" "category_description_i18n":"category.custom.projects.description"
}, },
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"category_description": "Image Drawing and Editing", "category_description": "Image Drawing and Editing",
"category_image_url": "edit", "category_image_url": "edit",
"category_image_type": "icon", "category_image_type": "icon",
"category_href": "#drawings", "category_url": "#drawings",
"category_title_i18n": "category.custom.drawings.title", "category_title_i18n": "category.custom.drawings.title",
"category_description_i18n":"category.custom.drawings.description" "category_description_i18n":"category.custom.drawings.description"
}, },
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
"category_description": "Data Analysis Tools", "category_description": "Data Analysis Tools",
"category_image_url": "filter", "category_image_url": "filter",
"category_image_type": "icon", "category_image_type": "icon",
"category_href": "#reports", "category_url": "#reports",
"category_title_i18n": "category.custom.reports.title", "category_title_i18n": "category.custom.reports.title",
"category_description_i18n":"category.custom.reports.description" "category_description_i18n":"category.custom.reports.description"
} }
......
...@@ -326,8 +326,8 @@ ...@@ -326,8 +326,8 @@
clean = property.replace((replace + "_"), ""); clean = property.replace((replace + "_"), "");
switch (clean) { switch (clean) {
case "href": case "url":
obj[clean] = item[property]; obj["href"] = item[property];
split = item[property].split("//"); split = item[property].split("//");
if (split.length > 1) { if (split.length > 1) {
...@@ -3856,15 +3856,15 @@ ...@@ -3856,15 +3856,15 @@
if (document.getElementById(raw_url.split("#").pop()) || if (document.getElementById(raw_url.split("#").pop()) ||
raw_url === $.mobile.getDocumentUrl() || raw_url === $.mobile.getDocumentUrl() ||
data.options.role === "popup") { data.options.role === "popup") {
console.log("let JQM go") // console.log("let JQM go, but stop us!")
return; return;
} }
if (document.getElementById(config.id)) { if (document.getElementById(config.id)) {
console.log("stop JQM") // console.log("stop JQM")
e.preventDefault(); e.preventDefault();
return; return;
} }
console.log("HIJACK and stop JQM") // console.log("HIJACK and stop JQM")
handle = true; handle = true;
e.preventDefault(); e.preventDefault();
...@@ -3889,11 +3889,14 @@ ...@@ -3889,11 +3889,14 @@
if (config.deeplink) { if (config.deeplink) {
create = true; create = true;
} }
// prevent browser loading hash?query.json
if (config.layout_identifier.split("?").length > 1) { if (config.layout_identifier.split("?").length > 1) {
destination = config.layout_identifier.split("?")[0]; destination = config.layout_identifier.split("?")[0];
} else { } else {
destination = config.layout_identifier; destination = config.layout_identifier;
} }
init.fetchPageLayouts("settings", destination) init.fetchPageLayouts("settings", destination)
.then(function (reply) { .then(function (reply) {
return init.setPageElements( return init.setPageElements(
......
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