Skip to content
Snippets Groups Projects
Commit 4b02d243 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

No AJAX record tab improvements.

parent 09ceb88f
No related merge requests found
...@@ -152,7 +152,7 @@ function ajaxLoadTab(tabid) { ...@@ -152,7 +152,7 @@ function ajaxLoadTab(tabid) {
// we're flagged to skip AJAX for this tab, just return true and let the // we're flagged to skip AJAX for this tab, just return true and let the
// browser handle it. // browser handle it.
var urlroot = document.URL.match(new RegExp('/[^/]+/'+id)); var urlroot = document.URL.match(new RegExp('/[^/]+/'+id));
if(!urlroot || document.getElementById(tabid).parentNode.className.indexOf('noajax') > -1) { if(!urlroot) {
return true; return true;
} }
$.ajax({ $.ajax({
...@@ -221,9 +221,12 @@ $(document).ready(function(){ ...@@ -221,9 +221,12 @@ $(document).ready(function(){
registerTabEvents(); registerTabEvents();
$('ul.recordTabs a').click(function (e) { $('ul.recordTabs a').click(function (e) {
if($(this).parents('li.active').length > 0) { // Follow active and noajax tabs
var $li = $(this).parent();
if($li.hasClass('active') || $li.hasClass('noajax')) {
return true; return true;
} }
// Load tab
var tabid = $(this).attr('id').toLowerCase(); var tabid = $(this).attr('id').toLowerCase();
if($('#'+tabid+'-tab').length > 0) { if($('#'+tabid+'-tab').length > 0) {
$('#record-tabs .tab-pane.active').removeClass('active'); $('#record-tabs .tab-pane.active').removeClass('active');
......
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