Bug 1365889 - Stop using preprocessing in Scratchpad. r=jdescottes

MozReview-Commit-ID: HRGsWZwbvvp

--HG--
extra : rebase_source : 7d3d1c24830dc48f99dec466f3b9fa95148e18b9

devtools/client/jar.mn

@@ -12,7 +12,7 @@ devtools.jar:
     content/projecteditor/lib/helpers/readdir.js (projecteditor/lib/helpers/readdir.js)
     content/netmonitor/index.html (netmonitor/index.html)
     content/webconsole/webconsole.xul (webconsole/webconsole.xul)
-*   content/scratchpad/scratchpad.xul (scratchpad/scratchpad.xul)
+    content/scratchpad/scratchpad.xul (scratchpad/scratchpad.xul)
     content/scratchpad/scratchpad.js (scratchpad/scratchpad.js)
     content/shared/splitview.css (shared/splitview.css)
     content/shared/theme-switching.js (shared/theme-switching.js)

devtools/client/scratchpad/scratchpad.js

@@ -1739,6 +1739,14 @@ var Scratchpad = {
     this._setupCommandListeners();
     this._updateViewMenuItems();
     this._setupPopupShowingListeners();
+
+    // Change the accesskey for the help menu as it can be specific on Windows
+    // some localizations of Windows (ex:french, german) use "?"
+    //  for the help button in the menubar but Gnome does not.
+    if (Services.appinfo.OS == "WINNT") {
+      let helpMenu = document.getElementById("sp-help-menu");
+      helpMenu.setAttribute("accesskey", helpMenu.getAttribute("accesskeywindows"));
+    }
   },
 
   /**

devtools/client/scratchpad/scratchpad.xul

@@ -303,15 +303,10 @@
     </menupopup>
   </menu>
 
-#ifdef XP_WIN
   <menu id="sp-help-menu"
         label="&helpMenu.label;"
-        accesskey="&helpMenuWin.accesskey;">
-#else
-  <menu id="sp-help-menu"
-        label="&helpMenu.label;"
-        accesskey="&helpMenu.accesskey;">
-#endif
+        accesskey="&helpMenu.accesskey;"
+        accesskeywindows="&helpMenuWin.accesskey;">
     <menupopup id="sp-menu-help">
       <menuitem id="sp-menu-documentation"
                 label="&documentationLink.label;"