Title: [158601] branches/safari-537.73-branch/Source/WebInspectorUI
- Revision
- 158601
- Author
- [email protected]
- Date
- 2013-11-04 15:15:56 -0800 (Mon, 04 Nov 2013)
Log Message
Merge fixes for <rdar://problem/15168240>.
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog (158600 => 158601)
--- branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-11-04 23:03:14 UTC (rev 158600)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-11-04 23:15:56 UTC (rev 158601)
@@ -1,5 +1,12 @@
2013-11-04 Lucas Forschler <[email protected]>
+ Merge fixes for <rdar://problem/15168240>
+
+ * UserInterface/External/CodeMirror/codemirror.js:
+ (window.CodeMirror):
+
+2013-11-04 Lucas Forschler <[email protected]>
+
Merge r158404
2013-10-31 Joseph Pecoraro <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js (158600 => 158601)
--- branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js 2013-11-04 23:03:14 UTC (rev 158600)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js 2013-11-04 23:15:56 UTC (rev 158601)
@@ -302,12 +302,12 @@
// Make sure the gutters options contains the element
// "CodeMirror-linenumbers" when the lineNumbers option is true.
function setGuttersForLineNumbers(options) {
- var found = false;
- for (var i = 0; i < options.gutters.length; ++i) {
- if (options.gutters[i] == "CodeMirror-linenumbers") {
- if (options.lineNumbers) found = true;
- else options.gutters.splice(i--, 1);
- }
+ var found = indexOf(options.gutters, "CodeMirror-linenumbers");
+ if (found == -1 && options.lineNumbers) {
+ options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
+ } else if (found > -1 && !options.lineNumbers) {
+ options.gutters = options.gutters.slice(0);
+ options.gutters.splice(found, 1);
}
if (!found && options.lineNumbers)
options.gutters.push("CodeMirror-linenumbers");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
