[Phpfreechat-svn] SF.net SVN: phpfreechat: [1170] trunk

[<gpi...@us...>]

Revision: 1170
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1170&view=rev
Author:   gpinzone
Date:     2007-08-30 18:32:18 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Much cleaner way of resolving class/className dependencies.

Modified Paths:
--------------
    trunk/data/public/js/pfcclient.js
    trunk/data/public/js/pfcgui.js
    trunk/demo/demo34_add_a_link_on_nicknames/mytheme/customize.js.php
    trunk/demo/demo50_data/mytheme/customize.js.php

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-30 19:17:03 UTC (rev 1169)
+++ trunk/data/public/js/pfcclient.js	2007-08-31 01:32:18 UTC (rev 1170)
@@ -1194,21 +1194,17 @@
    */
   updateNickListBox: function(chanid)
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     var nickidlst = this.getChanMeta(chanid,'users')['nickid'];
     var nickdiv = this.gui.getOnlineContentFromTabId(chanid);
     var ul = document.createElement('ul');
-    if (! is_ie)
-      ul.setAttribute('class',     'pfc_nicklist');
-    else
-      ul.setAttribute('className', 'pfc_nicklist'); // for IE
+    ul.setAttribute(className, 'pfc_nicklist');
     for (var i=0; i<nickidlst.length; i++)
     {
       var nickid = nickidlst[i];
       var li = this.buildNickItem(nickid);
-      if (! is_ie)
-        li.setAttribute('class',     'pfc_nickitem_'+nickid);
-      else
-        li.setAttribute('className', 'pfc_nickitem_'+nickid); // for IE
+      li.setAttribute(className, 'pfc_nickitem_'+nickid);
       ul.appendChild(li);
     }
     var fc = nickdiv.firstChild;
@@ -1228,27 +1224,20 @@
 
   updateNickWhoisBox: function(nickid)
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     var usermeta = this.getAllUserMeta(nickid);
 
     var div  = document.createElement('div');
-    if (! is_ie)
-      div.setAttribute('class',     'pfc_nickwhois');
-    else
-      div.setAttribute('className', 'pfc_nickwhois'); // for IE
+    div.setAttribute(className, 'pfc_nickwhois');
 
     var p = document.createElement('p');
-    if (! is_ie)
-      p.setAttribute('class',     'pfc_nickwhois_header');
-    else
-      p.setAttribute('className', 'pfc_nickwhois_header'); // for IE
+    p.setAttribute(className, 'pfc_nickwhois_header');
     div.appendChild(p);
 
     // add the close button
     var img = document.createElement('img');
-    if (! is_ie)
-      img.setAttribute('class',     'pfc_nickwhois_close');
-    else
-      img.setAttribute('className', 'pfc_nickwhois_close'); // for IE
+    img.setAttribute(className, 'pfc_nickwhois_close');
     img.pfc_parent = div;
     img.onclick = function(evt){
       this.pfc_parent.style.display = 'none';
@@ -1279,15 +1268,9 @@
       {
         var tr = document.createElement('tr');
         var td1 = document.createElement('td');
-        if (! is_ie)
-          td1.setAttribute('class',     'pfc_nickwhois_c1');
-        else
-          td1.setAttribute('className', 'pfc_nickwhois_c1'); // for IE
+        td1.setAttribute(className, 'pfc_nickwhois_c1');
         var td2 = document.createElement('td');
-        if (! is_ie)
-          td2.setAttribute('class',     'pfc_nickwhois_c2');
-        else
-          td2.setAttribute('className', 'pfc_nickwhois_c2'); // for IE
+        td2.setAttribute(className, 'pfc_nickwhois_c2');
         td1.appendChild(document.createTextNode(k));
         td2.appendChild(document.createTextNode(v));
         tr.appendChild(td1);
@@ -1301,10 +1284,7 @@
     if (pfc.getUserMeta(nickid,'nick') != this.nickname)
     {
       var p = document.createElement('p');
-      if (! is_ie)
-        p.setAttribute('class',     'pfc_nickwhois_pv');
-      else
-        p.setAttribute('className', 'pfc_nickwhois_pv'); // for IE
+      p.setAttribute(className, 'pfc_nickwhois_pv');
       var a = document.createElement('a');
       a.setAttribute('href', '');
       a.pfc_nickid = nickid;
@@ -1329,6 +1309,8 @@
 
   buildNickItem: function(nickid)
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     var nick = this.getUserMeta(nickid, 'nick');
     var isadmin = this.getUserMeta(nickid, 'isadmin');
     if (isadmin == '') isadmin = false;
@@ -1351,27 +1333,20 @@
     }
     li.appendChild(a);
 
-
     var img = document.createElement('img');
     if (isadmin)
       img.setAttribute('src', this.res.getFileUrl('images/user-admin.gif'));
     else
       img.setAttribute('src', this.res.getFileUrl('images/user.gif'));
     img.style.marginRight = '5px';
-    if (! is_ie)
-      img.setAttribute('class',     'pfc_nickbutton');
-    else
-      img.setAttribute('className', 'pfc_nickbutton'); // for IE
+    img.setAttribute(className, 'pfc_nickbutton');
     a.appendChild(img);
 
     // nobr is not xhtml valid but it's a workeround 
     // for IE which doesn't support 'white-space: pre' css rule
     var nobr = document.createElement('nobr');
     var span = document.createElement('span');
-    if (! is_ie)
-      span.setAttribute('class',     'pfc_nickmarker pfc_nick_'+nickid);
-    else
-      span.setAttribute('className', 'pfc_nickmarker pfc_nick_'+nickid); // for IE
+    span.setAttribute(className, 'pfc_nickmarker pfc_nick_'+nickid);
     span.appendChild(document.createTextNode(nick));
     nobr.appendChild(span);
     a.appendChild(nobr);

Modified: trunk/data/public/js/pfcgui.js
===================================================================
--- trunk/data/public/js/pfcgui.js	2007-08-30 19:17:03 UTC (rev 1169)
+++ trunk/data/public/js/pfcgui.js	2007-08-31 01:32:18 UTC (rev 1170)
@@ -65,6 +65,8 @@
   
   setTabById: function(tabid)
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     // first of all save the scroll pos of the visible tab
     var content = this.getChatContentFromTabId(this.current_tab_id);
     this.scrollpos[this.current_tab_id] = content.scrollTop;
@@ -81,10 +83,7 @@
       if (this.tabids[i] == tabid)
       {
         // select the tab
-        if (! is_ie)
-          tabtitle.setAttribute('class', 'selected');
-        else
-          tabtitle.setAttribute('className', 'selected'); // for IE
+        tabtitle.setAttribute(className, 'selected');
         //Element.addClassName(tabtitle, 'selected');
         tab_to_show = tabcontent;
         this.current_tab     = this.tabs[i];
@@ -93,10 +92,7 @@
       else
       {
         // unselect the tab
-        if (! is_ie)
-          tabtitle.setAttribute('class', '');
-        else
-          tabtitle.setAttribute('className', ''); // for IE
+        tabtitle.setAttribute(className, ''); 
         //Element.removeClassName(tabtitle, 'selected');
         tabcontent.style.display = 'none';
       }
@@ -130,6 +126,8 @@
 
   getChatContentFromTabId: function(tabid)
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     // return the chat content if it exists
     var cc = this.chatcontent[tabid];
     if (cc) return cc;
@@ -137,10 +135,7 @@
     // if the chat content doesn't exists yet, just create a cached one
     cc = document.createElement('div');
     cc.setAttribute('id', 'pfc_chat_'+tabid);
-    if (! is_ie)
-      cc.setAttribute('class', 'pfc_chat');
-    else
-      cc.setAttribute('className', 'pfc_chat'); // for IE
+    cc.setAttribute(className, 'pfc_chat');
 
     //    Element.addClassName(cc, 'pfc_chat');
     cc.style.display = "block"; // needed by IE6 to show the online div at startup (first loaded page)
@@ -151,16 +146,15 @@
   },
   getOnlineContentFromTabId: function(tabid)
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     // return the online content if it exists
     var oc = this.onlinecontent[tabid];
     if (oc) return oc;
 
     oc = document.createElement('div');
     oc.setAttribute('id', 'pfc_online_'+tabid);
-    if (! is_ie)
-      oc.setAttribute('class', 'pfc_online');
-    else
-      oc.setAttribute('className', 'pfc_online'); // for IE
+    oc.setAttribute(className, 'pfc_online');
     //Element.addClassName(oc, 'pfc_online');
     // I set the border style here because seting it in the CSS is not taken in account
     //    oc.style.borderLeft = "1px solid #555";
@@ -211,6 +205,8 @@
   
   createTab: function(name, tabid, type)
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     // do not create empty tabs
     if(name == '') return;
     if(tabid == '') return;
@@ -234,10 +230,7 @@
     li_title.appendChild(li_div);
     
     var a1 = document.createElement('a');
-    if (! is_ie)
-      a1.setAttribute('class', 'pfc_tabtitle');
-    else
-      a1.setAttribute('className', 'pfc_tabtitle'); // for IE
+    a1.setAttribute(className, 'pfc_tabtitle');
     a1.setAttribute('href', '#');
     a1.pfc_tabid = tabid;
     a1.onclick = function(){pfc.gui.setTabById(this.pfc_tabid); return false;}
@@ -273,10 +266,7 @@
       }
       a2.alt   = pfc.res.getLabel('Close this tab');
       a2.title = a2.alt;
-      if (! is_ie)
-        a2.setAttribute('class', 'pfc_tabclose');
-      else
-        a2.setAttribute('className', 'pfc_tabclose'); // for IE
+      a2.setAttribute(className, 'pfc_tabclose');
       var img = document.createElement('img');
       img.setAttribute('src', pfc.res.getFileUrl('images/tab_remove.gif'));
       a2.appendChild(img);
@@ -286,10 +276,7 @@
     var div_content = document.createElement('div');
     div_content.setAttribute('id', 'pfc_channel_content'+tabid);   
     //    Element.addClassName(div_content, 'pfc_content');
-    if (! is_ie)
-      div_content.setAttribute('class', 'pfc_content');
-    else
-      div_content.setAttribute('className', 'pfc_content'); // for IE
+    div_content.setAttribute(className, 'pfc_content');
     div_content.style.display = 'none';
 
     var div_chat    = this.getChatContentFromTabId(tabid);
@@ -346,6 +333,8 @@
    */
   notifyTab: function(tabid)
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     // first of all be sure the tab highlighting is cleared
     this.unnotifyTab(tabid);
 
@@ -368,17 +357,11 @@
     {
       if (div.blinkstat == true)
       {
-        if (! is_ie)
-          div.setAttribute('class',     'pfc_tabblink1');
-        else
-          div.setAttribute('className', 'pfc_tabblink1'); // for IE
+        div.setAttribute(className, 'pfc_tabblink1');
       }
       else
       {
-        if (! is_ie)
-          div.setAttribute('class',     'pfc_tabblink2');
-        else
-          div.setAttribute('className', 'pfc_tabblink2'); // for IE
+        div.setAttribute(className, 'pfc_tabblink2');
       }
       div.blinkstat = !div.blinkstat;
       div.blinktimeout = setTimeout('pfc.gui.notifyTab(\''+tabid+'\');', 500);
@@ -390,6 +373,8 @@
    */
   unnotifyTab: function(tabid)
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     var tabpos = indexOf(this.tabids, tabid);
     var tabtype = this.tabtypes[tabpos];
 
@@ -407,10 +392,7 @@
     var div = $('pfc_tabdiv'+tabid);
     if (div) 
     {
-      if (! is_ie)
-        div.removeAttribute('class');
-      else
-        div.removeAttribute('className'); // for IE
+      div.removeAttribute(className);
       clearTimeout(div.blinktimeout);
     }
   },
@@ -444,6 +426,8 @@
 
   loadBBCodeColorList: function()
   {
+    var className = (! is_ie) ? 'class' : 'className';
+
     // color list
     var clist = $('pfc_colorlist');
     var clist_v = pfc_bbcode_color_list;
@@ -452,10 +436,7 @@
       var bbc = clist_v[i];
       var elt = document.createElement('img');
       elt.bbc = bbc;
-      if (! is_ie)
-        elt.setAttribute('class', 'pfc_color');
-      else
-        elt.setAttribute('className', 'pfc_color'); // for IE
+      elt.setAttribute(className, 'pfc_color');
       elt.setAttribute('id', 'pfc_color_'+bbc);
       elt.style.backgroundColor = '#'+bbc;
       elt.setAttribute('src', pfc.res.getFileUrl('images/color_transparent.gif'));

Modified: trunk/demo/demo34_add_a_link_on_nicknames/mytheme/customize.js.php
===================================================================
--- trunk/demo/demo34_add_a_link_on_nicknames/mytheme/customize.js.php	2007-08-30 19:17:03 UTC (rev 1169)
+++ trunk/demo/demo34_add_a_link_on_nicknames/mytheme/customize.js.php	2007-08-31 01:32:18 UTC (rev 1170)
@@ -1,5 +1,7 @@
 pfcClient.prototype.buildNickItem = function(nickid)
 {
+    var className = (! is_ie) ? 'class' : 'className';
+
     var nick = this.getUserMeta(nickid, 'nick');
     var isadmin = this.getUserMeta(nickid, 'isadmin');
     if (isadmin == '') isadmin = false;
@@ -25,27 +27,20 @@
     */
     li.appendChild(a);
 
-
     var img = document.createElement('img');
     if (isadmin)
       img.setAttribute('src', this.res.getFileUrl('images/user-admin.gif'));
     else
       img.setAttribute('src', this.res.getFileUrl('images/user.gif'));
     img.style.marginRight = '5px';
-    if (! is_ie)
-      img.setAttribute('class',     'pfc_nickbutton');
-    else
-      img.setAttribute('className', 'pfc_nickbutton'); // for IE
+    img.setAttribute(className, 'pfc_nickbutton');
     a.appendChild(img);
 
     // nobr is not xhtml valid but it's a workeround 
     // for IE which doesn't support 'white-space: pre' css rule
     var nobr = document.createElement('nobr');
     var span = document.createElement('span');
-    if (! is_ie)
-      span.setAttribute('class',     'pfc_nickmarker pfc_nick_'+nickid);
-    else
-      span.setAttribute('className', 'pfc_nickmarker pfc_nick_'+nickid); // for IE
+    span.setAttribute(className, 'pfc_nickmarker pfc_nick_'+nickid);
     span.appendChild(document.createTextNode(nick));
     nobr.appendChild(span);
     a.appendChild(nobr);

Modified: trunk/demo/demo50_data/mytheme/customize.js.php
===================================================================
--- trunk/demo/demo50_data/mytheme/customize.js.php	2007-08-30 19:17:03 UTC (rev 1169)
+++ trunk/demo/demo50_data/mytheme/customize.js.php	2007-08-31 01:32:18 UTC (rev 1170)
@@ -1,26 +1,19 @@
 pfcClient.prototype.updateNickWhoisBox = function(nickid)
 {
+    var className = (! is_ie) ? 'class' : 'className';
+
     var usermeta = this.getAllUserMeta(nickid);
 
     var div  = document.createElement('div');
-    if (! is_ie)
-      div.setAttribute('class',     'pfc_nickwhois');
-    else
-      div.setAttribute('className', 'pfc_nickwhois'); // for IE
+    div.setAttribute(className, 'pfc_nickwhois');
 
     var p = document.createElement('p');
-    if (! is_ie)
-      p.setAttribute('class',     'pfc_nickwhois_header');
-    else
-      p.setAttribute('className', 'pfc_nickwhois_header'); // for IE
+    p.setAttribute(className, 'pfc_nickwhois_header');
     div.appendChild(p);
 
     // add the close button
     var img = document.createElement('img');
-    if (! is_ie)
-      img.setAttribute('class',     'pfc_nickwhois_close');
-    else
-      img.setAttribute('className', 'pfc_nickwhois_close'); // for IE
+    img.setAttribute(className, 'pfc_nickwhois_close');
     img.pfc_parent = div;
     img.onclick = function(evt){
       this.pfc_parent.style.display = 'none';
@@ -52,15 +45,9 @@
       {
         var tr = document.createElement('tr');
         var td1 = document.createElement('td');
-        if (! is_ie)
-          td1.setAttribute('class',     'pfc_nickwhois_c1');
-        else
-          td1.setAttribute('className', 'pfc_nickwhois_c1'); // for IE
+        td1.setAttribute(className, 'pfc_nickwhois_c1');
         var td2 = document.createElement('td');
-        if (! is_ie)
-          td2.setAttribute('class',     'pfc_nickwhois_c2');
-        else
-          td2.setAttribute('className', 'pfc_nickwhois_c2'); // for IE
+        td2.setAttribute(className, 'pfc_nickwhois_c2');
         td1.appendChild(document.createTextNode(k));
         td2.appendChild(document.createTextNode(v));
         tr.appendChild(td1);
@@ -75,10 +62,7 @@
     {
       var img = document.createElement('img');
       img.setAttribute('src',this.getUserMeta(nickid,'avatar'));
-      if (! is_ie)
-        img.setAttribute('class',     'pfc_nickwhois_avatar');
-      else
-        img.setAttribute('className', 'pfc_nickwhois_avatar'); // for IE
+      img.setAttribute(className, 'pfc_nickwhois_avatar');
       div.appendChild(img);
     }
     
@@ -86,10 +70,7 @@
     if (pfc.getUserMeta(nickid,'nick') != this.nickname)
     {
       var p = document.createElement('p');
-      if (! is_ie)
-        p.setAttribute('class',     'pfc_nickwhois_pv');
-      else
-        p.setAttribute('className', 'pfc_nickwhois_pv'); // for IE
+      p.setAttribute(className, 'pfc_nickwhois_pv');
       var a = document.createElement('a');
       a.setAttribute('href', '');
       a.pfc_nickid = nickid;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.