Permalink
Browse files

Convert to unix line spaces and tebs to spaces for code consistency

  • Loading branch information...
1 parent 21aaf49 commit 6acd4cb504660da3648bb5462ad4517fcc778593 @acidvertigo committed Dec 28, 2011
Showing with 10,665 additions and 10,654 deletions.
  1. +11 −0 .project
  2. +1 −1 UPGRADING.txt
  3. +9 −9 min/README.txt
  4. +5 −5 min/builder/_index.js
  5. +4 −4 min/builder/bm.js
  6. +1 −1 min/builder/bm2.js
  7. +7 −7 min/builder/index.php
  8. +4 −4 min/builder/jquery-1.6.3.min.js
  9. +1 −1 min/builder/js/bootstrap-alerts.js
  10. +1 −1 min/builder/js/bootstrap-buttons.js
  11. +3 −3 min/builder/js/bootstrap-modal.js
  12. +1 −1 min/builder/js/bootstrap-scrollspy.js
  13. +4 −4 min/builder/js/bootstrap-twipsy.js
  14. +1 −1 min/builder/js/tests/index.html
  15. +1 −1 min/builder/js/tests/unit/bootstrap-alerts.js
  16. +1 −1 min/builder/js/tests/unit/bootstrap-buttons.js
  17. +1 −1 min/builder/js/tests/unit/bootstrap-dropdown.js
  18. +1 −1 min/builder/js/tests/unit/bootstrap-scrollspy.js
  19. +1 −1 min/builder/js/tests/unit/bootstrap-tabs.js
  20. +1 −1 min/builder/js/tests/unit/bootstrap-twipsy.js
  21. +82 −82 min/builder/js/tests/vendor/qunit.css
  22. +1,345 −1,345 min/builder/js/tests/vendor/qunit.js
  23. +1 −1 min/builder/lib/bootstrap.less
  24. +1 −1 min/builder/lib/mixins.less
  25. +2 −2 min/builder/lib/patterns.less
  26. +1 −1 min/builder/lib/reset.less
  27. +1 −1 min/builder/lib/scaffolding.less
  28. +1 −1 min/builder/lib/tables.less
  29. +1 −1 min/builder/lib/type.less
  30. +1 −1 min/builder/lib/variables.less
  31. +7 −7 min/builder/ocCheck.php
  32. +1 −1 min/builder/rewriteTest.js
  33. +2 −2 min/builder/test.php
  34. +21 −21 min/config.php
  35. +2 −2 min/groupsConfig.php
  36. +5 −5 min/index.php
  37. +162 −162 min/lib/FirePHP.php
  38. +47 −47 min/lib/HTTP/ConditionalGet.php
  39. +57 −57 min/lib/HTTP/Encoder.php
  40. +10 −10 min/lib/JSMin.php
  41. +1,760 −1,760 min/lib/JSMinPlus.php
  42. +77 −77 min/lib/Minify.php
  43. +18 −18 min/lib/Minify/Build.php
  44. +99 −99 min/lib/Minify/CSS.php
  45. +251 −251 min/lib/Minify/CSS/Compressor.php
  46. +44 −44 min/lib/Minify/CSS/UriRewriter.php
  47. +2 −2 min/lib/Minify/Cache/APC.php
  48. +16 −16 min/lib/Minify/Cache/File.php
  49. +24 −24 min/lib/Minify/Cache/Memcache.php
  50. +1 −1 min/lib/Minify/Cache/ZendPlatform.php
  51. +14 −14 min/lib/Minify/CommentPreserver.php
  52. +41 −41 min/lib/Minify/Controller/Base.php
  53. +10 −10 min/lib/Minify/Controller/Files.php
  54. +16 −16 min/lib/Minify/Controller/Groups.php
  55. +8 −8 min/lib/Minify/Controller/MinApp.php
  56. +14 −14 min/lib/Minify/Controller/Page.php
  57. +15 −15 min/lib/Minify/Controller/Version1.php
  58. +26 −26 min/lib/Minify/DebugDetector.php
  59. +246 −246 min/lib/Minify/HTML.php
  60. +4 −4 min/lib/Minify/HTML/Helper.php
  61. +1 −1 min/lib/Minify/JS/ClosureCompiler.php
  62. +15 −15 min/lib/Minify/Lines.php
  63. +6 −6 min/lib/Minify/Logger.php
  64. +4 −4 min/lib/Minify/Packer.php
  65. +167 −167 min/lib/Minify/Processor.php
  66. +25 −25 min/lib/Minify/Source.php
  67. +3 −3 min/lib/Minify/YUI/CssCompressor.php
  68. +24 −24 min/lib/Minify/YUICompressor.php
  69. +1 −1 min/utils.php
  70. +1 −1 min_unit_tests/HTTP_ConditionalGet/3.php
  71. +12 −12 min_unit_tests/HTTP_ConditionalGet/_include.php
  72. +1 −1 min_unit_tests/HTTP_ConditionalGet/index.php
  73. +1 −1 min_unit_tests/HTTP_Encoder/index.php
  74. +12 −12 min_unit_tests/_inc.php
  75. +1 −1 min_unit_tests/_test_files/css/comments.min.css
  76. +66 −66 min_unit_tests/_test_files/css/hacks.css
  77. +1 −1 min_unit_tests/_test_files/css/hacks.min.css
  78. +1 −1 min_unit_tests/_test_files/css/issue210.css
  79. +1 −1 min_unit_tests/_test_files/css/issue210.min.css
  80. +890 −890 min_unit_tests/_test_files/css/issue62.css
  81. +1 −1 min_unit_tests/_test_files/css/issue62.min.css
  82. +12 −12 min_unit_tests/_test_files/css/paths_prepend.css
  83. +1 −1 min_unit_tests/_test_files/css/paths_prepend.min.css
  84. +1 −1 min_unit_tests/_test_files/css/paths_rewrite.css
  85. +1 −1 min_unit_tests/_test_files/css/paths_rewrite.min.css
  86. +1 −1 min_unit_tests/_test_files/css/readme.txt
  87. +38 −38 min_unit_tests/_test_files/css/selectors.css
  88. +1 −1 min_unit_tests/_test_files/css/selectors.min.css
  89. +6 −6 min_unit_tests/_test_files/css/styles.css
  90. +1 −1 min_unit_tests/_test_files/css/styles.min.css
  91. +434 −434 min_unit_tests/_test_files/css/subsilver.css
  92. +1 −1 min_unit_tests/_test_files/css/subsilver.min.css
  93. +10 −10 min_unit_tests/_test_files/css/unusual_strings.css
  94. +1 −1 min_unit_tests/_test_files/css/unusual_strings.min.css
  95. +656 −656 min_unit_tests/_test_files/css/vladmirated.css
  96. +1 −1 min_unit_tests/_test_files/css/vladmirated.min.css
  97. +1 −1 min_unit_tests/_test_files/css_uriRewriter/exp.css
  98. +1 −1 min_unit_tests/_test_files/css_uriRewriter/exp_prepend.css
  99. +1 −1 min_unit_tests/_test_files/css_uriRewriter/exp_prepend2.css
  100. +1 −1 min_unit_tests/_test_files/css_uriRewriter/in.css
  101. +33 −33 min_unit_tests/_test_files/html/before.html
  102. +3 −3 min_unit_tests/_test_files/html/before.min.html
  103. +33 −33 min_unit_tests/_test_files/html/before2.html
  104. +3 −3 min_unit_tests/_test_files/html/before2.min.html
  105. +1 −1 min_unit_tests/_test_files/importProcessor/1/adjacent.css
  106. +1 −1 min_unit_tests/_test_files/importProcessor/1/tv.css
  107. +1 −1 min_unit_tests/_test_files/importProcessor/adjacent.css
  108. +1 −1 min_unit_tests/_test_files/importProcessor/css/1/adjacent.css
  109. +1 −1 min_unit_tests/_test_files/importProcessor/css/1/tv.css
  110. +1 −1 min_unit_tests/_test_files/importProcessor/css/adjacent.css
  111. +1 −1 min_unit_tests/_test_files/importProcessor/css/input.css
  112. +6 −6 min_unit_tests/_test_files/importProcessor/css/output.css
  113. +1 −1 min_unit_tests/_test_files/importProcessor/input.css
  114. +6 −6 min_unit_tests/_test_files/importProcessor/output.css
  115. +2 −2 min_unit_tests/_test_files/js/before.js
  116. +1 −1 min_unit_tests/_test_files/js/before.min.js
  117. +1 −1 min_unit_tests/_test_files/js/before.min_plus.js
  118. +1 −1 min_unit_tests/_test_files/js/condcomm.min_plus.js
  119. +1 −1 min_unit_tests/_test_files/js/issue132.min.js
  120. +9 −9 min_unit_tests/_test_files/js/issue144.js
  121. +1 −1 min_unit_tests/_test_files/js/issue144.min.js
  122. +1 −1 min_unit_tests/_test_files/js/issue74.min.js
  123. +1 −1 min_unit_tests/_test_files/js/issue74.min_plus.js
  124. +3,243 −3,243 min_unit_tests/_test_files/js/jquery-1.2.3.js
  125. +168 −168 min_unit_tests/_test_files/minify/QueryString.js
  126. +24 −24 min_unit_tests/_test_files/minify/email.js
  127. +2 −2 min_unit_tests/_test_files/minify/issue73_1.js
  128. +3 −3 min_unit_tests/_test_files/minify/issue73_2.js
  129. +1 −1 min_unit_tests/_test_files/minify/issue89_out.min.css
  130. +10 −10 min_unit_tests/_test_files/minify/lines_bugs.js
  131. +22 −22 min_unit_tests/_test_files/minify/lines_output.js
  132. +1 −1 min_unit_tests/_test_files/minify/minified.css
  133. +12 −12 min_unit_tests/_test_files/minify/minified.js
  134. +1 −1 min_unit_tests/_test_files/yuic/README
  135. +1 −1 min_unit_tests/_test_files/yuic/background-position.css
  136. +1 −1 min_unit_tests/_test_files/yuic/border-none.css
  137. +4 −4 min_unit_tests/_test_files/yuic/box-model-hack.css
  138. +6 −6 min_unit_tests/_test_files/yuic/bug2527974.css
  139. +1 −1 min_unit_tests/_test_files/yuic/bug2527991.css
  140. +1 −1 min_unit_tests/_test_files/yuic/charset-media.css
  141. +1 −1 min_unit_tests/_test_files/yuic/color.css
  142. +1 −1 min_unit_tests/_test_files/yuic/comment.css
  143. +3 −3 min_unit_tests/_test_files/yuic/concat-charset.css
  144. +1 −1 min_unit_tests/_test_files/yuic/decimals.css
  145. +1 −1 min_unit_tests/_test_files/yuic/dollar-header.css
  146. +1 −1 min_unit_tests/_test_files/yuic/font-face.css
  147. +5 −5 min_unit_tests/_test_files/yuic/media-empty-class.css
  148. +1 −1 min_unit_tests/_test_files/yuic/media-test.css
  149. +2 −2 min_unit_tests/_test_files/yuic/opacity-filter.css
  150. +1 −1 min_unit_tests/_test_files/yuic/preserve-new-line.css
  151. +1 −1 min_unit_tests/_test_files/yuic/preserve-strings.css
  152. +3 −3 min_unit_tests/_test_files/yuic/pseudo-first.css
  153. +2 −2 min_unit_tests/_test_files/yuic/pseudo.css
  154. +1 −1 min_unit_tests/_test_files/yuic/special-comments.css
  155. +1 −1 min_unit_tests/_test_files/yuic/star-underscore-hacks.css
  156. +1 −1 min_unit_tests/_test_files/yuic/string-in-comment.css
  157. +1 −1 min_unit_tests/_test_files/yuic/webkit-transform.css
  158. +1 −1 min_unit_tests/_test_files/yuic/zeros.css
  159. +15 −15 min_unit_tests/test_HTTP_ConditionalGet.php
  160. +10 −10 min_unit_tests/test_HTTP_Encoder.php
  161. +2 −2 min_unit_tests/test_JSMin.php
  162. +12 −12 min_unit_tests/test_JSMinPlus.php
  163. +12 −12 min_unit_tests/test_Minify.php
  164. +6 −6 min_unit_tests/test_Minify_Build.php
  165. +8 −8 min_unit_tests/test_Minify_CSS.php
  166. +6 −6 min_unit_tests/test_Minify_CSS_UriRewriter.php
  167. +8 −8 min_unit_tests/test_Minify_Cache_APC.php
  168. +16 −16 min_unit_tests/test_Minify_Cache_File.php
  169. +2 −2 min_unit_tests/test_Minify_Cache_Memcache.php
  170. +3 −3 min_unit_tests/test_Minify_CommentPreserver.php
  171. +8 −8 min_unit_tests/test_Minify_HTML.php
  172. +2 −2 min_unit_tests/test_Minify_HTML_Helper.php
  173. +7 −7 min_unit_tests/test_Minify_ImportProcessor.php
  174. +1 −1 min_unit_tests/test_Minify_JS_ClosureCompiler.php
  175. +5 −5 min_unit_tests/test_Minify_Lines.php
  176. +1 −1 min_unit_tests/test_MrClay_Matcher.php
  177. +3 −3 min_unit_tests/test_environment.php
  178. +1 −1 min_unit_tests/test_js_in_browser.html
View
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>minifybts</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
View
@@ -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.
View
@@ -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.
@@ -59,8 +59,8 @@ In (X)HTML files, don't forget to replace any "&" characters with "&amp;".
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');
@@ -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(
@@ -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
@@ -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(
@@ -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"
@@ -142,4 +142,4 @@ Known issue: files with comment-like strings/regexps can cause problems in this
QUESTIONS?
-http://groups.google.com/group/minify
+http://groups.google.com/group/minify
View
@@ -16,7 +16,7 @@ var MUB = {
MUB._minRoot = '/min/';
$('span.minRoot').html('/min/');
} else
- fail();
+ fail();
},
error : fail
});
@@ -67,7 +67,7 @@ var MUB = {
* the INPUT and check the URL on the site.
*/
liUpdateTestLink : function () { // call in context of li element
- if (! $('input', this)[0].value)
+ if (! $('input', this)[0].value)
return;
var li = this;
$('span', this).html('');
@@ -159,7 +159,7 @@ var MUB = {
if (! fail && this.value && (m = this.value.match(/\.(css|js)$/))) {
var thisExt = m[1];
if (ext === false)
- ext = thisExt;
+ ext = thisExt;
else if (thisExt !== ext) {
fail = true;
return alert('extensions must match!');
@@ -170,7 +170,7 @@ var MUB = {
return alert('duplicate file!');
}
sources.push(this.value);
- }
+ }
});
if (fail || ! sources.length)
return;
@@ -252,4 +252,4 @@ var MUB = {
MUB.checkRewrite();
}
};
-$(MUB.init);
+$(MUB.init);
View
@@ -23,14 +23,14 @@ javascript:(function() {
i = 0;
while (o = d.styleSheets[i++])
/* http://www.w3.org/TR/DOM-Level-2-Style/stylesheets.html#StyleSheets-DocumentStyle-styleSheets
- document.styleSheet is a list property where [0] accesses the 1st element and
- [outOfRange] returns null. In IE, styleSheets is a function, and also throws an
+ document.styleSheet is a list property where [0] accesses the 1st element and
+ [outOfRange] returns null. In IE, styleSheets is a function, and also throws an
exception when you check the out of bounds index. (sigh) */
sheet(o);
if (uris.length)
window.open('%BUILDER_URL%#' + uris.join(','));
else
- alert('No js/css files found with URLs within "'
+ alert('No js/css files found with URLs within "'
+ home.split('/')[2]
+ '".\n(This tool is limited to URLs with the same domain.)');
-})();
+})();
View
@@ -12,4 +12,4 @@ javascript:(function(){
? 'minifyDebug=; expires=Fri, 27 Jul 2001 02:47:11 UTC; path=/'
: 'minifyDebug=' + encodeURIComponent(p) + '; path=/';
d.cookie = v;
-})();
+})();
View
@@ -1,4 +1,4 @@
-<?php
+<?php
if (phpversion() < 5) {
exit('Minify requires PHP5 or greater.');
@@ -37,7 +37,7 @@
} catch (Exception $e) {
if (! $setIncludeSuccess) {
echo "Minify: set_include_path() failed. You may need to set your include_path "
- ."outside of PHP code, e.g., in php.ini.";
+ ."outside of PHP code, e.g., in php.ini.";
} else {
echo $e->getMessage();
}
@@ -79,9 +79,9 @@
slightly improve performance you can hardcode this in /min/config.php:
<code><?php echo htmlspecialchars($cachePathCode); ?></code></p>
<?php endIf; ?>
-<div class="container">
+<div class="container">
<p id=minRewriteFailed class="hide"><strong>Note:</strong> Your webserver does not seem to
- support mod_rewrite (used in /min/.htaccess). Your Minify URIs will contain "?", which
+ support mod_rewrite (used in /min/.htaccess). Your Minify URIs will contain "?", which
<a href="http://www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/"
>may reduce the benefit of proxy cache servers</a>.</p>
@@ -98,7 +98,7 @@
<ol id=sources><li></li></ol>
<div>
- <p id="add" style="float:left"><button class="btn primary">Add file +</button>&nbsp;</p>
+ <p id="add" style="float:left"><button class="btn primary">Add file +</button>&nbsp;</p>
<p><button id=update class="btn success">Update</button></p>
</div>
@@ -137,9 +137,9 @@
</div>
<h3>Combining CSS files that contain <code>@import</code></h3>
-<p>If your CSS files contain <code>@import</code> declarations, Minify will not
+<p>If your CSS files contain <code>@import</code> declarations, Minify will not
remove them. Therefore, you will want to remove those that point to files already
-in your list, and move any others to the top of the first file in your list
+in your list, and move any others to the top of the first file in your list
(imports below any styles will be ignored by browsers as invalid).</p>
<p>If you desire, you can use Minify URIs in imports and they will not be touched
by Minify. E.g. <code>@import "<span class=minRoot>/min/?</span>g=css2";</code></p>

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -121,4 +121,4 @@
})
})
-}( window.jQuery || window.ender );
+}( window.jQuery || window.ender );
@@ -61,4 +61,4 @@
})
})
-}( window.jQuery || window.ender );
+}( window.jQuery || window.ender );
@@ -40,11 +40,11 @@
if ( $.support.transition ) {
transitionEnd = "TransitionEnd"
if ( $.browser.webkit ) {
- transitionEnd = "webkitTransitionEnd"
+ transitionEnd = "webkitTransitionEnd"
} else if ( $.browser.mozilla ) {
- transitionEnd = "transitionend"
+ transitionEnd = "transitionend"
} else if ( $.browser.opera ) {
- transitionEnd = "oTransitionEnd"
+ transitionEnd = "oTransitionEnd"
}
}
@@ -104,4 +104,4 @@
$('body').scrollSpy('[data-scrollspy] li > a')
})
-}( window.jQuery || window.ender );
+}( window.jQuery || window.ender );
@@ -41,11 +41,11 @@
if ( $.support.transition ) {
transitionEnd = "TransitionEnd"
if ( $.browser.webkit ) {
- transitionEnd = "webkitTransitionEnd"
+ transitionEnd = "webkitTransitionEnd"
} else if ( $.browser.mozilla ) {
- transitionEnd = "transitionend"
+ transitionEnd = "transitionend"
} else if ( $.browser.opera ) {
- transitionEnd = "oTransitionEnd"
+ transitionEnd = "oTransitionEnd"
}
}
@@ -318,4 +318,4 @@
return $.extend({}, options, data)
}
-}( window.jQuery || window.ender );
+}( window.jQuery || window.ender );
@@ -37,4 +37,4 @@ <h2 id="qunit-userAgent"></h2>
<div id="qunit-runoff"></div>
</div>
</body>
-</html>
+</html>
@@ -38,4 +38,4 @@ $(function () {
ok(!$('#qunit-runoff').find('.alert-message').length, 'element removed from dom')
})
-})
+})
@@ -39,4 +39,4 @@ $(function () {
ok(btn.hasClass('active'), 'btn has class active')
})
-})
+})
@@ -49,4 +49,4 @@ $(function () {
dropdown.remove()
})
-})
+})
@@ -28,4 +28,4 @@ $(function () {
ok(topbar.find('.active', true)
})
-})
+})
@@ -74,4 +74,4 @@ $(function () {
equals(count, 1)
})
-})
+})
@@ -78,4 +78,4 @@ $(function () {
$('#qunit-runoff').empty()
})
-})
+})
Oops, something went wrong.

0 comments on commit 6acd4cb

Please sign in to comment.