remove hacks

DonJayamanne · DonJayamanne · commit 86c407d6c7b1 · 2016-11-29T09:55:12.000+11:00
diff --git a/src/browser/detailsView.ts b/src/browser/detailsView.ts
@@ -65,7 +65,7 @@ import * as contracts from '../contracts';
         $('.commit-author .name', $detailsView)
           .attr('aria-label', entry.author.email)
           .html(entry.author.name);
-        
+
         $('.commit-author .timestamp', $detailsView)
           .html(' on ' + entry.author.localisedDate);
 
@@ -97,7 +97,7 @@ import * as contracts from '../contracts';
                 }
             });
             $('.file-name', $fileItem).html(stat.path);
-            let uri = encodeURI('command:git.viewFileCommitDetails?' + JSON.stringify([entry.sha1.full, stat.path, entry.committer.date.toISOString()]))
+            let uri = encodeURI('command:git.viewFileCommitDetails?' + JSON.stringify([entry.sha1.full, stat.path, entry.committer.date.toISOString()]));
             $('a.file-name', $fileItem).attr('href', uri);
             $files.append($fileItem);
         });
diff --git a/src/browser/proxy.ts b/src/browser/proxy.ts
@@ -1,43 +1,17 @@
 (function () {
     (window as any).GITHISTORY = {};
-
-    function addScripts(done: Function) {
-        let scripts = document.querySelectorAll('div.script');
-        const scriptCount = scripts.length;
-        let scriptsLoaded = 0;
-        for (let counter = 0; counter < scripts.length; counter++) {
-            addScriptFile(scripts[counter].innerHTML.trim(), () => {
-                scriptsLoaded += 1;
-                if (scriptsLoaded >= scriptCount) {
-                    done();
-                }
-            });
-        }
-    }
-    function addScriptFile(scriptFilePath: string, onload: (ev: Event) => any) {
-        let script = document.createElement('script');
-        script.setAttribute('src', scriptFilePath.replace('/\\/g', '/'));
-        document.body.appendChild(script);
-        script.onload = onload;
-    }
-
     let clipboard: Clipboard = null;
     function initializeClipboard() {
         $('a.clipboard-link').addClass('hidden');
-        // ($('.btn.clipboard') as any).tooltip({
-        //     placement: 'down'
-        // });
         clipboard = new Clipboard('.btn.clipboard');
         clipboard.on('success', onCopied);
     }
 
     function onCopied(e: ClipboardEvent) {
         e.clearSelection();
-        // let $ele = $(e.trigger).attr('title', 'Copied');
-        // ($ele as any).tooltip('fixTitle').tooltip('show');
     }
 
-    addScripts(() => {
+    $(document).ready(() => {
         initializeClipboard();
         (window as any).GITHISTORY.generateSVG();
         (window as any).GITHISTORY.initializeDetailsView();
diff --git a/src/logViewer/main.ts b/src/logViewer/main.ts
@@ -73,16 +73,15 @@ class TextDocumentContentProvider implements vscode.TextDocumentContentProvider
                 <link rel="stylesheet" href="${this.getStyleSheetPath('animate.min.css')}" >
                 <link rel="stylesheet" href="${this.getStyleSheetPath('hint.min.css')}" >
                 <link rel="stylesheet" href="${this.getStyleSheetPath('main.css')}" >
+                <script src="${this.getNodeModulesPath(path.join('jquery','dist','jquery.min.js'))}"></script>
+                <script src="${this.getNodeModulesPath(path.join('clipboard','dist','clipboard.min.js'))}"></script>
+                <script src="${this.getScriptFilePath('proxy.js')}"></script>
+                <script src="${this.getScriptFilePath('svgGenerator.js')}"></script>
+                <script src="${this.getScriptFilePath('detailsView.js')}"></script>
             </head>
 
-            <body onload="var script = document.createElement('script');script.setAttribute('src', '${this.getScriptFilePath('proxy.js')}');script.setAttribute('type', 'text/javascript');document.body.appendChild(script);">
+            <body>
                 ${innerHtml}
-                <div class="hidden">
-                    <div class="script">${this.getNodeModulesPath(path.join('jquery','dist','jquery.min.js'))}</div>
-                    <div class="script">${this.getNodeModulesPath(path.join('clipboard','dist','clipboard.min.js'))}</div>
-                    <div class="script">${this.getScriptFilePath('svgGenerator.js')}</div>
-                    <div class="script">${this.getScriptFilePath('detailsView.js')}</div>
-                </div>
             </body>
         `;
     }
