Skip to content
Browse files

Adding in underscore for IE help. Adding catch blocks where they're m…

…issing (for ie).
  • Loading branch information...
1 parent 0658bd5 commit c0daa5b18c5f400209958633679b0f781d81f28d @SlexAxton committed Jan 21, 2011
Showing with 14 additions and 5 deletions.
  1. +1 −1 index.html
  2. +0 −1 js/uglifyjs/bin/uglifyjs.js
  3. +5 −1 js/uglifyjs/lib/parse-js.js
  4. +8 −2 js/uglifyjs/lib/process.js
View
2 index.html
@@ -55,7 +55,7 @@
</fieldset>
</form>
- <script src="js/console.js"></script>
+ <script src="js/underscore-min.js"></script>
<script src="js/jquery.min.js"></script>
<script src="js/uglifyjs/lib/parse-js.js"></script>
<script src="js/uglifyjs/lib/process.js"></script>
View
1 js/uglifyjs/bin/uglifyjs.js
@@ -211,7 +211,6 @@ function squeeze_it(code) {
sys.debug(sys.inspect(ex));
sys.debug(JSON.stringify(ex));
*/
- //global.console.debug( ex );
//>> End Uglifui
}
View
6 js/uglifyjs/lib/parse-js.js
@@ -1173,7 +1173,11 @@ function parse($TEXT, strict_mode, embed_tokens) {
try {
++S.in_loop;
return cont();
- } finally {
+ }
+ //>> Start Uglifui
+ catch (e) {}
+ //>> End Uglifui
+ finally {
--S.in_loop;
}
};
View
10 js/uglifyjs/lib/process.js
@@ -224,7 +224,11 @@ function ast_walker(ast) {
}
gen = walkers[type];
return gen.apply(ast, ast.slice(1));
- } finally {
+ }
+ //>> Start Uglifui
+ catch (e) {}
+ //>> End Uglifui
+ finally {
stack.pop();
}
};
@@ -1058,7 +1062,6 @@ var DOT_CALL_NO_PARENS = jsp.array_to_hash([
function make_string(str) {
var dq = 0, sq = 0;
- console.log(str);
str = str.replace(/[\\\b\f\n\r\t\x22\x27]/g, function(s){
switch (s) {
case "\\": return "\\\\";
@@ -1102,6 +1105,9 @@ function gen_code(ast, beautify) {
if (incr == null) incr = 1;
indentation += incr;
try { return cont.apply(null, slice(arguments, 1)); }
+ //>> Start Uglifui
+ catch (e) {}
+ //>> End Uglifui
finally { indentation -= incr; }
};

0 comments on commit c0daa5b

Please sign in to comment.
Something went wrong with that request. Please try again.