diff options
| author | shadlaws <shad@shadlaws.com> | 2013-03-12 15:00:59 +0100 |
|---|---|---|
| committer | shadlaws <shad@shadlaws.com> | 2013-03-12 15:00:59 +0100 |
| commit | a1b5cf2e8daa2b0205d58c5355bf57edcdd3821f (patch) | |
| tree | 962cc395a742985cc5c33df3eb8a0a6216f0fad8 /modules/gallery/tests | |
| parent | cb8a63bb483742e86af9afd4e931b36638131317 (diff) | |
#2051 - Revise how Gallery_View returns combined JS and CSS.
Changed Gallery_View's JS and CSS combining to:
- have get_combined() combine all groups if called without arguments.
- ensure the "core" group is combined first.
- always put links where get_combined() is called, even if combining is disabled (otherwise the order isn't preserved).
- add key as cache buster when combining is disabled.
- make "LOOKING FOR YOUR CSS/JAVASCRIPT..." comments in get_combined(), not in the theme itself.
Also, revised xss_data.txt golden file (line number changes only).
Diffstat (limited to 'modules/gallery/tests')
| -rw-r--r-- | modules/gallery/tests/xss_data.txt | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt index 5daaa371..2152858a 100644 --- a/modules/gallery/tests/xss_data.txt +++ b/modules/gallery/tests/xss_data.txt @@ -388,19 +388,19 @@ modules/watermark/views/admin_watermarks.html.php 20 DIRTY_ATTR $url themes/admin_wind/views/admin.html.php 4 DIRTY $theme->html_attributes() themes/admin_wind/views/admin.html.php 34 DIRTY $theme->admin_head() themes/admin_wind/views/admin.html.php 46 DIRTY_JS $theme->url() -themes/admin_wind/views/admin.html.php 51 DIRTY $theme->get_combined("css") -themes/admin_wind/views/admin.html.php 54 DIRTY $theme->get_combined("script") -themes/admin_wind/views/admin.html.php 58 DIRTY $theme->admin_page_top() -themes/admin_wind/views/admin.html.php 66 DIRTY $theme->admin_header_top() -themes/admin_wind/views/admin.html.php 67 DIRTY_JS item::root()->url() -themes/admin_wind/views/admin.html.php 70 DIRTY $theme->user_menu() -themes/admin_wind/views/admin.html.php 73 DIRTY $theme->admin_menu() -themes/admin_wind/views/admin.html.php 76 DIRTY $theme->admin_header_bottom() -themes/admin_wind/views/admin.html.php 83 DIRTY $content -themes/admin_wind/views/admin.html.php 89 DIRTY $sidebar -themes/admin_wind/views/admin.html.php 94 DIRTY $theme->admin_footer() -themes/admin_wind/views/admin.html.php 97 DIRTY $theme->admin_credits() -themes/admin_wind/views/admin.html.php 102 DIRTY $theme->admin_page_bottom() +themes/admin_wind/views/admin.html.php 50 DIRTY $theme->get_combined("css") +themes/admin_wind/views/admin.html.php 51 DIRTY $theme->get_combined("script") +themes/admin_wind/views/admin.html.php 55 DIRTY $theme->admin_page_top() +themes/admin_wind/views/admin.html.php 63 DIRTY $theme->admin_header_top() +themes/admin_wind/views/admin.html.php 64 DIRTY_JS item::root()->url() +themes/admin_wind/views/admin.html.php 67 DIRTY $theme->user_menu() +themes/admin_wind/views/admin.html.php 70 DIRTY $theme->admin_menu() +themes/admin_wind/views/admin.html.php 73 DIRTY $theme->admin_header_bottom() +themes/admin_wind/views/admin.html.php 80 DIRTY $content +themes/admin_wind/views/admin.html.php 86 DIRTY $sidebar +themes/admin_wind/views/admin.html.php 91 DIRTY $theme->admin_footer() +themes/admin_wind/views/admin.html.php 94 DIRTY $theme->admin_credits() +themes/admin_wind/views/admin.html.php 99 DIRTY $theme->admin_page_bottom() themes/admin_wind/views/block.html.php 3 DIRTY_ATTR $anchor themes/admin_wind/views/block.html.php 5 DIRTY $id themes/admin_wind/views/block.html.php 5 DIRTY_ATTR $css_id @@ -436,17 +436,17 @@ themes/wind/views/page.html.php 32 DIRTY $new_w themes/wind/views/page.html.php 33 DIRTY $new_height themes/wind/views/page.html.php 34 DIRTY $thumb_proportion themes/wind/views/page.html.php 68 DIRTY_JS $theme->url() -themes/wind/views/page.html.php 73 DIRTY $theme->get_combined("css") -themes/wind/views/page.html.php 76 DIRTY $theme->get_combined("script") -themes/wind/views/page.html.php 86 DIRTY $header_text -themes/wind/views/page.html.php 88 DIRTY_JS item::root()->url() -themes/wind/views/page.html.php 92 DIRTY $theme->user_menu() -themes/wind/views/page.html.php 107 DIRTY_ATTR $breadcrumb->last?"g-active":"" -themes/wind/views/page.html.php 108 DIRTY_ATTR $breadcrumb->first?"g-first":"" -themes/wind/views/page.html.php 109 DIRTY_JS $breadcrumb->url -themes/wind/views/page.html.php 122 DIRTY $content -themes/wind/views/page.html.php 128 DIRTY newView("sidebar.html") -themes/wind/views/page.html.php 135 DIRTY $footer_text +themes/wind/views/page.html.php 72 DIRTY $theme->get_combined("css") +themes/wind/views/page.html.php 73 DIRTY $theme->get_combined("script") +themes/wind/views/page.html.php 83 DIRTY $header_text +themes/wind/views/page.html.php 85 DIRTY_JS item::root()->url() +themes/wind/views/page.html.php 89 DIRTY $theme->user_menu() +themes/wind/views/page.html.php 104 DIRTY_ATTR $breadcrumb->last?"g-active":"" +themes/wind/views/page.html.php 105 DIRTY_ATTR $breadcrumb->first?"g-first":"" +themes/wind/views/page.html.php 106 DIRTY_JS $breadcrumb->url +themes/wind/views/page.html.php 119 DIRTY $content +themes/wind/views/page.html.php 125 DIRTY newView("sidebar.html") +themes/wind/views/page.html.php 132 DIRTY $footer_text themes/wind/views/paginator.html.php 33 DIRTY_JS $first_page_url themes/wind/views/paginator.html.php 42 DIRTY_JS $previous_page_url themes/wind/views/paginator.html.php 70 DIRTY_JS $next_page_url |