Changeset 1662 for sandbox/expresso2.2/calendar

Timestamp:

11/17/09 15:57:19 (15 years ago)

Author:

amuller

Message:

Ticket #490 - Criação dos códigos de unificação ajax

Location:

sandbox/expresso2.2/calendar

Files:

• inc/class.uicalendar.inc.php (modified) (1 diff)
• js/edit_exmail.js (modified) (3 diffs)
• templates/default/delegate.tpl (modified) (1 diff)

sandbox/expresso2.2/calendar/inc/class.uicalendar.inc.php

@@ -5081 +5081 @@
                                                                                         '<script type="text/javascript" src="phpgwapi/js/dJSWin/dJSWin.js"></script>'.          
                                                                                         "<script src='calendar/js/edit_exmail.js' type='text/javascript'></script>" .
-                                                                                        $load_lang_vars.                                                                                                                                                        
-                                                                                        "<script src='".$module_name."/js/connector.js' type='text/javascript'></script>".
+                                                                                        $load_lang_vars.                                
                                                                                         "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ".                                                                                        
                                                                                         "<script type='text/javascript'>" .

sandbox/expresso2.2/calendar/js/edit_exmail.js

@@ -217 +217 @@
 function loadScript(scriptPath){
 
-        if(!connector)
+        if(!expresso.connector)
                 throw new Error("Error : Connector is not loaded.");
                 
@@ -224 +224 @@
         }
         
-        connector.oxmlhttp.open("GET", scriptPath, false);
-    connector.oxmlhttp.setRequestHeader('Content-Type','text/plain');
-        connector.oxmlhttp.send(null);
-        if(connector.oxmlhttp.status != 0 && connector.oxmlhttp.status != 200 ||        connector.oxmlhttp.status == 0 && connector.oxmlhttp.responseText.length == 0)
-                throw new Error("Error " + connector.oxmlhttp.status + "("+connector.oxmlhttp.statusText+") when loading script file '"+scriptPath+"'");
+        expresso.connector.oxmlhttp.open("GET", scriptPath, false);
+    expresso.connector.oxmlhttp.setRequestHeader('Content-Type','text/plain');
+        expresso.connector.oxmlhttp.send(null);
+        if(expresso.connector.oxmlhttp.status != 0 && expresso.connector.oxmlhttp.status != 200 ||      expresso.connector.oxmlhttp.status == 0 && expresso.connector.oxmlhttp.responseText.length == 0)
+                throw new Error("Error " + expresso.connector.oxmlhttp.status + "("+expresso.connector.oxmlhttp.statusText+") when loading script file '"+scriptPath+"'");
         
         var head = document.getElementsByTagName("head")[0];
@@ -234 +234 @@
         script.id = 'uploadscript_'+scriptPath;
         script.type = 'text/javascript';                
-        script.text = connector.oxmlhttp.responseText;
+        script.text = expresso.connector.oxmlhttp.responseText;
         head.appendChild(script);
         return; 

sandbox/expresso2.2/calendar/templates/default/delegate.tpl

@@ -3 +3 @@
 <script src='{url_template}/../../js/edit_exmail.js' type='text/javascript'></script>
 <script src='{module_name}/inc/load_lang.php' type='text/javascript'></script>
-<script src='{module_name}/js/connector.js' type='text/javascript'></script>
 <script type='text/javascript'>var DEFAULT_URL = '{module_name}/controller.php?action=';</script> 
 <font color="#FF0000">{error_msg}</font>