Title: [154524] trunk/Source/WebInspectorUI
- Revision
- 154524
- Author
- [email protected]
- Date
- 2013-08-23 14:58:17 -0700 (Fri, 23 Aug 2013)
Log Message
Web Inspector: Fix js minification of updated CodeMirror
https://bugs.webkit.org/show_bug.cgi?id=120231
Patch by Joseph Pecoraro <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (154523 => 154524)
--- trunk/Source/WebInspectorUI/ChangeLog 2013-08-23 21:42:57 UTC (rev 154523)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-08-23 21:58:17 UTC (rev 154524)
@@ -1,3 +1,17 @@
+2013-08-23 Joseph Pecoraro <[email protected]>
+
+ 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 <[email protected]>
<https://webkit.org/b/120165> Web Inspector: Update CodeMirror to 3.16.1
Modified: trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js (154523 => 154524)
--- trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js 2013-08-23 21:42:57 UTC (rev 154523)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js 2013-08-23 21:58:17 UTC (rev 154524)
@@ -5464,7 +5464,8 @@
};
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 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
