Commit 6d3b8c62 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

Web Inspector: Fix js minification of updated CodeMirror

https://bugs.webkit.org/show_bug.cgi?id=120231

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2013-08-23
Reviewed by Andy Estes.

Workaround a jsmin issue with "return //.test();" lines when
minifying JavaScript in production builds.

* Scripts/copy-user-interface-resources.sh:
* UserInterface/External/CodeMirror/codemirror.js:
(window.CodeMirror):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154524 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ccdbe1c7
2013-08-23 Joseph Pecoraro <pecoraro@apple.com>
Web Inspector: Fix js minification of updated CodeMirror
https://bugs.webkit.org/show_bug.cgi?id=120231
Reviewed by Andy Estes.
Workaround a jsmin issue with "return //.test();" lines when
minifying JavaScript in production builds.
* Scripts/copy-user-interface-resources.sh:
* UserInterface/External/CodeMirror/codemirror.js:
(window.CodeMirror):
2013-08-22 Joseph Pecoraro <pecoraro@apple.com>
<https://webkit.org/b/120165> Web Inspector: Update CodeMirror to 3.16.1
......
......@@ -5464,7 +5464,8 @@ window.CodeMirror = (function() {
};
else if (safari && !/Version\/([6-9]|\d\d)\b/.test(navigator.userAgent))
spanAffectsWrapping = function(str, i) {
return /\-[^ \-?]|\?[^ !\'\"\),.\-\/:;\?\]\}]/.test(str.slice(i - 1, i + 1));
var result = /\-[^ \-?]|\?[^ !\'\"\),.\-\/:;\?\]\}]/.test(str.slice(i - 1, i + 1));
return result;
};
else if (webkit && !/Chrome\/(?:29|[3-9]\d|\d\d\d)\./.test(navigator.userAgent))
spanAffectsWrapping = function(str, i) {
......@@ -5472,7 +5473,8 @@ window.CodeMirror = (function() {
if (/\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i))) return true;
if (i > 2 && /[\d\.,]/.test(str.charAt(i - 2)) && /[\d\.,]/.test(str.charAt(i))) return false;
}
return /[~!#%&*)=+}\]|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|…[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
var result = /[~!#%&*)=+}\]|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|…[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
return result;
};
var knownScrollbarWidth;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment