Chromium Code Reviews| Index: Source/devtools/front_end/documentation/DocumentationView.js |
| diff --git a/Source/devtools/front_end/documentation/DocumentationView.js b/Source/devtools/front_end/documentation/DocumentationView.js |
| index 5dfded75637a6a6759327cd9b48241db3b7df469..9eb091dc131f82511c59237361913cfb344296a8 100644 |
| --- a/Source/devtools/front_end/documentation/DocumentationView.js |
| +++ b/Source/devtools/front_end/documentation/DocumentationView.js |
| @@ -45,21 +45,26 @@ WebInspector.DocumentationView.ContextMenuProvider.prototype = { |
| if (!(target instanceof WebInspector.CodeMirrorTextEditor)) |
| return; |
| var textEditor = /** @type {!WebInspector.CodeMirrorTextEditor} */ (target); |
| - var selection = textEditor.selection(); |
| - if (!selection || selection.isEmpty() || selection.startLine !== selection.endLine) |
| + |
| + var textPosition = textEditor.coordinatesToCursorPosition(event.x, event.y); |
| + var token = textEditor.tokenAtTextPosition(textPosition.startLine, textPosition.startColumn); |
| + if (!token) |
| return; |
| - var selectedText = textEditor.copyRange(selection); |
| + var lineNumber = textPosition.startLine; |
|
apavlov
2014/08/13 15:11:17
inline this
semeny
2014/08/13 15:23:27
Done.
|
| + var line = textEditor.line(lineNumber); |
| + var tokenContent = line.substring(token.startColumn, token.endColumn + 1); |
|
apavlov
2014/08/13 15:11:17
tokenText is a bit shorter :)
semeny
2014/08/13 15:23:26
Done.
|
| + |
| var urlProvider = new WebInspector.DocumentationURLProvider(); |
| - var descriptors = urlProvider.itemDescriptors(selectedText); |
| + var descriptors = urlProvider.itemDescriptors(tokenContent); |
| if (!descriptors.length) |
| return; |
| if (descriptors.length === 1) { |
| var formatString = WebInspector.useLowerCaseMenuTitles() ? "Show documentation for %s.%s" : "Show Documentation for %s.%s"; |
| - contextMenu.appendItem(WebInspector.UIString(formatString, descriptors[0].name, selectedText), WebInspector.DocumentationView.showDocumentationURL.bind(null, descriptors[0].url)); |
| + contextMenu.appendItem(WebInspector.UIString(formatString, descriptors[0].name, tokenContent), WebInspector.DocumentationView.showDocumentationURL.bind(null, descriptors[0].url)); |
| return; |
| } |
| var subMenuItem = contextMenu.appendSubMenuItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Show documentation for..." : "Show Documentation for...")); |
| for (var i = 0; i < descriptors.length; ++i) |
| - subMenuItem.appendItem(String.sprintf("%s.%s", descriptors[i].name, selectedText), WebInspector.DocumentationView.showDocumentationURL.bind(null, descriptors[i].url)); |
| + subMenuItem.appendItem(String.sprintf("%s.%s", descriptors[i].name, tokenContent), WebInspector.DocumentationView.showDocumentationURL.bind(null, descriptors[i].url)); |
| } |
| } |