Index: openacs-4/packages/ajaxhelper/tcl/ajax-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/tcl/ajax-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/ajaxhelper/tcl/ajax-procs.tcl	6 Nov 2006 13:15:29 -0000	1.6
+++ openacs-4/packages/ajaxhelper/tcl/ajax-procs.tcl	25 Dec 2006 16:39:50 -0000	1.7
@@ -13,57 +13,114 @@
 ad_proc -private ah::load_js_sources {
 	-source_list
 } {
-	Accepts a tcl list of sources to load.
-	This source_list will be the global ajax_helper_js_sources variable.
-	This script is called in the blank-master template.
+        Accepts a tcl list of sources to load.
+        This source_list will be the global ajax_helper_js_sources variable.
+        This script is called in the blank-master template and
+                should preferrably NOT BE USED to load your
+                javascript sources. Use ah::js_sources instead.
+
+        @author Hamilton Chua (ham@solutiongrove.com)
+        @creation-date 2006-11-05
+        @param source_list The list of javascript source names to load
 } {
 	set ah_base_url [ah::get_url]
 	set script ""
+    set minsuffix ""
+    if { [parameter::get_from_package_key -package_key "ajaxhelper" -parameter "UseMinifiedJs"] == 1 } {
+        set minsuffix "-min"
+    }
+
+    # TODO : 12/19/06
+    # Prior to just loading, we also have to think about dependencies
+    # we might need to sort the source_list first and check for dependencies.
+    # For example, we need to load prototype first before scriptaculous.
+
 	foreach source $source_list {
-		switch $source {
-			"rico" { 
-				append script "<script type=\"text/javascript\" src=\"${ah_base_url}rico/rico.js\"></script> \n" 
-			}
-			"rounder" {
-				append script "<script type=\"text/javascript\" src=\"${ah_base_url}curvycorners/rounded_corners_lite.inc.js\"></script> \n"
-			}
-			"overlibmws" {
-				append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws.js\"></script> \n"
-				append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws_overtwo.js\"></script>\n"
-			}
-			"overlibmws_bubble" {
-				append script "<script type=\"text/JavaScript\">var OLbubbleImageDir=\"${ah_base_url}overlibmws\";</script>\n"
-				append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws_bubble.js\"></script>\n"
-			}
-			"overlibmws_scroll" {
-				append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws_scroll.js\"></script>\n"
-			}
-			"overlibmws_drag" {
-				append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws_draggable.js\"></script>\n"
-			}
-			"prototype" {
-				append script "<script type=\"text/javascript\" src=\"${ah_base_url}prototype/prototype.js\"></script> \n"
-			}
-			"scriptaculous" {
-				append script "<script type=\"text/javascript\" src=\"${ah_base_url}scriptaculous/scriptaculous.js\"></script> \n"		
-			}
-		}
+        switch $source {
+            "rounder" {
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}curvycorners/rounded_corners_lite.inc.js\"></script> \n"
+            }
+            "overlibmws" {
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws${minsuffix}.js\"></script> \n"
+            }
+            "overlibmws_bubble" {
+                append script "<script type=\"text/JavaScript\">var OLbubbleImageDir=\"${ah_base_url}overlibmws\";</script>\n"
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws_bubble${minsuffix}.js\"></script>\n"
+            }
+            "overlibmws_scroll" {
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws_scroll${minsuffix}.js\"></script>\n"
+            }
+            "overlibmws_drag" {
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws_draggable${minsuffix}.js\"></script>\n"
+            }
+            "prototype" {
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}prototype/prototype${minsuffix}.js\"></script> \n"
+            }
+            "scriptaculous" {
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}scriptaculous/scriptaculous.js\"></script> \n"
+            }
+            "scriptaculous-effects" {
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}scriptaculous/scriptaculous.js?load=effects\"></script> \n"
+            }
+            "scriptaculous-dragdrop" {
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}scriptaculous/scriptaculous.js?load=effects,dragdrop\"></script> \n"
+            }
+            "autosuggest" {
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}autosuggest/autosuggest.js\"></script>\n"
+                append script "<link rel=\"stylesheet\" type=\"text/css\" href=\"${ah_base_url}autosuggest/autosuggest.css\" /> \n"
+            }
+        }
 	}
 	return $script
 }
 
+ad_proc -private ah::is_valid_source {
+    -js_source
+} {
+    This proc will determine if the js_source file is the name is a valid name associated to
+        a javascript source. This proc contains hard coded list of javascript sources that
+        ajaxhelper supports.
+
+        @author Hamilton Chua (ham@solutiongrove.com)
+        @creation-date 2006-12-19
+        @param js_source The name of the javascript source to check
+} {
+
+    set valid_sources [list "prototype" \
+                                "scriptaculous" \
+                                "scriptaculous-effects" \
+                                "scriptaculous-dragdrop" \
+                                "autosuggest" \
+                                "rounder" \
+                                "overlibmws" \
+                                "overlibmws_bubble" \
+                                "overlibmws_scroll" \
+                                "overlibmws_drag" ]
+    set found [lsearch -exact $valid_sources $js_source]
+    if { $found == -1 } {
+        return 0
+    } else {
+        return 1
+    }
+}
+
 ad_proc -private ah::is_js_sources_loaded {
 	-js_source
 } {
-	This proc will loop thru source_list and check for the presence of js_source.
-	If found, this proc will return 1 
+	This proc will loop thru source_list global variable and
+        check for the presence of the specified js_source.
+	If found, this proc will return 1
 	If not found, this proc will return 0
+
+        @author Hamilton Chua (ham@solutiongrove.com)
+        @creation-date 2006-11-05
+        @param js_source The name of the javascript source to check
 } {
 	global ajax_helper_js_sources
 	set state 0
 	if { [info exists ajax_helper_js_sources] } {
 		foreach source $ajax_helper_js_sources {
-			if { [string match $source $js_source] } { 
+			if { [string match $source $js_source] } {
 				set state 1
 				break
 			}
@@ -72,39 +129,119 @@
 	return $state
 }
 
+ad_proc -private ah::requires {
+    -sources
+} {
+    This proc should be called by an ajaxhelper proc with a comma separated list of javascript sources
+        that the ajaxhelper proc needs in order to work.
+
+        @author Hamilton Chua (ham@solutiongrove.com)
+        @creation-date 2006-12-19
+        @param sources Comma separated list of sources
+} {
+    #split up the comma delimited sources into a list
+    set source_list [split $sources ","]
+    #declare the global variable
+    global ajax_helper_js_sources
+    foreach source $source_list {
+        # do some checks before we add the source to the global
+        # - is it already loaded
+        # - is it a valid source name
+        # - is the source scriptaculous, scriptaculous-effects or scriptaculous-dragdrop
+        if { ![ah::is_js_sources_loaded -js_source $source] && [ah::is_valid_source -js_source $source] } {
+            if { $source == "scriptaculous" || $source == "scriptaculous-effects" || $source == "scriptaculous-dragdrop" } {
+                # source is scriptaculous
+                #  load only if scriptaculous-effects and scriptaculous-dragdrop are not loaded yet
+                if { $source == "scriptaculous" } {
+                    if { ![ah::is_js_sources_loaded -js_source "scriptaculous-effects"] || ![ah::is_js_sources_loaded -js_source "scriptaculous-dragdrop"]} {
+                        lappend ajax_helper_js_sources $source
+                    }
+                }
+                # source is scriptaculous-effects
+                #  load only if scriptaculous and scriptaculous-dragdrop are not loaded yet
+                if { $source == "scriptaculous-effects" } {
+                    if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] || ![ah::is_js_sources_loaded -js_source "scriptaculous-dragdrop"]} {
+                        lappend ajax_helper_js_sources $source
+                    }
+                }
+                # source is scriptaculous-dragdrop
+                #  load only if scriptaculous and scriptaculous-effects are not loaded yet
+                if { $source == "scriptaculous-dragdrop" } {
+                    if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] || ![ah::is_js_sources_loaded -js_source "scriptaculous-effects"]} {
+                        lappend ajax_helper_js_sources $source
+                    }
+                }
+            } else {
+                lappend ajax_helper_js_sources $source
+            }
+        } else {
+            # TODO : we must return an error/exception, for now just add a notice in the log
+            ns_log Notice "AJAXHELPER : $source is already loaded or not valid"
+        }
+    }
+}
+
 ad_proc -public ah::js_sources {
 	{-source "default"}
 } {
 	Will load any of the following javascript sources
 		prototype,
 		scriptaculous,
 		rounder,
-		overlibmws popups.
-	This will also check global variables. 
+		overlibmws.
+	This will also check global variables.
 	If the sources have already been defined, we will not define them again.
 	Once the js_source has been loaded, the global variable with list of sources will be updated.
-	Calling this function is not necessary anymore as long as the required code to dynamically call 
-		javascript functions is in the blank-master template.
+	Calling this function is not necessary anymore as long as the required code to dynamically call
+		javascript functions is in the blank-master template, unless of course you want to write your own javascript.
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
 
 	@param source The caller can specify which set of javascript source files to load. This can be a comma seprated list
-		Valid values include 
+		Valid values include
 		"default" : to load prototype and scriptaculous libraries
-		"rounder" : to load the rico corner rounder functions only, use this if you are working primarily with scriptaculous, 
+		"rounder" : to load the rico corner rounder functions only, use this if you are working primarily with scriptaculous,
 		"overlibmws" : to load the overlibmws javascript files for dhtml callouts and popups.
 		"overlibmws_bubble" : to load the overlibmws javascript files for dhtml callouts and popups.
 		"overlibmws_scroll" : to load the overlibmws javascript files for dhtml bubble callouts and popups that scroll.
 		"overlibmws_drag" : to load the overlibmws javascript files for draggable dhtml callouts and popups.
+        "prototype" : to load ONLY the prototype javascript source.
+        "scriptaculous" : to load all scriptaculous javascript sources.
+        "scriptaculous-effects" : to load only the scriptaculous javascript sources needed for effects.
+        "scriptaculous-dragdrop" : to load only the scriptaculous javascript sources needed for drag and drop.
 
 	@return
-	@error 
+	@error
 } {
 
 	set ah_base_url [ah::get_url]
+    set script ""
+
+    set minsuffix ""
+    if { [parameter::get_from_package_key -package_key "ajaxhelper" -parameter "UseMinifiedJs"] == 1 } {
+        set minsuffix "-min"
+    }
+
+    # js_sources was called with no parameters, just load the defaults
+    if { $source == "default" } {
+        if { ![ah::is_js_sources_loaded -js_source "prototype"] } {
+                # load prototype
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}prototype/prototype${minsuffix}.js\"></script> \n"
+                # make sure helper procs don't load it again
+                lappend ajax_helper_js_sources "prototype"
+        }
+        if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] && ![ah::is_js_sources_loaded -js_source "scriptaculous-effects"] && ![ah::is_js_sources_loaded -js_source "scriptaculous-dragdrop"]} {
+                # load scriptaculous
+                append script "<script type=\"text/javascript\" src=\"${ah_base_url}scriptaculous/scriptaculous.js\"></script> \n"
+                # make sure it doesn't get loaded again
+                lappend ajax_helper_js_sources "scriptaculous"
+                lappend ajax_helper_js_sources "scriptaculous-dragdrop"
+                lappend ajax_helper_js_sources "scriptaculous-effects"
+        }
+    }
+
 	set js_file_list [split $source ","]
-	set script ""
 
 	foreach x $js_file_list {
 		switch $x {
@@ -135,14 +272,32 @@
 					append script "<script type=\"text/javascript\" src=\"${ah_base_url}overlibmws/overlibmws_draggable.js\"></script>\n"
 				}
 			}
-			default {
-				if { ![ah::is_js_sources_loaded -js_source "prototype"] } {
-					append script "<script type=\"text/javascript\" src=\"${ah_base_url}prototype/prototype.js\"></script> \n"
-				}
-				if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] } {
-					append script "<script type=\"text/javascript\" src=\"${ah_base_url}scriptaculous/scriptaculous.js\"></script> \n"		
-				}
-			}
+            "prototype" {
+                if { ![ah::is_js_sources_loaded -js_source "prototype"] } {
+                    append script "<script type=\"text/javascript\" src=\"${ah_base_url}prototype/prototype${minsuffix}.js\"></script> \n"
+                }
+            }
+            "autosuggest" {
+                if { ![ah::is_js_sources_loaded -js_source "autosuggest"] } {
+                    append script "<script type=\"text/javascript\" src=\"${ah_base_url}autosuggest/autosuggest.js\"></script>\n"
+                    append script "<link rel=\"stylesheet\" type=\"text/css\" href=\"${ah_base_url}autosuggest/autosuggest.css\" /> \n"
+                }
+            }
+            "scriptaculous" {
+                if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] } {
+                    append script "<script type=\"text/javascript\" src=\"${ah_base_url}scriptaculous/scriptaculous.js\"></script> \n"
+                }
+            }
+            "scriptaculous-effects" {
+                if { ![ah::is_js_sources_loaded -js_source "scriptaculous-effects"] } {
+                    append script "<script type=\"text/javascript\" src=\"${ah_base_url}scriptaculous/scriptaculous.js?load=effects\"></script> \n"
+                }
+            }
+            "scriptaculous-dragdrop" {
+                if { ![ah::is_js_sources_loaded -js_source "scriptaculous-dragdrop"] } {
+                    append script "<script type=\"text/javascript\" src=\"${ah_base_url}scriptaculous/scriptaculous.js?load=effects,dragdrop\"></script> \n"
+                }
+            }
 		}
 	}
 
@@ -156,11 +311,11 @@
 } {
 	Return the package_id of the installed and mounted ajax helper instance
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
-	@return 
+	@return
 
-	@error 
+	@error
 
 } {
 	return [apm_package_id_from_key "ajaxhelper"]
@@ -171,11 +326,11 @@
 } {
 	Return the path to the ajaxhelper resource files
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
-	@return 
+	@return
 
-	@error 
+	@error
 
 } {
 	return "/resources/ajaxhelper/"
@@ -185,12 +340,12 @@
 	element
 } {
 	Receives a string and surrounds it with single quotes.
-	This is a utility proc used to make a parameter passed to a proc a string.
+	This is a utility proc used to turn a parameter passed to a proc into a string.
 	The assumption is that an element passed as a parameter is a javascript variable.
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
-	@return 
+	@return
 } {
 	return "'$element'"
 }
@@ -199,7 +354,7 @@
 	-script:required
 } {
 	Encloses whatever is passed to the script parameter in javascript tags.
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
 
 	@param script string to enclose in javascript tags.
@@ -211,20 +366,20 @@
 }
 
 ad_proc -public ah::create_js_function {
-	-name:required
 	-body:required
+    {-name ""}
 	{-parameters {} }
 } {
 	Helper procedure to generate a javascript function
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-11-05
 
 	@param name The name of the javascript function
 	@param body The body of the javascript function
-	@param parameters The parameters of the javascript function
+	@param parameters The comma separated list of parameters of the javascript function
 } {
 	set script "function ${name} ("
-	append script [split "," $parameters]
+	if { [exists_and_not_null parameters] } { append script [join $parameters ","] }
 	append script ") \{ "
 	append script $body
 	append script " \} "
@@ -237,20 +392,20 @@
 	{-position "After"}
 } {
 	Inserts text or html in a position given the element as reference.
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-11-05
 
 	@param element The element that will be used as reference
 	@param text What you want to insert.
 	@param position Where you want to insert text. This is case sensitive. Possible values include After, Bottom, Before and Top. Defaults to After.
 } {
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
+	if { ![ah::is_js_sources_loaded -js_source "prototype"] } {
 		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype" 
+		lappend ajax_helper_js_sources "prototype"
 	}
 
 	set script "new Insertion.${position}('${element}','${text}'); "
-	return $script	
+	return $script
 }
 
 # ************ Listeners **************
@@ -262,23 +417,20 @@
 	{-element_is_var:boolean}
 	{-useCapture "false"}
 } {
-	Use prototype's Event object to watch/listen to a specific event from a specific html element.
+	Use prototype's Event object to watch/listen for a specific event from a specific html element.
 	Valid events include click, load, mouseover etc.
         See ah::yui::addlistener for Yahoo's implementation which some say is superior.
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-02-28
 
 	@param element the element you want to observe
 	@param event the event that the observer will wait for
 	@param obs_function the funcion that will be executed when the event is detected
-	
-} {	
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype" 
-	}
 
-	if { !$element_is_var_p } { 
+} {
+    ah::requires -sources "prototype"
+
+	if { !$element_is_var_p } {
 		set element [ah::isnot_js_var $element]
 	}
 	set script "Event.observe(${element}, '${event}', ${obs_function}, $useCapture);"
@@ -294,20 +446,17 @@
 } {
 	Use prototype's Event object to watch/listen to a specific event from a specific html element.
 	Valid events include click, load, mouseover etc.
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-02-28
 
 	@param element the element you want to observe
 	@param event the event that the observer will wait for
 	@param obs_function the funcion that will be executed when the event is detected
-	
+
 } {
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype" 
-	}
+    ah::requires -sources "prototype"
 
-	if { !$element_is_var_p } { 
+	if { !$element_is_var_p } {
 		set element [ah::isnot_js_var $element]
 	}
 	set script "Event.stopObserving(${element}, '${event}', ${obs_function}, $useCapture);"
@@ -327,23 +476,27 @@
 } {
 	Returns javascript that calls the prototype javascript library's ajax periodic updater object.
 	This object makes "polling" possible. Polling is a way by which a website can regularly update itself.
-	The ajax script is executed periodically in a set interval. 
+	The ajax script is executed periodically in a set interval.
 	It has the same properties as ajax update, the only difference is that it is executed after x number of seconds.
 	Parameters and options are case sensitive, refer to scriptaculous documentation
 	http://wiki.script.aculo.us/scriptaculous/show/Ajax.PeriodicalUpdater
+
+    @author Hamilton Chua (ham@solutiongrove.com)
+    @creation-date 2006-11-05
+
+    @param url the url that the ajax will call
+    @param container the html object that will get updated periodically
+    @param frequency how often is the script called, default is 5 seconds
 } {
 
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype" 
-	}
+    ah::requires -sources "prototype"
 
 	set preoptions "asynchronous:${asynchronous},frequency:${frequency},method:'post'"
 
-	if { [exists_and_not_null pars] } { 
+	if { [exists_and_not_null pars] } {
 		append preoptions ",parameters:$pars"
 	}
-	if { [exists_and_not_null options] } { append preoptions ",$options" }	
+	if { [exists_and_not_null options] } { append preoptions ",$options" }
 	set script "new Ajax.PeriodicalUpdater('$container','$url',{$preoptions}); "
 
 	return $script
@@ -357,30 +510,28 @@
 	{-options ""}
 } {
 	Returns javascript that calls the prototype javascript library's ajax request (Ajax.Request) object.
-	The Ajax.Request object will only perform an xmlhttp request to a url. 
+	The Ajax.Request object will only perform an xmlhttp request to a url.
 	If you prefer to perform an xmlhttp request and then update the contents of a < div >, look at ah::ajaxupdate.
 	Parameters and options are case sensitive, refer to scriptaculous documentation.
 	http://wiki.script.aculo.us/scriptaculous/show/Ajax.Request
 
-
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
 
 	@param url the url that the javascript will call/query
 	@param pars the parameters that will be passed to Ajax.Request. these parameters should normally be enclosed in single quotes ('') unless you intend to provide a javascript variable or function as a parameter
 	@param options the options that will be passed to the Ajax.Request javascript function
-        @param asynchronous the default is true
+    @param asynchronous the default is true
 
 } {
-	global ajax_helper_js_sources
-	lappend ajax_helper_js_sources "prototype"
+    ah::requires -sources "prototype"
 
 	set preoptions "asynchronous:${asynchronous},method:'post'"
 
-	if { [exists_and_not_null pars] } { 
+	if { [exists_and_not_null pars] } {
 		append preoptions ",parameters:$pars"
 	}
-	if { [exists_and_not_null options] } { append preoptions ",$options" }	
+	if { [exists_and_not_null options] } { append preoptions ",$options" }
 	set script "new Ajax.Request('$url',{$preoptions}); "
 
 	return $script
@@ -397,9 +548,9 @@
 	{-enclose:boolean}
 	{-container_is_var:boolean}
 } {
-	Generate an Ajax.Updater javascript object. 
+	Generate an Ajax.Updater javascript object.
 	The parameters are passed directly to the Ajax.Update script.
-	You can optionally specify an effect to use as the container is updated. 
+	You can optionally specify an effect to use as the container is updated.
 	By default it will use the "Appear" effect.
 	Parameters and options are case sensitive, refer to scriptaculous documentation.
 	http://wiki.script.aculo.us/scriptaculous/show/Ajax.Updater
@@ -411,8 +562,8 @@
 				-enclose  \
 				-effectopts "duration: 1.5"]
 	</pre>
-	
-	@author Hamilton Chua (ham@solutiongrove.com)	
+
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
 
 	@param container the 'id' of the layer (div) you want to update via ajax
@@ -422,22 +573,20 @@
 	@param effectopts options for the effect
 	@param enclose optionally specify whether you want your script to be enclosed in < script > tags
 
-	@return 
+	@return
 
-	@error 
+	@error
 } {
 
-	global ajax_helper_js_sources
-	lappend ajax_helper_js_sources "prototype"
-	lappend ajax_helper_js_sources "scriptaculous"
+    ah::requires -sources "prototype,scriptaculous-effects"
 
 	if { !$container_is_var_p } {
 		set container [ah::isnot_js_var $container]
 	}
 
 	set preoptions "asynchronous:$asynchronous,method:'post'"
 
-	if { [exists_and_not_null pars] } { 
+	if { [exists_and_not_null pars] } {
 		append preoptions ",parameters:$pars"
 	}
 	if { [exists_and_not_null options] } { append preoptions ",$options" }
@@ -448,7 +597,7 @@
 	}
 
 	set script "new Ajax.Updater ($container,'$url',\{$preoptions\}); "
-	
+
 	if { $enclose_p } { set script [ah::enclose_in_script -script ${script} ] }
 
 	return $script
@@ -463,28 +612,27 @@
 	This proc will generate javascript for an overlibmws popup.
 	This script has to go into a javscript event like onClick or onMouseover.
 	The ah::source must be executed with -source "overlibmws"
-	For more information about the options that you can pass 
+	For more information about the options that you can pass
 	http://www.macridesweb.com/oltest/
         See ah::yui::tooltip for Yahoo's implementation
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-02-12
 
 	@param content this is what the popup will contain or display. if content is text, enclose it in single quotes (' ').
 	@param options the options to pass to overlibmws
 
-	@return 
+	@return
 
-	@error 
+	@error
 
 } {
 
-	global ajax_helper_js_sources
-	lappend ajax_helper_js_sources "overlibmws"
+    ah::requires -sources "overlibmws"
 
 	if { [exists_and_not_null options] } {
 		set overlibopt ","
-		append overlibopt $options		
+		append overlibopt $options
 	} else {
 		set overlibopt ""
 	}
@@ -499,17 +647,16 @@
 	This script has to go into a javscript event like onClick or onMouseover.
 	The ah::source must be executed with -source "overlibmws"
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-02-12
 
-	@return 
+	@return
 
-	@error 
+	@error
 
 } {
 
-	global ajax_helper_js_sources
-	lappend ajax_helper_js_sources "overlibmws"
+    ah::requires -sources "overlibmws"
 
 	set script "nd();"
 	return $script
@@ -521,25 +668,23 @@
 	{-textsize "x-small"}
 } {
 
-	This proc will generate mouseover and mouseout javascript 
-	for dhtml callout or popup using overlibmws 
+	This proc will generate mouseover and mouseout javascript
+	for dhtml callout or popup using overlibmws
 	and the overlibmws bubble plugin.
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
 
 	@param type this is passed to the overlibmws script, refer to overlib documentation for possible values.
 	@param text the text that will appear in the popup.
 	@param textsize the size of the text in the popup
 
-	@return 
-	@error 
+	@return
+	@error
 
 } {
 
-	global ajax_helper_js_sources
-	lappend ajax_helper_js_sources "overlibmws"
-	lappend ajax_helper_js_sources "overlibmws_bubble"
+    ah::requires -sources "overlibmws,overlibmws_bubble"
 
 	set script "onmouseover=\""
 	append script [ah::popup -content "'$text'" -options "BUBBLE,BUBBLETYPE,'$type',TEXTSIZE,'$textsize'"]
@@ -554,31 +699,29 @@
 	{-pars ""}
 	{-options ""}
 	{-type "square"}
-	{-textsize "x-small"}	
+	{-textsize "x-small"}
 } {
 	This proc executes an xmlhttp call and outputs the response text in a bubblecallout.
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
-	
+
 	@param url the url to make the xmlhttp call to
 	@param pars the parameters in querystring format you want to pass to the url
         @param options the options you want to pass to overlibmws
         @param type parameter specific to the bubble callout
         @param textsize the size of the text in the callout
 
-	@return 
+	@return
 
-	@error 
+	@error
 } {
 
-	global ajax_helper_js_sources
-	lappend ajax_helper_js_sources "overlibmws"
-	lappend ajax_helper_js_sources "overlibmws_bubble"
+    ah::requires -sources "overlibmws,overlibmws_bubble"
 
 	set popup [ah::popup -content "t.responseText" -options "BUBBLE,BUBBLETYPE,'$type',TEXTSIZE,'$textsize'"]
 	set request [ah::ajaxrequest -url $url -pars '$pars' -options "onSuccess: function(t) { $popup }" ]
-	set script "onmouseover=\"$request\" onmouseout=\"nd();\"" 
+	set script "onmouseover=\"$request\" onmouseout=\"nd();\""
 	return $script
 }
 
@@ -590,34 +733,28 @@
 	{-options ""}
 	{-element_is_var:boolean}
 } {
-	Generates javascript for effects by scriptaculous. 
+	Generates javascript for effects by scriptaculous.
 	Refer to the scriptaculous documentaiton for a list of effects.
 	This proc by default will use the "Appear" effect
-	The parameters are passed directly to the scriptaculous effects script. 
+	The parameters are passed directly to the scriptaculous effects script.
 	Parameters and options are case sensitive, refer to scriptaculous documentation.
 	http://wiki.script.aculo.us/scriptaculous/show/CoreEffects
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-16
 
 	@param element the page element that you want to apply the effect to
 	@param effect specify one of the scriptaculous effects you want to implement
 	@param options specify the options to pass to the scritpaculous javascript
         @param element_is_var specify this if the element you are passing is a javascript variable
 
-	@return 
-	@error 
+	@return
+	@error
 
 } {
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype"
-		if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] } { 
-			lappend ajax_helper_js_sources "scriptaculous"
-		}
-	}
+    ah::requires -sources "prototype,scriptaculous-effects"
 
-	if { !$element_is_var_p } { 
+	if { !$element_is_var_p } {
 		set element [ah::isnot_js_var $element]
 	}
 	set script "new Effect.$effect\($element,\{$options\}\); "
@@ -631,31 +768,25 @@
 	{-element_is_var:boolean}
 } {
 	Generates javascript that toggles the state of an element.
-	The parameters are passed directly to the scriptaculous toggle script. 
+	The parameters are passed directly to the scriptaculous toggle script.
 	Parameters and options are case sensitive, refer to scriptaculous documentation.
 	http://wiki.script.aculo.us/scriptaculous/show/Effect.toggle
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-02-23
 
 	@param element the page element that you want to apply the effect to
 	@param effect specify one of the scriptaculous effects you want to toggle
 	@param options specify the options to pass to the scritpaculous javascript
         @param element_is_var specify this if the element you are passing is a javascript variable
-	
-        @return 
-	@error 
 
+        @return
+	@error
+
 } {
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype"
-		if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] } { 
-			lappend ajax_helper_js_sources "scriptaculous"
-		}
-	}
+    ah::requires -sources "prototype,scriptaculous-effects"
 
-	if { !$element_is_var_p } { 
+	if { !$element_is_var_p } {
 		set element [ah::isnot_js_var $element]
 	}
 	set script "Effect.toggle\($element,'$effect',{$options}\)"
@@ -671,32 +802,26 @@
 	{-element_is_var:boolean}
 } {
 	Generates javascript to make the given element a draggable.
-	The parameters are passed directly to the scriptaculous script. 
+	The parameters are passed directly to the scriptaculous script.
 	Parameters and options are case sensitive, refer to scriptaculous documentation.
 	http://wiki.script.aculo.us/scriptaculous/show/Draggables
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-24
 
 	@param element the page element that you want to make draggable
 	@param options specify the scriptaculous options
 	@param uid provide a unique id that is used as a variable to associate with the draggable
 	@param element_is_var specify this parameter if the element you are passing is a javscript variable
 
-	@return 
+	@return
 
-	@error 
+	@error
 
 } {
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype"
-		if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] } { 
-			lappend ajax_helper_js_sources "scriptaculous"
-		}
-	}
+    ah::requires -sources "prototype,scriptaculous-dragdrop"
 
-	if { !$element_is_var_p } { 
+	if { !$element_is_var_p } {
 		set element [ah::isnot_js_var $element]
 	}
 	set script "new Draggable \($element,\{$options\}\);"
@@ -711,32 +836,26 @@
 } {
 	Generates javascript to make the given element a droppable.
 	If a uid parameter is provided, the script will also check if the droppable with the same uid has already been created.
-	The parameters are passed directly to the scriptaculous script. 
+	The parameters are passed directly to the scriptaculous script.
 	Parameters and options are case sensitive, refer to scriptaculous documentation.
 	http://wiki.script.aculo.us/scriptaculous/show/Droppables
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-02-24
 
 	@param element the page element that you want to be a droppable
 	@param element_is_var specify this parameter if the element you are passing is a javscript variable
 	@param uid provide a unique id that is used as a variable to associate with the droppable
 	@param options specify the scriptaculous options for droppables
 
-	@return 
+	@return
 
-	@error 
+	@error
 
-} {	
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype"
-		if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] } { 
-			lappend ajax_helper_js_sources "scriptaculous"
-		}
-	}
+} {
+    ah::requires -sources "prototype,scriptaculous-dragdrop"
 
-	if { !$element_is_var_p } { 
+	if { !$element_is_var_p } {
 		set element [ah::isnot_js_var $element]
 	}
 
@@ -750,29 +869,24 @@
 	{-element_is_var:boolean}
 } {
 	Generates javascript to remove a droppable.
-	The parameters are passed directly to the scriptaculous script. 
+	The parameters are passed directly to the scriptaculous script.
 	Parameters and options are case sensitive, refer to scriptaculous documentation.
 	http://wiki.script.aculo.us/scriptaculous/show/Droppables
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-02-24
 
 	@param element the page element that you want to be a droppable
 	@param element_is_var specify this parameter if the element you are passing is a javscript variable
 
-	@return 
-	@error 
+	@return
+	@error
 
 } {
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype"
-		if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] } { 
-			lappend ajax_helper_js_sources "scriptaculous"
-		}
-	}
 
-	if { !$element_is_var_p } { 
+    ah::requires -sources "prototype,scriptaculous-dragdrop"
+
+	if { !$element_is_var_p } {
 		set element [ah::isnot_js_var $element]
 	}
 	set script "Droppables.remove \($element);"
@@ -786,30 +900,25 @@
 	{-element_is_var:boolean}
 } {
 	Generates javascript for sortable elements.
-	The parameters are passed directly to the scriptaculous sortable script. 
+	The parameters are passed directly to the scriptaculous sortable script.
 	Parameters and options are case sensitive, refer to scriptaculous documentation.
 	http://wiki.script.aculo.us/scriptaculous/show/Sortables
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-24
 
 	@param element the page element that you want to apply the effect to
 	@param options specify the scriptaculous options
 	@param element_is_var specify this parameter if the element you are passing is a javscript variable
 
-	@return 
-	@error 
+	@return
+	@error
 
 } {
-	if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "prototype"
-		if { ![ah::is_js_sources_loaded -js_source "scriptaculous"] } { 
-			lappend ajax_helper_js_sources "scriptaculous"
-		}
-	}
 
-	if { !$element_is_var_p } { 
+    ah::requires -sources "prototype,scriptaculous-dragdrop"
+
+	if { !$element_is_var_p } {
 		set element [ah::isnot_js_var $element]
 	}
 	set script "Sortable.destroy($element); "
@@ -831,7 +940,7 @@
 	Parameters are case sensitive.
 	http://www.curvycorners.net/
 
-	@author Hamilton Chua (ham@solutiongrove.com)	
+	@author Hamilton Chua (ham@solutiongrove.com)
 	@creation-date 2006-01-24
 
 	@param classname The name of the html class that the script will look for. All validtags with this classname will be rounded.
@@ -841,12 +950,10 @@
 
 } {
 
-	if { ![ah::is_js_sources_loaded -js_source "rounder"] } { 
-		global ajax_helper_js_sources
-		lappend ajax_helper_js_sources "rounder"
-	}
 
-	if { !$element_is_var_p } { 
+    ah::requires -sources "rounder"
+
+	if { !$element_is_var_p } {
 		set element [ah::isnot_js_var $element]
 	}
 
@@ -880,11 +987,9 @@
                       the array
 } {
 
-   if { ![ah::is_js_sources_loaded -js_source "prototype"] } { 
-	global ajax_helper_js_sources
-	lappend ajax_helper_js_sources "prototype" 
-   }
 
+    ah::requires -sources "prototype,autosuggest"
+
     if {[llength $array_list]} {
 	set suggestion_list $array_list
     } elseif {![string equal $sql_query {}]} {
@@ -895,7 +1000,7 @@
     }
 
     set suggestions_stub {}
-    
+
     append suggestions_stub "
 function AUTOSuggestions() {
     this.auto = \[
@@ -918,9 +1023,9 @@
 								 var aSuggestions = [];
 								 var aDescriptions = [];
 								 var sTextboxValue = oAutoSuggestControl.textbox.value.toLowerCase();
-								  
+
 								 if (sTextboxValue.length > 0){
-								          
+
 								          //search for matching states
 									  for (var i=0; i < this.auto.length; i++) {
 														    if (this.auto[i][0].toLowerCase().indexOf(sTextboxValue) == 0) {
@@ -929,12 +1034,12 @@
 														    }
 														}
 								      }
-								  
+
 								  //provide suggestions to the control
 								 oAutoSuggestControl.autosuggest(aSuggestions, aDescriptions, bTypeAhead);
 							     };
 }
- 
+
 return $suggestions_stub
 
 }
\ No newline at end of file