[#17] Revert 2 commits

This reverts following commits: cdfe8c7: "[#17] Invoke a command on receiving it from the webview" cec97cc: "[#17] WIP. Passing command back to the extension"
ryu1kn · Apr 25, 2019 · ea79f28 · ea79f28
1 parent cdfe8c7
commit ea79f28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 31 deletions.
diff --git a/lib/annotation-script-provider.js b/lib/annotation-script-provider.js
@@ -9,7 +9,6 @@ class AnnotationScriptProvider {
         const highlightColour = this._configStore.getExtensionConfig('annotationHighlightColor');
         /* eslint-disable max-len */
         return `
-            var vscode = acquireVsCodeApi();
             var stylesheet = document.styleSheets[0];
             var state = {
                 timeoutId: null,
@@ -19,7 +18,6 @@ class AnnotationScriptProvider {
 
             document.body.addEventListener('mouseenter', onMouseEnter, true);
             document.body.addEventListener('mouseleave', onMouseLeave, true);
-            document.body.addEventListener('click', onClick, true);
 
             function onMouseEnter(event) {
                 var el = event.target;
@@ -59,23 +57,12 @@ class AnnotationScriptProvider {
                 removeCommitHighlightRuleAndTooltip();
             }
 
-            function onClick(event) {
-                event.preventDefault();
-
-                var el = event.target;
-                if (el.className === 'annotation-inner') return sendDiffRequest(el);
-            }
-
-            function sendDiffRequest(lineEl) {
-                vscode.postMessage(lineEl.getAttribute('data-command'));
-            }
-
             function addCommitHighlightRuleAndTooltip(annotationEl) {
                 state.index = 0;
-                var commitHash = annotationEl.parentNode.getAttribute('data-commitHash');
+                var commitHash = annotationEl.parentNode.attributes['data-commitHash'].value;
                 stylesheet.insertRule(createHighlightRule(commitHash), state.index);
 
-                var tooltipContents = annotationEl.parentNode.getAttribute('data-details');
+                var tooltipContents = annotationEl.parentNode.attributes['data-details'].value;
                 state.tooltipEl = annotationEl.insertAdjacentElement('afterend', createTooltipEl(tooltipContents));
             }
 

diff --git a/lib/command/annotate.js b/lib/command/annotate.js
@@ -21,18 +21,6 @@ class AnnotateCommand {
             return this._contentProvider.provideTextDocumentContent(uri).then(content => {
                 panel.webview.html = content;
                 panel.onDidDispose(() => {}, null, {});
-                panel.webview.onDidReceiveMessage(
-                    async message => {
-                        try {
-                            const command = JSON.parse(decodeURI(message));
-                            await this._vscode.commands.executeCommand(command.name, ...command.args);
-                        } catch (e) {
-                            console.error(e.stack);
-                        }
-                    },
-                    undefined,
-                    {}
-                );
             });
         }).catch(e => this._logger.error(e.stack));
     }

diff --git a/lib/git-annotation/git-annotation-line-builder.js b/lib/git-annotation/git-annotation-line-builder.js
@@ -46,12 +46,12 @@ class GitAnnotationLineBuilder {
     get _annotationHtml() {
         if (!this._command) return `<div class="annotation-inner">${_.escape(this._caption)}</div>`;
 
-        const safeEncodedCommand = this._encodeCommand(this._command);
-        return `<a href="" data-command="${safeEncodedCommand}" class="annotation-inner">${_.escape(this._caption)}</a>`;
+        const safeEncodedCommand = this._getUriString(this._command);
+        return `<a href="${safeEncodedCommand}" class="annotation-inner">${_.escape(this._caption)}</a>`;
     }
 
-    _encodeCommand(command) {
-        return encodeURI(JSON.stringify(command));
+    _getUriString(command) {
+        return encodeURI(`command:${command.name}?${JSON.stringify(command.args)}`);
     }
 
 }