135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update browser history for reports

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-02 20:14:23 +00:00
parent f716582700
commit 08968afca0
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Netdisco/share/views/js/common.js
View File

@@ -27,18 +27,29 @@
} }
// update browser search history with the new query. // update browser search history with the new query.
// however if it's the same tab, this is a *replace* of the query url. // support history add (push) or replace via push parameter
// and just skip this bit if it's the report or admin display. function update_browser_history (tab, pgtitle, push) {
function update_browser_history (tab, pgtitle) {
var form = '#' + tab + '_form'; var form = '#' + tab + '_form';
var query = $(form).serialize(); var query = $(form).serialize();
if (query.length) { query = '?' + query }
if (window.History && window.History.enabled) { if (window.History && window.History.enabled) {
is_from_history_plugin = 1; is_from_history_plugin = 1;
window.History.replaceState(
{name: tab, fields: $(form).serializeArray()}, if (push.length) {
pgtitle, uri_base + '/' + path + '?' + query var target = uri_base + '/' + path + '/' + tab + query;
); if (location.pathname == target) { return };
window.History.pushState(
{name: tab, fields: $(form).serializeArray()}, pgtitle, target
);
}
else {
var target = uri_base + '/' + path + query;
window.History.replaceState(
{name: tab, fields: $(form).serializeArray()}, pgtitle, target
);
}
is_from_history_plugin = 0; is_from_history_plugin = 0;
} }
} }
@@ -64,7 +75,7 @@
$('[% "#${tab.tag}_form" %]').submit(function (event) { $('[% "#${tab.tag}_form" %]').submit(function (event) {
var pgtitle = update_page_title('[% tab.tag %]'); var pgtitle = update_page_title('[% tab.tag %]');
copy_navbar_to_sidebar('[% tab.tag %]'); copy_navbar_to_sidebar('[% tab.tag %]');
update_browser_history('[% tab.tag %]', pgtitle); update_browser_history('[% tab.tag %]', pgtitle, '');
update_csv_download_link('search', '[% tab.tag %]', '[% tab.provides_csv %]'); update_csv_download_link('search', '[% tab.tag %]', '[% tab.provides_csv %]');
do_search(event, '[% tab.tag %]'); do_search(event, '[% tab.tag %]');
}); });
@@ -77,7 +88,7 @@
$('[% "#${tab.tag}_form" %]').submit(function (event) { $('[% "#${tab.tag}_form" %]').submit(function (event) {
var pgtitle = update_page_title('[% tab.tag %]'); var pgtitle = update_page_title('[% tab.tag %]');
copy_navbar_to_sidebar('[% tab.tag %]'); copy_navbar_to_sidebar('[% tab.tag %]');
update_browser_history('[% tab.tag %]', pgtitle); update_browser_history('[% tab.tag %]', pgtitle, '');
update_csv_download_link('device', '[% tab.tag %]', '[% tab.provides_csv %]'); update_csv_download_link('device', '[% tab.tag %]', '[% tab.provides_csv %]');
[% IF tab.tag == 'ports' %] [% IF tab.tag == 'ports' %]
@@ -111,7 +122,8 @@
[% IF report %] [% IF report %]
// for the report pages // for the report pages
$('[% "#${report.tag}_form" %]').submit(function (event) { $('[% "#${report.tag}_form" %]').submit(function (event) {
update_page_title('[% report.tag %]'); var pgtitle = update_page_title('[% report.tag %]');
update_browser_history('[% report.tag %]', pgtitle, '1');
update_csv_download_link('report', '[% report.tag %]', '1'); update_csv_download_link('report', '[% report.tag %]', '1');
do_search(event, '[% report.tag %]'); do_search(event, '[% report.tag %]');
}); });