Changeset 1155

Timestamp:

12/03/08 20:49:43 (3 years ago)

Author:

ArthurClemens

Message:

Item384: Improve function getElementsByClassName

Location:

trunk

Files:

• PatternSkin/pub/System/PatternSkin/pattern.js (modified) (3 diffs)
• TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki.js (modified) (1 diff)
• TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_src.js (modified) (2 diffs)
• core/pub/System/JavascriptFiles/foswiki_edit.js (modified) (2 diffs)
• core/pub/System/JavascriptFiles/foswikilib.js (modified) (1 diff)

trunk/PatternSkin/pub/System/PatternSkin/pattern.js

@@ -22 +22 @@
                 var showElem = document.getElementById('topicattachmentslistshow');
                 if (showElem != undefined) {
-                        var labelElem = showElem.getElementsByTagName('a')[0].getElementsByTagName('span')[0];
-                        labelElem.innerHTML += countStr;
+                        var elems = foswiki.getElementsByClassName(showElem, 'patternToggleHeader');
+                        elems[0].innerHTML += countStr;
                 }
                 var hideElem = document.getElementById('topicattachmentslisthide');
                 if (hideElem != undefined) {
-                        var labelElem = hideElem.getElementsByTagName('a')[0].getElementsByTagName('span')[0];
-                        labelElem.innerHTML += countStr;
+                        var elems = foswiki.getElementsByClassName(hideElem, 'patternToggleHeader');
+                        elems[0].innerHTML += countStr;
                 }
         },
@@ -78 +78 @@
                 }
         },
-        '#tabletwikiAttachmentsTable' : function(el) {
+        '#twikiAttachmentsTable' : function(el) {
                 Pattern.setAttachmentCount(el);
         },
@@ -110 +110 @@
 var TEXT_NUM_TOPICS = foswiki.getMetaTag('TEXT_NUM_TOPICS');
 var TEXT_MODIFY_SEARCH = foswiki.getMetaTag('TEXT_MODIFY_SEARCH');
+var SCRIPTURLPATH = foswiki.getMetaTag('SCRIPTURLPATH');
+var SCRIPTSUFFIX = foswiki.getMetaTag('SCRIPTSUFFIX');
+var WEB = foswiki.getMetaTag('WEB');
+var TOPIC = foswiki.getMetaTag('TOPIC');

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki.js

@@ -6 +6 @@
 function handleKeyDown(e){if(!e)e=window.event;var code;if(e.keyCode)code=e.keyCode;if(code==27)return false;return true;}
 function validateMandatoryFields(event){if(foswiki.Pref.validateSuppressed){return true;}
-var ok=true;var els=foswiki.getElementsByClassName(document,'select','foswikiMandatory');for(var j=0;j<els.length;j++){var one=false;for(var k=0;k<els[j].options.length;k++){if(els[j].options[k].selected){one=true;break;}}
+var ok=true;var els=foswiki.getElementsByClassName(document,'foswikiMandatory','select');for(var j=0;j<els.length;j++){var one=false;for(var k=0;k<els[j].options.length;k++){if(els[j].options[k].selected){one=true;break;}}
 if(!one){alert("The required form field '"+els[j].name+
 "' has no value.");ok=false;}}
-var taglist=new Array('input','textarea');for(var i=0;i<taglist.length;i++){els=foswiki.getElementsByClassName(document,taglist[i],'foswikiMandatory');for(var j=0;j<els.length;j++){if(els[j].value==null||els[j].value.length==0){alert("The required form field '"+els[j].name+
+var taglist=new Array('input','textarea');for(var i=0;i<taglist.length;i++){els=foswiki.getElementsByClassName(document,'foswikiMandatory',taglist[i]);for(var j=0;j<els.length;j++){if(els[j].value==null||els[j].value.length==0){alert("The required form field '"+els[j].name+
 "' has no value.");ok=false;}}}
 return ok;}

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_src.js

@@ -86 +86 @@
     }
     var ok = true;
-    var els = foswiki.getElementsByClassName(document, 'select',
-                                               'foswikiMandatory');
+    var els = foswiki.getElementsByClassName(document, 'foswikiMandatory', 'select');
     for (var j = 0; j < els.length; j++) {
         var one = false;
@@ -104 +103 @@
     var taglist = new Array('input', 'textarea');
     for (var i = 0; i < taglist.length; i++) {
-        els = foswiki.getElementsByClassName(document, taglist[i],
-                                               'foswikiMandatory');
+        els = foswiki.getElementsByClassName(document, 'foswikiMandatory', taglist[i]);
         for (var j = 0; j < els.length; j++) {
             if (els[j].value == null || els[j].value.length == 0) {

trunk/core/pub/System/JavascriptFiles/foswiki_edit.js

@@ -111 +111 @@
     }
     var ok = true;
-    var els = foswiki.getElementsByClassName(document, 'select',
-                                               'twikiMandatory');
+    var els = foswiki.getElementsByClassName(document, 'twikiMandatory', 'select');
     for (var j = 0; j < els.length; j++) {
         var one = false;
@@ -129 +128 @@
     var taglist = new Array('input', 'textarea');
     for (var i = 0; i < taglist.length; i++) {
-        els = foswiki.getElementsByClassName(document, taglist[i],
-                                               'twikiMandatory');
+        els = foswiki.getElementsByClassName(document, 'twikiMandatory', taglist[i]);
         for (var j = 0; j < els.length; j++) {
             if (els[j].value == null || els[j].value.length == 0) {

trunk/core/pub/System/JavascriptFiles/foswikilib.js

@@ -20 +20 @@
 };
 
-// Get all elements under root that have the given tag and include the
-// given class
-foswiki.getElementsByClassName = function(root, tag, className) {
-        var elms = root.getElementsByTagName(tag);
-        className = className.replace(/\-/g, "\\-");
+/**
+Get all elements under root that include the given class.
+@param inRootElem: HTMLElement to start searching from
+@param inClassName: CSS class name to find
+@param inTag: (optional) HTML tag to speed up searching (if not given, a wildcard is used to search all elements)
+@example:
+<code>
+var gallery = document.getElementById('galleryTable');
+var elems = foswiki.getElementsByClassName(gallery, 'personalPicture');
+var firstPicture = elems[0];
+</code>
+*/
+foswiki.getElementsByClassName = function(inRootElem, inClassName, inTag) {
+        var tag = inTag || '*';
+        var elms = inRootElem.getElementsByTagName(tag);
+        var className = inClassName.replace(/\-/g, "\\-");
         var re = new RegExp("\\b" + className + "\\b");
         var el;