Do not override the default history object.

fix #588
This commit is contained in:
Antoine Nguyen
2014-07-28 20:12:49 +02:00
parent 1d4bba0779
commit 1a80545f27
3 changed files with 10 additions and 10 deletions
@@ -20,7 +20,7 @@ function removefilter(evt) {
url: $this.attr("href"),
dataType: 'json'
}).done(function(response) {
history.update(true);
histomanager.update(true);
$("body").notify('success', response, 2000);
});
}
@@ -30,7 +30,7 @@ function removefilter(evt) {
*/
function changefs(evt) {
evt.preventDefault();
history.baseurl($(this).val()).update();
histomanager.baseurl($(this).val()).update();
}
/*
@@ -48,7 +48,7 @@ function init_filters_list() {
* It updates the middle DIV and initializes the user interface.
*/
function loadfs(response) {
curscript = history.getbaseurl();
curscript = histomanager.getbaseurl();
$("#curfset").val(curscript);
$("#set_content").html(response.content);
@@ -78,7 +78,7 @@ function send_command(cmd, extracb) {
extracb(response);
}
if (!response.norefresh) {
history.update(true);
histomanager.update(true);
}
$("body").notify('success', response.respmsg, 2000);
});
@@ -133,7 +133,7 @@ function removefs(evt) {
var $curfset = $("#curfset");
$curfset.find("option[value='" + curscript + "']").remove();
history.baseurl(response.newfs, 1);
histomanager.baseurl(response.newfs, 1);
});
}
@@ -206,7 +206,7 @@ function filterset_created(data) {
}
});
}
history.baseurl(data.url, 1).update(1);
histomanager.baseurl(data.url, 1).update(1);
}
function filtersetform_cb() {
@@ -240,4 +240,4 @@ function fetch_templates(url, container) {
result = data;
});
return result;
}
}
@@ -7,7 +7,7 @@
<script type="text/javascript" src="{{ STATIC_URL }}js/dynamic_input.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}sievefilters/js/jquery.dynfields.js"></script>
<script type="text/javascript">
var history = new History({
var histomanager = new History({
deflocation: "{{ default_script }}",
defcallback: loadfs
});
+2 -2
View File
@@ -174,7 +174,7 @@ function simple_ajax_form_post(e, options) {
if (opts.reload_mode == 'full') {
window.location.reload();
} else {
history.update(true);
histomanager.update(true);
}
}
if (data) {
@@ -323,4 +323,4 @@ $(document).ready(function() {
$(document).on('click', 'a[data-toggle="ajaxmodal-autowidth"]', modalbox_autowidth);
$(document).on('click', '.activator', activate_widget);
$(".help").popover({trigger: 'hover'}).click(function(e) {e.preventDefault();});
});
});