From d0490d12181c24059cca20b1b8ed1cfd2ada63e3 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 13 Sep 2011 11:36:47 -0400
Subject: [PATCH] - Changed scrigo.js.php to allow JavaScript inside content loaded through Ajax.

---
 interface/web/js/scrigo.js.php |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index aea75d0..4e9012e 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -30,10 +30,12 @@
   if(document.getElementById('refreshinterval').value > 0) {
   	/*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename+"&refresh="+document.getElementById('refreshinterval').value, pageContentCallbackRefresh);*/
 	var pageContentObject2 = jQuery.ajax({	type: "GET", 
-											url: pagename, 
+											url: pagename,
 											data: "refresh="+document.getElementById('refreshinterval').value,
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
-												document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+												//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+												jQuery('#pageContent').html(jqXHR.responseText);
 											},
 											error: function() {
 												reportError('Ajax Request was not successful.'+pagename);
@@ -66,6 +68,7 @@
 	var submitFormObj = jQuery.ajax({		type: "GET", 
 											url: "capp.php", 
 											data: "mod="+module,
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
 												if(jqXHR.responseText != '') {
 													if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
@@ -103,6 +106,7 @@
 	var submitFormObj = jQuery.ajax({		type: "POST", 
 											url: "content.php",
 											data: jQuery('#'+formname).serialize(),
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
 												if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
 													var parts = jqXHR.responseText.split(':');
@@ -114,7 +118,8 @@
 													// Go to the login page
 													document.location.href = 'index.php';
 												} else {
-													document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													jQuery('#pageContent').html(jqXHR.responseText);
 												}
 												loadMenus();
 											},
@@ -158,6 +163,7 @@
 	var submitFormObj = jQuery.ajax({		type: "POST", 
 											url: target,
 											data: jQuery('#'+formname).serialize(),
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
 												if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
 													var parts = jqXHR.responseText.split(':');
@@ -166,7 +172,8 @@
 													//redirect = parts[1];
 													//window.setTimeout('loadContent(redirect)', 1000);
 												} else {
-													document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													jQuery('#pageContent').html(jqXHR.responseText);
 												}
 											},
 											error: function(jqXHR, textStatus, errorThrown) {
@@ -219,6 +226,7 @@
 	var submitFormObj = jQuery.ajax({		type: "POST", 
 											url: target,
 											data: jQuery('#'+formname).serialize(),
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
 												if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
 													var parts = jqXHR.responseText.split(':');
@@ -227,7 +235,8 @@
 													//redirect = parts[1];
 													//window.setTimeout('loadContent(redirect)', 1000);
 												} else {
-													document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													jQuery('#pageContent').html(jqXHR.responseText);
 												}
 											},
 											error: function() {
@@ -297,10 +306,10 @@
 		}
 	}
 	*/
-
   /*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, pageContentCallback2);*/
   var pageContentObject2 = jQuery.ajax({	type: "GET", 
 											url: pagename,
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
 												if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
 													var parts = jqXHR.responseText.split(':');
@@ -309,8 +318,13 @@
 													var newUrl= jqXHR.responseText.substr(jqXHR.responseText.indexOf('URL_REDIRECT:') + "URL_REDIRECT:".length);
 													document.location.href = newUrl;
 												} else {
-													document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													//var reponse = jQuery(jqXHR.responseText);
+													//var reponseScript = reponse.filter("script");
+													//jQuery.each(reponseScript, function(idx, val) { eval(val.text); } );
+													jQuery('#pageContent').html(jqXHR.responseText);
 												}
+												
 											},
 											error: function() {
 												reportError('Ajax Request was not successful. 113');
@@ -339,12 +353,14 @@
 	var pageContentObject = jQuery.ajax({	type: "GET", 
 											url: "content.php",
 											data: "s_mod=login&s_pg=index",
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
 												if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
 													var parts = jqXHR.responseText.split(":");
 													loadContent(parts[1]);
 												} else {
-													document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													//document.getElementById('pageContent').innerHTML = jqXHR.responseText;
+													jQuery('#pageContent').html(jqXHR.responseText);
 												}
 											},
 											error: function() {
@@ -400,8 +416,10 @@
   var sideNavObject = jQuery.ajax({			type: "GET", 
 											url: "nav.php",
 											data: "nav=side",
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
-												document.getElementById('sideNav').innerHTML = jqXHR.responseText;
+												//document.getElementById('sideNav').innerHTML = jqXHR.responseText;
+												jQuery('#sideNav').html(jqXHR.responseText);
 											},
 											error: function() {
 												reportError('Ajax Request was not successful. 115');
@@ -423,8 +441,10 @@
   var topNavObject = jQuery.ajax({			type: "GET", 
 											url: "nav.php",
 											data: "nav=top",
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
-												document.getElementById('topNav').innerHTML = jqXHR.responseText;
+												//document.getElementById('topNav').innerHTML = jqXHR.responseText;
+												jQuery('#topNav').html(jqXHR.responseText);
 											},
 											error: function(o) {
 												reportError('Ajax Request was not successful. 116');
@@ -461,8 +481,10 @@
   /*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);*/
   var pageContentObject2 = jQuery.ajax({	type: "GET", 
 											url: pagename,
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
-												document.getElementById(elementid).innerHTML = jqXHR.responseText;
+												//document.getElementById(elementid).innerHTML = jqXHR.responseText;
+												jQuery('#'+elementid).html(jqXHR.responseText);
 											},
 											error: function() {
 												reportError('Ajax Request was not successful. 118');
@@ -494,6 +516,7 @@
 	/*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);*/
 	var pageContentObject2 = jQuery.ajax({	type: "GET", 
 											url: pagename,
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
 												var teste = jqXHR.responseText;
 												var elemente = teste.split('#');
@@ -528,6 +551,7 @@
   	/*var pageContentObject3 = YAHOO.util.Connect.asyncRequest('GET', 'keepalive.php', pageContentCallbackKeepalive);*/
 	var pageContentObject3 = jQuery.ajax({	type: "GET", 
 											url: "keepalive.php",
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
 												setTimeout( keepalive, 1000000 );
 											},
@@ -735,6 +759,7 @@
 	/*var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);*/
 	var pageContentObject2 = jQuery.ajax({	type: "GET", 
 											url: pagename,
+											dataType: "html",
 											success: function(data, textStatus, jqXHR) {
 												var teste = jqXHR.responseText;
 												var elemente = teste.split('#');

--
Gitblit v1.9.1