Move drupal_add_js $reset parameter as an option for $options['type'] [#345973]

This patch does what the title says. This allows for the possibility of ultimately allowing the option to override function parameters for #315100: Allow to add JS/CSS libraries (sets of files, settings, and dependent libraries).

That means that to reset js, you'll call drupal_add_js(NULL, 'reset'); rather than drupal_add_js(NULL, NULL, TRUE);

For completeness, we do the same with drupal_add_css. (Hoping we can merge those two functions later for cleaner code.) This patch also takes care of all simpletests for the two. I grepped core for drupal_add_js(NULL, NULL, TRUE); and drupal_add_css(NULL, NULL, TRUE); but found nothing.

There's also the possibility that something like drupal_add_js('myfile.js', 'header', TRUE); is called, which would be bad practice now. I did a quick scan through the API and didn't see anything, so it's probably safe.

Comment	File	Size	Author
#8	345973.patch	6.3 KB	RobLoach
#8
#6	345973.patch	5.96 KB	RobLoach
#6
#4	345973.patch	5.91 KB	RobLoach
#4
#2	drupal_add_js_reset.patch	6.36 KB	aaron
#2
	drupal_add_js_reset.patch	6.38 KB	aaron

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

RobLoach

he/him

CreditAttribution: RobLoach commented 12 December 2008 at 17:13

Status:

Active

» Needs work

This is wicked awesome cool, but noticed this:

-function drupal_add_css($path = NULL, $options = NULL, $reset = FALSE) {
-  static $css = array();
+function drupal_add_css($path = NULL, $options = NULL) {
+static $css = array();

Would be good to have the two spaces in there. I'll be able to hit this up sometime in the next 12 hours.

Comment #2

aaron CreditAttribution: aaron commented 13 December 2008 at 02:26

Status:

Needs work

» Needs review

File	Size
drupal_add_js_reset.patch	6.36 KB

thanks for catching that. here's an updated patch.

Comment #3

RobLoach

he/him

CreditAttribution: RobLoach commented 9 January 2009 at 14:18

Status:

Needs review

» Reviewed & tested by the community

Yay!

Comment #4

RobLoach

he/him

CreditAttribution: RobLoach commented 9 January 2009 at 14:22

File	Size
345973.patch	5.91 KB

Sorry, thought I should remove the fuzzies. Didn't change anything code-wise.

Comment #5

quicksketch

he/him

CreditAttribution: quicksketch commented 12 January 2009 at 21:07

Status:

Reviewed & tested by the community

» Needs work

Hrm, it seems to me that the documentation for the 'reset' parameter is inaccurate.

+ *   Note that if $options or $options['type'] is 'reset', then $path will be
+ *   ignored.

This doesn't seem to be the case, the processing continues even after the reset. So you could in theory add CSS/JS file at the same time as resetting all the current files. Should we add a "return" immediately following the if (options['reset']) or should we adjust the docs? The $options['reset'] option also needs a much better description, since it doesn't say what it actually does.