Merge fx-team and m-c.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 02 Jul 2013 15:13:58 -0400
changeset 137188 7469440b076bb5ed98e5b602bd9b20ed939417ee
parent 137187 c417ab2f90099541e6646cfe22e1ea38700326ca (current diff)
parent 137016 d90d62737979eec4db43af40b3d86695fd0a13b7 (diff)
child 137196 50901fae80b0747b23257137d5b4cf82b936b54e
child 137200 17604d79ce502e71bf8906d526a932d0119d9b1b
child 137225 2319bcd35be775ae8641a572ea685881934a4163
push id1822
push userryanvm@gmail.com
push dateTue, 02 Jul 2013 19:17:36 +0000
treeherderfx-team@7469440b076b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone25.0a1
Merge fx-team and m-c.
--- a/browser/devtools/sourceeditor/source-editor-orion.jsm
+++ b/browser/devtools/sourceeditor/source-editor-orion.jsm
@@ -118,23 +118,23 @@ const DEFAULT_KEYBINDINGS = [
     action: "Comment/Uncomment",
     code: Ci.nsIDOMKeyEvent.DOM_VK_SLASH,
     accel: true,
   },
   {
     action: "Move to Bracket Opening",
     code: Ci.nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET,
     accel: true,
-    shift: true,
+    alt: true,
   },
   {
     action: "Move to Bracket Closing",
     code: Ci.nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET,
     accel: true,
-    shift: true,
+    alt: true,
   },
 ];
 
 if (Services.appinfo.OS == "WINNT" ||
     Services.appinfo.OS == "Linux") {
   DEFAULT_KEYBINDINGS.push({
     action: "redo",
     code: Ci.nsIDOMKeyEvent.DOM_VK_Y,
--- a/browser/devtools/sourceeditor/test/browser_bug729960_block_bracket_jump.js
+++ b/browser/devtools/sourceeditor/test/browser_bug729960_block_bracket_jump.js
@@ -48,114 +48,114 @@ function test() {
                  "  function bar() { /* Block Level 2 */ }\n" +
                  "}";
 
     editor.setMode(SourceEditor.MODES.JAVASCRIPT);
     editor.setText(JSText);
 
     // Setting caret at Line 1 bracket start.
     editor.setCaretOffset(19);
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 220,
        "JS : Jump to closing bracket of the code block when caret at block start");
 
-    EventUtils.synthesizeKey("[", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("[", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 20,
        "JS : Jump to opening bracket of the code block when caret at block end");
 
     // Setting caret at Line 10 start.
     editor.setCaretOffset(161);
-    EventUtils.synthesizeKey("[", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("[", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 20,
        "JS : Jump to opening bracket of code block when inside the function");
 
     editor.setCaretOffset(161);
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 220,
        "JS : Jump to closing bracket of code block when inside the function");
 
     // Setting caret at Line 6 start.
     editor.setCaretOffset(67);
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 159,
        "JS : Jump to closing bracket in a nested function with caret inside");
 
     editor.setCaretOffset(67);
-    EventUtils.synthesizeKey("[", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("[", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 62,
        "JS : Jump to opening bracket in a nested function with caret inside");
 
     let CSSText = "#object {\n" +
                   "  property: value;\n" +
                   "  /* comment */\n" +
                   "}";
 
     editor.setMode(SourceEditor.MODES.CSS);
     editor.setText(CSSText);
 
     // Setting caret at Line 1 bracket start.
     editor.setCaretOffset(8);
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 45,
        "CSS : Jump to closing bracket of the code block when caret at block start");
 
-    EventUtils.synthesizeKey("[", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("[", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 9,
        "CSS : Jump to opening bracket of the code block when caret at block end");
 
     // Setting caret at Line 3 start.
     editor.setCaretOffset(28);
-    EventUtils.synthesizeKey("[", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("[", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 9,
        "CSS : Jump to opening bracket of code block when inside the function");
 
     editor.setCaretOffset(28);
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 45,
        "CSS : Jump to closing bracket of code block when inside the function");
 
     let HTMLText = "<html>\n" +
                    "  <head>\n" +
                    "    <title>Testing Block Jump</title>\n" +
                    "  </head>\n" +
                    "  <body></body>\n" +
                    "</html>";
 
     editor.setMode(SourceEditor.MODES.HTML);
     editor.setText(HTMLText);
 
     // Setting caret at Line 1 end.
     editor.setCaretOffset(6);
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 6,
        "HTML : Jump to block end : Nothing happens in html mode");
 
     // Setting caret at Line 4 end.
     editor.setCaretOffset(64);
-    EventUtils.synthesizeKey("[", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("[", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 64,
        "HTML : Jump to block start : Nothing happens in html mode");
 
     let text = "line 1\n" +
                "line 2\n" +
                "line 3\n" +
                "line 4\n";
 
     editor.setMode(SourceEditor.MODES.TEXT);
     editor.setText(text);
 
     // Setting caret at Line 1 start.
     editor.setCaretOffset(0);
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 0,
        "Text : Jump to block end : Nothing happens in text mode");
 
     // Setting caret at Line 4 end.
     editor.setCaretOffset(28);
-    EventUtils.synthesizeKey("[", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("[", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 28,
        "Text : Jump to block start : Nothing happens in text mode");
 
     editor.destroy();
 
     testWin.close();
     testWin = editor = null;
 
--- a/browser/devtools/sourceeditor/test/browser_bug744021_next_prev_bracket_jump.js
+++ b/browser/devtools/sourceeditor/test/browser_bug744021_next_prev_bracket_jump.js
@@ -52,50 +52,50 @@ function test() {
                  "  \n" +
                  "}";
 
     editor.setMode(SourceEditor.MODES.JAVASCRIPT);
     editor.setText(JSText);
 
     // Setting caret at end of line 11 (function baz() {).
     editor.setCaretOffset(147);
-    EventUtils.synthesizeKey("[", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("[", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 16,
        "JS : Jump to opening bracket of previous sibling block when no parent");
 
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 129,
        "JS : Jump to closing bracket of same code block");
 
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 151,
        "JS : Jump to closing bracket of next sibling code block");
 
     let CSSText = "#object1 {\n" +
                   "  property: value;\n" +
                   "  /* comment */\n" +
                   "}\n" +
                   ".class1 {\n" +
                   "  property: value;\n" +
                   "}";
 
     editor.setMode(SourceEditor.MODES.CSS);
     editor.setText(CSSText);
 
     // Setting caret at Line 5 end (.class1 {).
     editor.setCaretOffset(57);
-    EventUtils.synthesizeKey("[", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("[", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 10,
        "CSS : Jump to opening bracket of previous sibling code block");
 
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 46,
        "CSS : Jump to closing bracket of same code block");
 
-    EventUtils.synthesizeKey("]", {accelKey: true, shiftKey: true}, testWin);
+    EventUtils.synthesizeKey("]", {accelKey: true, altKey: true}, testWin);
     is(editor.getCaretOffset(), 77,
        "CSS : Jump to closing bracket of next sibling code block");
 
     editor.destroy();
 
     testWin.close();
     testWin = editor = null;