[Erp5-report] r36767 yo - in /erp5/trunk/bt5/erp5_popup_ui: SkinTemplateItem/portal_skins/e...

[nobody at svn.erp5.org]

Author: yo
Date: Thu Jul  1 12:14:49 2010
New Revision: 36767

URL: http://svn.erp5.org?rev=36767&view=rev
Log:
2010-07-01 yo
* Fix a bug that scripts in every fetched document may be executed. Otherwise, ready callbacks can be executed many times.

Modified:
    erp5/trunk/bt5/erp5_popup_ui/SkinTemplateItem/portal_skins/erp5_popup_ui/erp5_popup.js.xml
    erp5/trunk/bt5/erp5_popup_ui/bt/change_log
    erp5/trunk/bt5/erp5_popup_ui/bt/revision

Modified: erp5/trunk/bt5/erp5_popup_ui/SkinTemplateItem/portal_skins/erp5_popup_ui/erp5_popup.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_popup_ui/SkinTemplateItem/portal_skins/erp5_popup_ui/erp5_popup.js.xml?rev=36767&r1=36766&r2=36767&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_popup_ui/SkinTemplateItem/portal_skins/erp5_popup_ui/erp5_popup.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_popup_ui/SkinTemplateItem/portal_skins/erp5_popup_ui/erp5_popup.js.xml [utf8] Thu Jul  1 12:14:49 2010
@@ -88,12 +88,12 @@ jQuery(function() {\n
     jQuery(\'<div class="loading" style="background-color: #AAAAAA; opacity: 0.5; position: absolute; left: 0%; width: 100%; top: 0%; height: 100%; transparent;"><p class="loading" style="position: absolute; left: 0%; width: 100%; top: 30%; height: 40%; text-align: center; color: black; font-size: 32pt;">Loading...</p></div>\').appendTo(dialog);\n
     animate();\n
 \n
-    // define  fallback values\n
-    if(method_name==undefined)\n
+    // define fallback values\n
+    if (method_name == undefined)\n
       method_name = \'post\';\n
-    if(method_name==\'post\')\n
+    if (method_name == \'post\')\n
       var caller = jQuery.post;\n
-    if(method_name==\'get\')\n
+    if (method_name == \'get\')\n
       var caller = jQuery.get;\n
     caller(url, query, function(data, textStatus, XMLHttpRequest) {\n
       if (textStatus == \'success\' || textStatus == \'notmodified\') {\n
@@ -101,7 +101,8 @@ jQuery(function() {\n
         dialog.empty();\n
         //jQuery(\'div.loading\', dialog).remove();\n
 \n
-        dialog.html(jQuery(\'<div />\').append(data).find(\'form\'));\n
+        dialog.html(jQuery(\'<div />\').append(data.replace(/<script(.|\\s)*?\\/script>/g, "")).find(\'form\'));\n
+\n
         // XXX Get rid of unneeded stuff in JavaScript for now.\n
         jQuery(\'.bars, .breadcrumb, .logged_in_as\', dialog).remove();\n
         jQuery(\'[id]\', dialog).removeAttr(\'id\');\n

Modified: erp5/trunk/bt5/erp5_popup_ui/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_popup_ui/bt/change_log?rev=36767&r1=36766&r2=36767&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_popup_ui/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_popup_ui/bt/change_log [utf8] Thu Jul  1 12:14:49 2010
@@ -1,3 +1,6 @@
+2010-07-01 yo
+* Fix a bug that scripts in every fetched document may be executed. Otherwise, ready callbacks can be executed many times.
+
 2010-06-30 yo
 * Remove jquery from this Business Template. Instead, depend on erp5_jquery.
 

Modified: erp5/trunk/bt5/erp5_popup_ui/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_popup_ui/bt/revision?rev=36767&r1=36766&r2=36767&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_popup_ui/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_popup_ui/bt/revision [utf8] Thu Jul  1 12:14:49 2010
@@ -1 +1 @@
-9
\ No newline at end of file
+10
\ No newline at end of file