Commit be2f30fc authored by Sven Franck's avatar Sven Franck

bugfix: don't reload jIO when going back and forth

parent 681af6a3
...@@ -223,7 +223,6 @@ ...@@ -223,7 +223,6 @@
//<![CDATA[ //<![CDATA[
// initialize jio_config // initialize jio_config
if ($.fn.fauna.jio_item_config === undefined) { if ($.fn.fauna.jio_item_config === undefined) {
$.fn.fauna.jio_item_config = jIO.newJio({ $.fn.fauna.jio_item_config = jIO.newJio({
"type": "local", "type": "local",
"username": "item_config", "username": "item_config",
...@@ -294,55 +293,64 @@ ...@@ -294,55 +293,64 @@
.filter(function() { return $(this).jqmData('bound') !== true; }) .filter(function() { return $(this).jqmData('bound') !== true; })
.jqmData('bound', true) .jqmData('bound', true)
.on('click', 'a', function (e) { .on('click', 'a', function (e) {
var m, formdata, ajaxObject;
e.preventDefault(); e.preventDefault();
var m, formdata = $("form[name=compare]").serialize(), // only pull once!
if ($.fn.fauna.items_loaded === undefined) {
$.fn.fauna.items_loaded = true;
formdata = $("form[name=compare]").serialize();
ajaxObject = { ajaxObject = {
url: "../data/stats.json", url: "../data/stats.json",
type: "post", type: "post",
returnformat: "JSON", returnformat: "JSON",
handleDataInResponse: "true", handleDataInResponse: "true",
formdata : formdata, formdata : formdata,
successHandler : function (data) { successHandler : function (data) {
var m, lookUp, provider, lookup; var m, lookUp, provider, lookup;
$.fn.util.spin('show'); $.fn.util.spin('show');
for (machine in data) { for (machine in data) {
if (data.hasOwnProperty(machine)) { if (data.hasOwnProperty(machine)) {
m = data[machine]; m = data[machine];
lookUp = $.fn.fauna.jio_machine_config[machine]; lookUp = $.fn.fauna.jio_machine_config[machine];
if (lookUp !== undefined) { if (lookUp !== undefined) {
provider = lookUp["provider"]; provider = lookUp["provider"];
alias = lookUp["alias"]; alias = lookUp["alias"];
searchtext = lookUp["alias"].toLowerCase() +", " searchtext = lookUp["alias"].toLowerCase() +", "
+ lookUp["provider"].toLowerCase() + ", " + lookUp["provider"].toLowerCase() + ", "
+ machine.toLowerCase(); + machine.toLowerCase();
} else { } else {
provider = ""; provider = "";
alias = ""; alias = "";
searchtext = ""; searchtext = "";
}
$.fn.fauna.jio_item_config.put({
"_id": machine,
"searchtext": searchtext,
"alias": alias,
"provider": provider,
"init": m["init"],
"last": m["last"],
"downtime":m["machine_downtime"],
"totaltime":m["totaltime"],
"percentile":m["percentile"],
"ts":new Date()
});
} }
$.fn.fauna.jio_item_config.put({
"_id": machine,
"searchtext": searchtext,
"alias": alias,
"provider": provider,
"init": m["init"],
"last": m["last"],
"downtime":m["machine_downtime"],
"totaltime":m["totaltime"],
"percentile":m["percentile"],
"ts":new Date()
});
} }
$.fn.util.spin('hide');
// go to results page, this should be inside search callback
$.mobile.changePage('results.html', {transition: 'fade'});
},
errorHandler : function (XMLHttpRequest, textStatus, errorThrown) {
//
} }
$.fn.util.spin('hide');
// go to results page
$.mobile.changePage('results.html', {transition: 'fade'});
},
errorHandler : function (XMLHttpRequest, textStatus, errorThrown) {
//
}
}; };
$.fn.util.ajaxFormSubmit(ajaxObject); // get records
$.fn.util.ajaxFormSubmit(ajaxObject);
} else {
// go to results page - inside a search callback!!!
$.mobile.changePage('results.html', {transition: 'fade'});
}
}); });
$(document).ready(function() { $(document).ready(function() {
......
...@@ -10,9 +10,9 @@ define([], function () { ...@@ -10,9 +10,9 @@ define([], function () {
function (i18n) { function (i18n) {
var fauna = {}, // application environment (PUBLIC-settings) var fauna = {}, // application environment (PUBLIC-settings)
flora = { flora = { // user environment (PRIVATE)
items_good_until: new Date("March 20, 2013 00:00:00") items_good_until: new Date("March 20, 2013 00:00:00")
}, // user environment (PRIVATE) },
util = {} // utility functions (PUBLIC) util = {} // utility functions (PUBLIC)
util = { util = {
...@@ -187,9 +187,6 @@ define([], function () { ...@@ -187,9 +187,6 @@ define([], function () {
// enhancing gadgets when everyone else is done // enhancing gadgets when everyone else is done
$(document).on('render_enhance', function(e, data) { $(document).on('render_enhance', function(e, data) {
data.gadget.trigger("create"); data.gadget.trigger("create");
// if (data.callback !== undefined) {
// data.callback();
// }
}); });
......
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