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).
Move the pager() function up to Gallery_View and replace
themes/admin_wind/views/pager.html.php (Pagination based) with a
modified version from the wind theme in
themes/admin_wind/views/paginator.html.php. Fixes#1718.
type, unset the combine_queue for that type entirely. This way future
calls to css() and script() emit an element until there's a new call
to start_combining(). Fixes 1685.
combined and when. Backwards compatible in that old themes will work,
but their CSS/JS will no longer be combined unless they make some
changes. Fixes#1600.
theme. Because the theme comes first, this means that themes can
override any module resources, at the cost that we no longer have
namespacing for JS and CSS files.
The only file getting used outside of this model is
themes/default/screen.css which is used in the admin theme. I fixed
that by copying screen.css into admin_default and renaming its
screen.css to admin_screen.css. I also copied over all the images
that it was referencing.
Fixes tickets #48 and #539.
Theme API changes:
- theme_script(), theme_url() and theme_css() are no longer needed
- script(), url() and css() now refer to the first matching asset in
the module load path, where gallery3/lib is at the end of the path
1) Include the url in the cache key so that if the Gallery moves, we
don't use old cached entries.
2) Use the relative path to files in the comments that we embed in our
files so that we don't leak local paths.
in my last refactor):
1) Actually combine the JS (I was only combining the CSS)
2) Add line breaks between the files and comment them so that we can
find a specific file inside the blob.
3) Add an HTML comment to help developers figure out why they can't
find their CSS/JS.
doesn't fix the problem that we need to support multiple media types
(the original code had superfish using just "screen", and some other
deviations).
There's no code yet to support multiple media types, but it would not
be too difficult to create buckets based on media.
1) CSS files are added to the combined version by use of $theme->css() or $theme->css_theme() methods
2) url references in the css are converted to full paths as opposed to relative
3) @import statements in the css are resolved as well.
4) need to move the [if IE] statements into the css files so the will be honored in the browser. currently the ie fix css are always included.
Gallery_View base class from Theme_View and Admin_View.
1) Move all the theme specific jquery stuff from gallery_theme::head()
and admin_head() into the theme files. Use $theme->script() as
appropriate.
2) Get rid of the extra boolean on $theme->url() that we were using so
that we could call $theme->script($theme->url(...)) -- add
$theme->theme_script() instead (poorly named, but still clearer than
what we had before)
3) Fix the bug that combined scripts didn't work at all in the admin
theme.
4) Get rid of $theme->display() in favor of new View(...)
