Modified: branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog (158589 => 158590)
--- branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-11-04 21:41:46 UTC (rev 158589)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-11-04 21:44:24 UTC (rev 158590)
@@ -1,5 +1,21 @@
2013-11-04 Lucas Forschler <[email protected]>
+ Merge r154851
+
+ 2013-08-29 Timothy Hatcher <[email protected]>
+
+ Make incrementing and decrementing numbers by 0.1 require the control key, and not near zero numbers.
+
+ https://bugs.webkit.org/show_bug.cgi?id=120492
+ <rdar://problem/13738935> Incrementing and decrementing numbers near zero is annoying compared to earlier releases
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/CodeMirrorAdditions.js:
+ (alterNumber): Remove near zero check.
+
+2013-11-04 Lucas Forschler <[email protected]>
+
Merge r153087
2013-07-24 Antoine Quint <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/CodeMirrorAdditions.js (158589 => 158590)
--- branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/CodeMirrorAdditions.js 2013-11-04 21:41:46 UTC (rev 158589)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/CodeMirrorAdditions.js 2013-11-04 21:44:24 UTC (rev 158590)
@@ -338,10 +338,6 @@
return false;
var number = parseFloat(line.substring(start, end));
- if (number < 1 && number >= -1 && amount === 1)
- amount = 0.1;
- else if (number <= 1 && number > -1 && amount === -1)
- amount = -0.1;
// Make the new number and constrain it to a precision of 6, this matches numbers the engine returns.
// Use the Number constructor to forget the fixed precision, so 1.100000 will print as 1.1.
@@ -386,10 +382,12 @@
CodeMirror.keyMap["default"] = {
"Alt-Up": alterNumber.bind(null, 1),
+ "Ctrl-Alt-Up": alterNumber.bind(null, 0.1),
"Shift-Alt-Up": alterNumber.bind(null, 10),
"Alt-PageUp": alterNumber.bind(null, 10),
"Shift-Alt-PageUp": alterNumber.bind(null, 100),
"Alt-Down": alterNumber.bind(null, -1),
+ "Ctrl-Alt-Down": alterNumber.bind(null, -0.1),
"Shift-Alt-Down": alterNumber.bind(null, -10),
"Alt-PageDown": alterNumber.bind(null, -10),
"Shift-Alt-PageDown": alterNumber.bind(null, -100),
