diff --git a/README.txt b/README.txt index c5a2bf4..35ce793 100644 --- a/README.txt +++ b/README.txt @@ -98,31 +98,31 @@ Technical Details: css__[BASE64_HASH]__[BASE64_HASH]__[BASE64_HASH].css The first base64 hash value tells us what files are included in the - aggregrate. Changing what files get included will change this value. + aggregate. Changing what files get included will change this value. The second base64 hash value is used as a sort of version control; it changes if any of the base files contents have changed. Changing a base files content (like drupal.js) will change this value. The third base64 hash value records what settings were used when generating - the aggregrate. Changing a setting that affects how aggregrates get built + the aggregate. Changing a setting that affects how aggregates get built (like toggling "Create .gz files") will change this value. Hooks: Modify file contents. * advagg_get_css_file_contents_alter. Modify the data of each file before it - gets glued together into the bigger aggregrate. Useful for minification. + gets glued together into the bigger aggregate. Useful for minification. * advagg_get_js_file_contents_alter. Modify the data of each file before it - gets glued together into the bigger aggregrate. Useful for minification. + gets glued together into the bigger aggregate. Useful for minification. * advagg_get_css_aggregate_contents_alter. Modify the data of the complete - aggreate before it gets written to a file. Useful for minification. + aggregate before it gets written to a file. Useful for minification. * advagg_get_js_aggregate_contents_alter. Modify the data of the complete - aggreate before it gets written to a file.Useful for minification. - * advagg_save_aggregate. Modify the data of the complete aggreate allowing one - create mutiple files from one base file. Useful for gzip compression. + aggregate before it gets written to a file.Useful for minification. + * advagg_save_aggregate. Modify the data of the complete aggregate allowing one + create multiple files from one base file. Useful for gzip compression. -Modify file names and aggregrate bundles. +Modify file names and aggregate bundles. * advagg_get_hooks_hash_alter. Add in your own settings and hooks allowing one to modify the 3rd base64 hash in a filename. * advagg_build_aggregate_plans_alter diff --git a/advagg.admin.js b/advagg.admin.js index 5cb7255..649a7e8 100644 --- a/advagg.admin.js +++ b/advagg.admin.js @@ -24,7 +24,7 @@ function advagg_toggle_cookie() { + ' domain=.' + document.location.hostname + ';'; alert(Drupal.t('AdvAgg Bypass Cookie Removed')); } - // If the cookie does not exsit then set it. + // If the cookie does not exist then set it. else { document.cookie = cookie_name + '=' + Drupal.settings.advagg.key + ';' + ' path=' + Drupal.settings.basePath + ';' diff --git a/advagg.advagg.inc b/advagg.advagg.inc index 774aac4..09e678e 100644 --- a/advagg.advagg.inc +++ b/advagg.advagg.inc @@ -54,12 +54,12 @@ function advagg_advagg_save_aggregate_alter(&$files_to_save) { * * @param $files * List of files in the aggregate as well as the aggregate name. - * @param $modifed + * @param $modified * Change this to TRUE if $files has been changed. * @param $type * css or js. */ -function advagg_advagg_build_aggregate_plans_alter(&$files, &$modifed, $type) { +function advagg_advagg_build_aggregate_plans_alter(&$files, &$modified, $type) { // Do nothing if core grouping is disabled. if (!variable_get('advagg_core_groups', ADVAGG_CORE_GROUPS)) { return; @@ -89,13 +89,13 @@ function advagg_advagg_build_aggregate_plans_alter(&$files, &$modifed, $type) { $counter++; $group = $fileinfo['group']; $every_page = $fileinfo['every_page']; - $modifed = TRUE; + $modified = TRUE; } $temp_new_files[$counter][] = $fileinfo; } $counter++; } - // Replace $files array with new aggregrate filenames. + // Replace $files array with new aggregate filenames. $files = advagg_generate_filenames(array($temp_new_files), $type); } diff --git a/advagg.inc b/advagg.inc index e90120c..3d52eb3 100644 --- a/advagg.inc +++ b/advagg.inc @@ -449,12 +449,12 @@ function advagg_clearstatcache($filename = NULL) { /** * Group the CSS/JS into the biggest buckets possible. * - * @param $files_to_aggregrate + * @param $files_to_aggregate * An array of CSS/JS groups. * @return array * New version of groups. */ -function advagg_generate_groups($files_to_aggregrate) { +function advagg_generate_groups($files_to_aggregate) { $groups = array(); $count = 0; $location = 0; @@ -463,7 +463,7 @@ function advagg_generate_groups($files_to_aggregrate) { $cache = ''; $scope = ''; $browsers = array(); - foreach ($files_to_aggregrate as $data) { + foreach ($files_to_aggregate as $data) { foreach ($data as $values) { // Group into the biggest buckets possible. @@ -496,7 +496,7 @@ function advagg_generate_groups($files_to_aggregrate) { } // If one of the above options changed, it needs to be in a different - // aggregrate. + // aggregate. if ($changed) { $count++; } @@ -512,9 +512,9 @@ function advagg_generate_groups($files_to_aggregrate) { /** * Replacement for drupal_build_css_cache() and drupal_build_js_cache(). */ -function advagg_build_aggregate_plans($files_to_aggregrate, $type) { +function advagg_build_aggregate_plans($files_to_aggregate, $type) { // Place into biggest grouping possible. - $groups = advagg_generate_groups($files_to_aggregrate); + $groups = advagg_generate_groups($files_to_aggregate); // Get filenames. $files = advagg_generate_filenames($groups, $type); @@ -524,11 +524,11 @@ function advagg_build_aggregate_plans($files_to_aggregrate, $type) { // Run hooks to modify the aggregate. // Call hook_advagg_build_aggregate_plans_alter(). - $modifed = FALSE; - drupal_alter('advagg_build_aggregate_plans', $files, $modifed, $type); + $modified = FALSE; + drupal_alter('advagg_build_aggregate_plans', $files, $modified, $type); - // If the hook above modifed anything, re-insert into database. - if ($modifed) { + // If the hook above modified anything, re-insert into database. + if ($modified) { // Insert/Update Database. advagg_insert_update_db($files, $type, 0); } diff --git a/advagg.missing.inc b/advagg.missing.inc index f6ad16d..22830d0 100644 --- a/advagg.missing.inc +++ b/advagg.missing.inc @@ -93,7 +93,7 @@ function advagg_missing_generate() { * * @return * On failure a sting saying why it failed. - * On sucess array($type, $aggregate_hash, $files_hash). + * On success array($type, $aggregate_hash, $files_hash). */ function advagg_get_hashes_from_filename($filename) { // Verify requested filename has the correct pattern. @@ -256,7 +256,7 @@ function advagg_get_js_aggregate_contents($files) { return $data; } -// File save functinos. +// File save functions. /** * Save an aggregate given a filename, the files included in it, and the type. * @@ -274,7 +274,7 @@ function advagg_get_js_aggregate_contents($files) { function advagg_save_aggregate($filename, $files, $type) { list($css_path, $js_path) = advagg_get_root_files_dir(); - // Build the aggregate's contents. + // Build the aggregates contents. $contents = ''; if ($type == 'css') { $contents = advagg_get_css_aggregate_contents($files); diff --git a/advagg.module b/advagg.module index ecf4629..a39b9b2 100644 --- a/advagg.module +++ b/advagg.module @@ -22,7 +22,7 @@ define('ADVAGG_ENABLED', TRUE); define('ADVAGG_GZIP', TRUE); /** - * Default value to see if .gz files should be created as well. + * Default value to see we use core's default grouping of CSS/JS files. */ define('ADVAGG_CORE_GROUPS', TRUE); @@ -196,8 +196,8 @@ function _advagg_aggregate_css(&$css_groups) { $preprocess_css = advagg_file_aggregation_enabled('css'); // For each group that needs aggregation, aggregate its items. - $files_to_aggregrate = array(); - // Allow for inline CSS to be between aggregatged files. + $files_to_aggregate = array(); + // Allow for inline CSS to be between aggregated files. $gap_counter = 0; foreach ($css_groups as $key => $group) { switch ($group['type']) { @@ -205,7 +205,7 @@ function _advagg_aggregate_css(&$css_groups) { // the group's data property to the file path of the aggregate file. case 'file': if ($group['preprocess'] && $preprocess_css) { - $files_to_aggregrate[$gap_counter][] = $group; + $files_to_aggregate[$gap_counter][] = $group; } break; // Aggregate all inline CSS content into the group's data property. @@ -219,16 +219,16 @@ function _advagg_aggregate_css(&$css_groups) { } } - if (!empty($files_to_aggregrate)) { + if (!empty($files_to_aggregate)) { $hooks_hash = advagg_get_hooks_hash(); - $css_hash = drupal_hash_base64(serialize($files_to_aggregrate)); + $css_hash = drupal_hash_base64(serialize($files_to_aggregate)); $cache_key = 'advagg:css:' . $hooks_hash . ':' . $css_hash; if (variable_get('advagg_use_full_cache', ADVAGG_USE_FULL_CACHE) && $cache = cache_get($cache_key, 'cache_advagg_aggregates')) { $return = $cache->data; } else { module_load_include('inc', 'advagg', 'advagg'); - $plans = advagg_build_aggregate_plans($files_to_aggregrate, 'css'); + $plans = advagg_build_aggregate_plans($files_to_aggregate, 'css'); $return = advagg_merge_plans($css_groups, $plans); if (variable_get('advagg_use_full_cache', ADVAGG_USE_FULL_CACHE)) { cache_set($cache_key, $return, 'cache_advagg_aggregates', CACHE_TEMPORARY); @@ -384,7 +384,7 @@ function advagg_get_js($scope, $javascript) { // Aggregate any remaining JS files that haven't already been output. // This is the only hunk of code change from drupal_get_js(). if ($preprocess_js && count($files) > 0) { - // Implement caching here. + // See if the full cache has this. $hooks_hash = advagg_get_hooks_hash(); $js_hash = drupal_hash_base64(serialize($files)); $cache_key = 'advagg:js:' . $hooks_hash . ':' . $js_hash;