[Erp5-report] r34468 ivan - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTe...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Apr 12 16:03:36 2010
New Revision: 34468

URL: http://svn.erp5.org?rev=34468&view=rev
Log:
Make Javascript code work explicitly with MochiKit JS library.
This way it's possible to use it together with another JS library safely.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml?rev=34468&r1=34467&r2=34468&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/erp5_tabber.js.xml [utf8] Mon Apr 12 16:03:36 2010
@@ -50,10 +50,9 @@
     loading_deferred.cancel();\n
     loading_deferred = undefined;\n
   }\n
-\n
-  var container = $(\'container\');\n
+  //var container = $(\'container\');\n
+  var container = MochiKit.DOM.getElement("container");\n
   container.innerHTML = req.responseText;\n
-\n
   addOnClickEventsToTabs(req);\n
 }\n
 \n
@@ -62,37 +61,39 @@
     loading_deferred.cancel();\n
     loading_deferred = undefined;\n
   }\n
-\n
-  var container = $(\'container\');\n
+  //var container = $(\'container\');\n
+  var container = MochiKit.DOM.getElement("container");\n
   container.innerHTML = \'Server side error.\';\n
-\n
   addOnClickEventsToTabs(req);\n
 }\n
 \n
 function showLoadingMessage() {\n
-  var container = $(\'container\');\n
+  //var container = $(\'container\');\n
+  var container = MochiKit.DOM.getElement("container");\n
   container.innerHTML = \'<div><p style="text-align: left; vertical-align: middle; font-size: large;">Loading...</p></div>\';\n
   loading_deferred = undefined;\n
 }\n
 \n
 function selectTab(e) {\n
-  var tab_box = $(\'tab_box\');\n
-  var item_list = tab_box.getElementsByTagName(\'li\');\n
+  //var tab_box = $(\'tab_box\');\n
+  //var item_list = tab_box.getElementsByTagName(\'li\');\n
+  var item_list = MochiKit.DOM.getElementsByTagAndClassName("li", null, "tab_box");\n
   for (var i = 0; i < item_list.length; i++) {\n
     var item = item_list[i];\n
-    var node = item.getElementsByTagName(\'a\')[0];\n
+    //var node = item.getElementsByTagName(\'a\')[0];\n
+    var node = MochiKit.DOM.getFirstElementByTagAndClassName("a", null, item);\n
     if (this == node) {\n
       if (getNodeAttribute(item, \'class\') != \'selected\') {\n
-        setNodeAttribute(item, \'class\', \'selected\');\n
+        MochiKit.DOM.setNodeAttribute(item, \'class\', \'selected\');\n
       }\n
       node.blur();\n
     } else {\n
       if (getNodeAttribute(item, \'class\') != \'non_selected\') {\n
-        setNodeAttribute(item, \'class\', \'non_selected\');\n
+        MochiKit.DOM.setNodeAttribute(item, \'class\', \'non_selected\');\n
       }\n
     }\n
-    disconnectAll(node, \'onclick\');\n
-    connect(node, \'onclick\', function (e) { e.stop(); });\n
+    MochiKit.Signal.disconnectAll(node, \'onclick\');\n
+    MochiKit.Signal.connect(node, \'onclick\', function (e) { e.stop(); });\n
   }\n
 \n
   var mapping = {\n
@@ -101,24 +102,26 @@
   };\n
 \n
   var url = mapping[this.parentNode.id];\n
-  var d = doSimpleXMLHttpRequest(url);\n
+  var d = MochiKit.Async.doSimpleXMLHttpRequest(url);\n
   d.addCallbacks(replaceContent, showServerSideError);\n
   e.stop();\n
 \n
-  loading_deferred = callLater(0.3, showLoadingMessage);\n
+  loading_deferred = MochiKit.Async.callLater(0.3, showLoadingMessage);\n
 \n
   // Set a cookie.\n
   document.cookie = \'erp5_site_selected_tab=\' + escape(this.parentNode.id);\n
 }\n
 \n
 function addOnClickEventsToTabs(e) {\n
-  var tab_box = $(\'tab_box\');\n
-  var item_list = tab_box.getElementsByTagName(\'li\');\n
+  //var tab_box = $(\'tab_box\');\n
+  //var item_list = tab_box.getElementsByTagName(\'li\');\n
+  var item_list = MochiKit.DOM.getElementsByTagAndClassName("li", null, "tab_box");\n
   for (var i = 0; i < item_list.length; i++) {\n
     //connect(item_list[i], \'onclick\', function(e){e.stop();})\n
-    var node = item_list[i].getElementsByTagName(\'a\')[0];\n
-    disconnectAll(node, \'onclick\');\n
-    connect(node, \'onclick\', selectTab);\n
+    //var node = item_list[i].getElementsByTagName(\'a\')[0];\n
+    var node = MochiKit.DOM.getFirstElementByTagAndClassName("a", null, item_list[i]);\n
+    MochiKit.Signal.disconnectAll(node, \'onclick\');\n
+    MochiKit.Signal.connect(node, \'onclick\', selectTab);\n
   }\n
   return true;\n
 }\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=34468&r1=34467&r2=34468&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Mon Apr 12 16:03:36 2010
@@ -1,1 +1,1 @@
-923
+925