Skip to content

Commit d0490d1

Browse files
falkotimmefalkotimme
committed
- Changed scrigo.js.php to allow JavaScript inside content loaded through Ajax.
1 parent 472ad25 commit d0490d1

File tree

1 file changed

+36
-11
lines changed

1 file changed

+36
-11
lines changed

‎interface/web/js/scrigo.js.php‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ function loadContentRefresh(pagename) {
3030
if(document.getElementById('refreshinterval').value > 0) {
3131
/*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename+"&refresh="+document.getElementById('refreshinterval').value, pageContentCallbackRefresh);*/
3232
var pageContentObject2 = jQuery.ajax({ type: "GET",
33-
url: pagename,
33+
url: pagename,
3434
data: "refresh="+document.getElementById('refreshinterval').value,
35+
dataType: "html",
3536
success: function(data, textStatus, jqXHR) {
36-
document.getElementById('pageContent').innerHTML = jqXHR.responseText;
37+
//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
38+
jQuery('#pageContent').html(jqXHR.responseText);
3739
},
3840
error: function() {
3941
reportError('Ajax Request was not successful.'+pagename);
@@ -66,6 +68,7 @@ function capp(module) {
6668
var submitFormObj = jQuery.ajax({ type: "GET",
6769
url: "capp.php",
6870
data: "mod="+module,
71+
dataType: "html",
6972
success: function(data, textStatus, jqXHR) {
7073
if(jqXHR.responseText != '') {
7174
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
@@ -103,6 +106,7 @@ function submitLoginForm(formname) {
103106
var submitFormObj = jQuery.ajax({ type: "POST",
104107
url: "content.php",
105108
data: jQuery('#'+formname).serialize(),
109+
dataType: "html",
106110
success: function(data, textStatus, jqXHR) {
107111
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
108112
var parts = jqXHR.responseText.split(':');
@@ -114,7 +118,8 @@ function submitLoginForm(formname) {
114118
// Go to the login page
115119
document.location.href = 'index.php';
116120
} else {
117-
document.getElementById('pageContent').innerHTML = jqXHR.responseText;
121+
//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
122+
jQuery('#pageContent').html(jqXHR.responseText);
118123
}
119124
loadMenus();
120125
},
@@ -158,6 +163,7 @@ function submitForm(formname,target) {
158163
var submitFormObj = jQuery.ajax({ type: "POST",
159164
url: target,
160165
data: jQuery('#'+formname).serialize(),
166+
dataType: "html",
161167
success: function(data, textStatus, jqXHR) {
162168
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
163169
var parts = jqXHR.responseText.split(':');
@@ -166,7 +172,8 @@ function submitForm(formname,target) {
166172
//redirect = parts[1];
167173
//window.setTimeout('loadContent(redirect)', 1000);
168174
} else {
169-
document.getElementById('pageContent').innerHTML = jqXHR.responseText;
175+
//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
176+
jQuery('#pageContent').html(jqXHR.responseText);
170177
}
171178
},
172179
error: function(jqXHR, textStatus, errorThrown) {
@@ -219,6 +226,7 @@ function submitUploadForm(formname,target) {
219226
var submitFormObj = jQuery.ajax({ type: "POST",
220227
url: target,
221228
data: jQuery('#'+formname).serialize(),
229+
dataType: "html",
222230
success: function(data, textStatus, jqXHR) {
223231
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
224232
var parts = jqXHR.responseText.split(':');
@@ -227,7 +235,8 @@ function submitUploadForm(formname,target) {
227235
//redirect = parts[1];
228236
//window.setTimeout('loadContent(redirect)', 1000);
229237
} else {
230-
document.getElementById('pageContent').innerHTML = jqXHR.responseText;
238+
//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
239+
jQuery('#pageContent').html(jqXHR.responseText);
231240
}
232241
},
233242
error: function() {
@@ -297,10 +306,10 @@ function loadContent(pagename) {
297306
}
298307
}
299308
*/
300-
301309
/*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, pageContentCallback2);*/
302310
var pageContentObject2 = jQuery.ajax({ type: "GET",
303311
url: pagename,
312+
dataType: "html",
304313
success: function(data, textStatus, jqXHR) {
305314
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
306315
var parts = jqXHR.responseText.split(':');
@@ -309,8 +318,13 @@ function loadContent(pagename) {
309318
var newUrl= jqXHR.responseText.substr(jqXHR.responseText.indexOf('URL_REDIRECT:') + "URL_REDIRECT:".length);
310319
document.location.href = newUrl;
311320
} else {
312-
document.getElementById('pageContent').innerHTML = jqXHR.responseText;
321+
//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
322+
//var reponse = jQuery(jqXHR.responseText);
323+
//var reponseScript = reponse.filter("script");
324+
//jQuery.each(reponseScript, function(idx, val) { eval(val.text); } );
325+
jQuery('#pageContent').html(jqXHR.responseText);
313326
}
327+
314328
},
315329
error: function() {
316330
reportError('Ajax Request was not successful. 113');
@@ -339,12 +353,14 @@ function loadInitContent() {
339353
var pageContentObject = jQuery.ajax({ type: "GET",
340354
url: "content.php",
341355
data: "s_mod=login&s_pg=index",
356+
dataType: "html",
342357
success: function(data, textStatus, jqXHR) {
343358
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
344359
var parts = jqXHR.responseText.split(":");
345360
loadContent(parts[1]);
346361
} else {
347-
document.getElementById('pageContent').innerHTML = jqXHR.responseText;
362+
//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
363+
jQuery('#pageContent').html(jqXHR.responseText);
348364
}
349365
},
350366
error: function() {
@@ -400,8 +416,10 @@ function loadMenus() {
400416
var sideNavObject = jQuery.ajax({ type: "GET",
401417
url: "nav.php",
402418
data: "nav=side",
419+
dataType: "html",
403420
success: function(data, textStatus, jqXHR) {
404-
document.getElementById('sideNav').innerHTML = jqXHR.responseText;
421+
//document.getElementById('sideNav').innerHTML = jqXHR.responseText;
422+
jQuery('#sideNav').html(jqXHR.responseText);
405423
},
406424
error: function() {
407425
reportError('Ajax Request was not successful. 115');
@@ -423,8 +441,10 @@ function loadMenus() {
423441
var topNavObject = jQuery.ajax({ type: "GET",
424442
url: "nav.php",
425443
data: "nav=top",
444+
dataType: "html",
426445
success: function(data, textStatus, jqXHR) {
427-
document.getElementById('topNav').innerHTML = jqXHR.responseText;
446+
//document.getElementById('topNav').innerHTML = jqXHR.responseText;
447+
jQuery('#topNav').html(jqXHR.responseText);
428448
},
429449
error: function(o) {
430450
reportError('Ajax Request was not successful. 116');
@@ -461,8 +481,10 @@ function loadContentInto(elementid,pagename) {
461481
/*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);*/
462482
var pageContentObject2 = jQuery.ajax({ type: "GET",
463483
url: pagename,
484+
dataType: "html",
464485
success: function(data, textStatus, jqXHR) {
465-
document.getElementById(elementid).innerHTML = jqXHR.responseText;
486+
//document.getElementById(elementid).innerHTML = jqXHR.responseText;
487+
jQuery('#'+elementid).html(jqXHR.responseText);
466488
},
467489
error: function() {
468490
reportError('Ajax Request was not successful. 118');
@@ -494,6 +516,7 @@ function loadOptionInto(elementid,pagename) {
494516
/*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);*/
495517
var pageContentObject2 = jQuery.ajax({ type: "GET",
496518
url: pagename,
519+
dataType: "html",
497520
success: function(data, textStatus, jqXHR) {
498521
var teste = jqXHR.responseText;
499522
var elemente = teste.split('#');
@@ -528,6 +551,7 @@ function keepalive() {
528551
/*var pageContentObject3 = YAHOO.util.Connect.asyncRequest('GET', 'keepalive.php', pageContentCallbackKeepalive);*/
529552
var pageContentObject3 = jQuery.ajax({ type: "GET",
530553
url: "keepalive.php",
554+
dataType: "html",
531555
success: function(data, textStatus, jqXHR) {
532556
setTimeout( keepalive, 1000000 );
533557
},
@@ -735,6 +759,7 @@ function loadwebip(elementid,pagename) {
735759
/*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);*/
736760
var pageContentObject2 = jQuery.ajax({ type: "GET",
737761
url: pagename,
762+
dataType: "html",
738763
success: function(data, textStatus, jqXHR) {
739764
var teste = jqXHR.responseText;
740765
var elemente = teste.split('#');

0 commit comments

Comments
 (0)