Skip to content

Commit

Permalink
Upgrades Minify library to 2.1.5, includes new tools which we may use…
Browse files Browse the repository at this point in the history
… in the future [#603 state:resolved]
  • Loading branch information
dleffler committed May 11, 2012
1 parent 322a6e7 commit fd8877a
Show file tree
Hide file tree
Showing 36 changed files with 2,109 additions and 1,246 deletions.
13 changes: 8 additions & 5 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,26 @@ Copyright (c) 2004-2012 OIC Group, Inc.

Added / Fixed / changed for 2.0.7
-----------------------
# This release focuses on fixing bugs and enhanced (speed/size) initial module loading
# This release focuses on fixing bugs and enhanced speed/size
- incorporates all fixes from v2.0.6 patches
- Exponent CMS should work on servers running php v5.4 (v5.2.1 or later required)
- Exponent CMS should work on servers running php v5.4.x (v5.2.1 or later required)
- polishes older modules to better resemble new modules for greater interface consistency
-- e.g., all modules now use same rank reordering dialog instead of up/down arrow buttons
- removes unnecessary (new) unpublish feature from blog
- adds publish date feature to filedownloads
- adds 'go to date' feature to calendar module
-- adds experimental iCalendar aggregation feature (can be slow)
- adds new photo album slideshow view with vertical thumbnails
- changes all item/module ranking to use drag/drop dialog
- better handling of video (and audio) uploads and previews
- adds tag list/cloud sorting by # hits and setting limits
- adds option to rename 'Uncategorized' group label per module
- fixes youtube module to finally handle multiple items (paging, reordering, etc...)
- fixes some pagination anomalies associated with multiple pages and sorting
- manage users now is sortable with more accurate filters
- adds optional links to display printer friendly views or export pdf for blog, news, filedownload, & portfolio items and calendars
- adds delete command to recycle bin items, plus new display of all recycled modules
- translation more widely implemented; machine translations updated
-- export to pdf requires optional package installation
- adds new delete command to recycle bin items, plus new display of all recycled modules
- translations more widely implemented; machine translations updated
- plus other tweaks, fixes, and features

Added / Fixed / changed for 2.0.6
Expand Down
2 changes: 1 addition & 1 deletion RELEASE
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ For a complete list of the changes made from release to release, see the CHANGEL

2.0.7 - May 2012
========================
# This release focuses on fixing bugs and enhanced (speed/size) initial module loading
# This release focuses on fixing bugs and enhanced speed/size
5 changes: 3 additions & 2 deletions external/ExtPrograms.csv
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Program,Version,URL,Avail version,Exponent Customization Notes:
CKEditor,3.6.3,ckeditor.com,3.6.3,
FlowPlayer,3.2.10,flowplayer.org,3.2.10,
Swift,4.1.6,swiftmailer.org,4.1.6,
Swift,4.1.7,swiftmailer.org,4.1.7,
ups-php,0.2,code.google.com/p/ups-php,0.2,
fedex-php,9.0.0,,,
swfobject,2.2,code.google.com/p/swfobject,2.2,
Smarty,3.1.8,smarty.net,3.1.8,
phpthumb,1.7.11,phpthumb.sourceforge.net,1.7.11,"phpThumb.config.php - we set the cache folder, also several local bug fixes"
minify,2.1.4beta,github.com/mrclay/minify,2.1.4beta,
minify,2.1.5,github.com/mrclay/minify,2.1.5,
YUI2,2.9.0,developer.yahoo.com/yui/2,2.9.0,
YUI3,3.4.0,developer.yahoo.com/yui/3,3.5.0,
yui2in3,,github.com/yui/2in3,,
Expand All @@ -19,3 +19,4 @@ SimplePie,1.3dev,simplepie.org,1.3dev,compiled version placed in News module/rep
pixidou,0.1,github.com/asvinb/pixidou,0.1,"placed in Pixidou module, heavily modified at this point"
class.upload,0.31,www.verot.net/php_class_upload.htm,0.31,"placed in Pixidou module, editted _destruct"
dompdf,6.0b3,code.google.com/p/dompdf/,6.0b3,
iCalCreator,2.12,kigkonsult.se/iCalcreator,2.12,comment out timezone in config
10 changes: 10 additions & 0 deletions external/minify/HISTORY.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Minify Release History

Version 2.1.5
* Removed XSS vulnerability
* Disabled builder bby default
* command line tools to minify and rewrite URIs in CSS
* upgrade (optional) JSMin+ library
* more efficient JS minification when using CC/YUIC
* Closure Compiler uses cURL when allow_url_fopen is off
* Missing file notices when using groups

Version 2.1.4
* Option to minify JS with Closure Compiler API w/ JSMin failover
* Cookie/bookmarklet-based debug mode. No HTML editing!
* Allows 1 file to be missing w/o complete failure
* Combine multiple groups and files in single URI
Expand Down
22 changes: 11 additions & 11 deletions external/minify/min/README.txt → external/minify/MIN.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
The files in this directory represent the default Minify setup designed to ease
The files in the /min/ directory represent the default Minify setup designed to ease
integration with your site. This app will combine and minify your Javascript or
CSS files and serve them with HTTP compression and cache headers.


RECOMMENDED

It's recommended to edit config.php to set $min_cachePath to a writeable
It's recommended to edit /min/config.php to set $min_cachePath to a writeable
(by PHP) directory on your system. This will improve performance.


Expand All @@ -23,7 +23,7 @@ Let's say you want to serve this file:
Here's the "Minify URL" for this file:
http://example.com/min/?f=wp-content/themes/default/default.css

In other words, the "f" argument is set to the file path from root without the
In other words, the "f" argument is set to the file path from root without the
initial "/". As CSS files may contain relative URIs, Minify will automatically
"fix" these by rewriting them as root relative.

Expand Down Expand Up @@ -53,14 +53,14 @@ E.g., the following URLs will serve the exact same content:

MINIFY URLS IN HTML

In (X)HTML files, don't forget to replace any "&" characters with "&".
In HTML files, don't forget to replace any "&" characters with "&".


SPECIFYING ALLOWED DIRECTORIES

By default, Minify will serve any *.css/*.js files within the DOCUMENT_ROOT. If
you'd prefer to limit Minify's access to certain directories, set the
$min_serveOptions['minApp']['allowDirs'] array in config.php. E.g. to limit
you'd prefer to limit Minify's access to certain directories, set the
$min_serveOptions['minApp']['allowDirs'] array in config.php. E.g. to limit
to the /js and /themes/default directories, use:

$min_serveOptions['minApp']['allowDirs'] = array('//js', '//themes/default');
Expand All @@ -69,7 +69,7 @@ $min_serveOptions['minApp']['allowDirs'] = array('//js', '//themes/default');
GROUPS: NICER URLS

For nicer URLs, edit groupsConfig.php to pre-specify groups of files
to be combined under preset keys. E.g., here's an example configuration in
to be combined under preset keys. E.g., here's an example configuration in
groupsConfig.php:

return array(
Expand All @@ -79,7 +79,7 @@ return array(
This pre-selects the following files to be combined under the key "js":
http://example.com/js/Class.js
http://example.com/js/email.js

You can now serve these files with this simple URL:
http://example.com/min/?g=js

Expand All @@ -88,7 +88,7 @@ GROUPS: SPECIFYING FILES OUTSIDE THE DOC_ROOT

In the groupsConfig.php array, the "//" in the file paths is a shortcut for
the DOCUMENT_ROOT, but you can also specify paths from the root of the filesystem
or relative to the DOC_ROOT:
or relative to the DOC_ROOT:

return array(
'js' => array(
Expand All @@ -110,8 +110,8 @@ Separate group keys with commas:
FAR-FUTURE EXPIRES HEADERS

Minify can send far-future (one year) Expires headers. To enable this you must
add a number to the querystring (e.g. /min/?g=js&1234 or /min/f=file.js&1234)
and alter it whenever a source file is changed. If you have a build process you
add a number to the querystring (e.g. /min/?g=js&1234 or /min/f=file.js&1234)
and alter it whenever a source file is changed. If you have a build process you
can use a build/source control revision number.

You can alternately use the utility function Minify_getUri() to get a "versioned"
Expand Down
42 changes: 20 additions & 22 deletions external/minify/README.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
THIS IS A BETA RELEASE OF MINIFY 2.1.4

With it comes lots of new bug fixes and features (more details in
HISTORY.txt), but potentially new bugs as well, so be on the lookout.

Please kick the tires, especially with the cookie-based debug mode
and combining multiple groups and files together.


WELCOME TO MINIFY 2.1!
WELCOME TO MINIFY!

Minify is an HTTP content server. It compresses sources of content
(usually files), combines the result and serves it with appropriate
Expand All @@ -21,33 +12,40 @@ WORDPRESS USER?

These WP plugins integrate Minify into WordPress's style and script hooks to
get you set up faster.
http://wordpress.org/extend/plugins/wp-minify/
http://wordpress.org/extend/plugins/bwp-minify/
http://wordpress.org/extend/plugins/w3-total-cache/


UPGRADING
INSTALLATION

See UPGRADING.txt for instructions.
Place the /min/ directory as a child of your DOCUMENT_ROOT
directory: i.e. you will have: /home/example/www/min


INSTALLATION AND USAGE:
CONFIGURATION & USAGE

1. Place the /min/ directory as a child of your DOCUMENT_ROOT
directory: i.e. you will have: /home/user/www/min
See the MIN.txt file and http://code.google.com/p/minify/wiki/UserGuide

2. Open http://yourdomain/min/ in a web browser. This will forward
you to the Minify URI Builder application, which will help you
quickly start using Minify to serve content on your site.
Minify also comes with a URI Builder application that can help you write URLs
for use with Minify or configure groups of files.

See the User Guide: http://code.google.com/p/minify/wiki/UserGuide
To enable this, edit min/config.php, set $min_enableBuilder = true; and visit
http://example.org/min/builder/

When you're finished with this, please set $min_enableBuilder = false;


UPGRADING

See UPGRADING.txt for instructions.


UNIT TESTING:

1. Place the /min_unit_tests/ directory as a child of your DOCUMENT_ROOT
directory: i.e. you will have: /home/user/www/public_html/min_unit_tests
directory: i.e. you will have: /home/example/www/min_unit_tests

2. To run unit tests, access: http://yourdomain/min_unit_tests/test_all.php
2. To run unit tests, access: http://example.org/min_unit_tests/test_all.php

(If you wish, the other test_*.php files can be run to test individual
components with more verbose output.)
Expand Down
11 changes: 2 additions & 9 deletions external/minify/UPGRADING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ UPGRADING FROM 2.1.*

1. Rename the following files:

/min/config.php --> /min/old_config.php
/min/config.php --> /min/old_config.php
/min/groupsConfig.php --> /min/old_groupsConfig.php

2. Overwrite all files in /min (and /min_unit_tests) with those from this zip.
Expand All @@ -15,14 +15,7 @@ UPGRADING FROM 2.1.*

5. Merge your settings in old_config.php into config.php.

* If you've set $_SERVER['DOCUMENT_ROOT'], instead set the new option
$min_documentRoot. This is advantageous on IIS systems because Minify
will no longer overwrite the path you specified.

* $min_errorLogger adds the ability to enable FirePHP logging.

6. (optional) Delete /min/old_config.php and the Minify files from your cache
directory (specified in $min_cachePath).
6. (optional) Delete /min/old_config.php.


INSTALLING FRESH
Expand Down
12 changes: 6 additions & 6 deletions external/minify/min/.htaccess
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteEngine on

# You may need RewriteBase on some servers
#RewriteBase /min
# You may need RewriteBase on some servers
#RewriteBase /min

# rewrite URLs like "/min/f=..." to "/min/?f=..."
RewriteRule ^([bfg]=.*) index.php?$1 [L,NE]
# rewrite URLs like "/min/f=..." to "/min/?f=..."
RewriteRule ^([bfg]=.*) index.php?$1 [L,NE]
</IfModule>
<IfModule mod_env.c>
# In case AddOutputFilterByType has been added
SetEnv no-gzip
SetEnv no-gzip
</IfModule>
Loading

0 comments on commit fd8877a

Please sign in to comment.