- added missing changes from previous commits

Marius Cramer

2014-05-08 bb252afbd745bdf3d14571c6b7aef6c771071f80

- added missing changes from previous commits

 interface/web/js/scrigo.js.php

@@ -88,7 +88,9 @@
    }
}

function onAfterContentLoad() {
function onAfterContentLoad(url, data) {
    if(!data) data = '';
    else data = '&' + data;
<?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
@@ -96,7 +98,7 @@
<?php
}
?>
    callHook('onAfterContentLoad');
    callHook('onAfterContentLoad', {'url': url, 'data': data });
}

function loadContentRefresh(pagename) {
@@ -112,7 +114,7 @@
                                            success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                                jQuery('#pageContent').html(jqXHR.responseText);
                                                onAfterContentLoad();
                                                onAfterContentLoad(pagename, "refresh="+document.getElementById('refreshinterval').value);
                                                pageFormChanged = false;
                                            },
                                            error: function() {
@@ -191,7 +193,7 @@
                                                    document.location.href = 'index.php';
                                                } else {
                                                    jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad('content.php', jQuery('#'+formname).serialize());
                                                    pageFormChanged = false;
                                                }
                                                loadMenus();
@@ -229,7 +231,7 @@
                                                    //window.setTimeout('loadContent(redirect)', 1000);
                                                } else {
                                                    jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad(target, jQuery('#'+formname).serialize());
                                                    pageFormChanged = false;
                                                }
                                                hideLoadIndicator();
@@ -268,7 +270,7 @@
                                                    //window.setTimeout('loadContent(redirect)', 1000);
                                                } else {
                                                    jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad(target, jQuery('#'+formname).serialize());
                                                    pageFormChanged = false;
                                                }
                                                hideLoadIndicator();
@@ -346,7 +348,7 @@
                                                    //jQuery.each(reponseScript, function(idx, val) { eval(val.text); } );

                                                    jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad(pagename, (params ? params : null));
                                                    pageFormChanged = false;
                                                }
                                                hideLoadIndicator();
@@ -373,7 +375,7 @@
                                                    loadContent(parts[1]);
                                                } else {
                                                    jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad('content.php', "s_mod=login&s_pg=index");
                                                    pageFormChanged = false;
                                                }
                                                hideLoadIndicator();