Fix open image in new tab

Francisco Moreno · Francisco Moreno · commit b5f83215570d · 2019-01-04T13:32:04.000+01:00
diff --git a/HTMLReport/loadData.js b/HTMLReport/loadData.js
@@ -160,19 +160,21 @@ function loadTable() {
     tr.appendChild(td);
 
     td = document.createElement("td");
-    var screenshotLink = annotaions[i].getImageURL();
+    let screenshotLink = annotaions[i].getImageURL();
 
     if (screenshotLink != "") {
-      var img = document.createElement("img");
+      let img = document.createElement("img");
       img.setAttribute("class", "rounded mx-auto d-block");
-      var link = document.createElement("a");
+      let link = document.createElement("a");
       link.setAttribute("class", "preview");
       link.setAttribute("title", "Click to open in a new window");
 
       img.src = "../images/device-camera.svg";
-      link.onclick = function() {
+
+      link.addEventListener('click',function() {
         openNewWindow(annotationType, screenshotLink);
-      };
+      },false);
+      
 
       link.href = screenshotLink;
       link.appendChild(img);
@@ -191,13 +193,15 @@ function loadTable() {
 }
 
 function openNewWindow(annotationType, data) {
-  var image = new Image();
+  let image = new Image();
   image.src = data;
 
-  var w = window.open(data,annotationType);
-
+  let w = window.open(data, '_blank');
   w.document.write("<title>" + annotationType + " ScreenShot</title>");
+  
   w.document.write(image.outerHTML);
+
+  w.focus();
 }
 
 function addTableFilters() {
@@ -465,9 +469,9 @@ this.imagePreview = function(){
 	/* END CONFIG */
 	$("a.preview").hover(function(e){
 		this.t = this.title;
-		this.title = "";	
+    this.title = "";	
 		var c = (this.t != "") ? "<br/>" + this.t : "";
-		$("body").append("<p id='preview'><img id='imgPreview' src='"+ this.href +"' alt='Image preview' />"+ c +"</p>");								 
+		$("body").append("<p id='preview'><img id='imgPreview' src='"+ e.currentTarget.href +"' alt='Image preview' />"+ c +"</p>");								 
 		$("#preview")
 			.css("top",(e.pageY - xOffset) + "px")
       .css("left",(e.pageX + yOffset) + "px")
diff --git a/js/popup.js b/js/popup.js
@@ -273,14 +273,15 @@ document.addEventListener('DOMContentLoaded', function () {
   var newBugDescription = document.getElementById("newBugDescription");
   newBugDescription.addEventListener("keypress", function (e) {
     var key = e.which || e.keyCode;
+    // if ((e.keyCode == 10 || e.keyCode == 13) && e.ctrlKey) {
+    //   $('#newBugDescription').val($('#newBugDescription').val() + '\n');
+    // }
     if ((e.keyCode == 10 || e.keyCode == 13) && e.ctrlKey) {
-      $('#newBugDescription').val($('#newBugDescription').val() + '\n');
+      addNewBug("");
     }
     if (key == 13) { // 13 is enter
       if (e.shiftKey == true) {
         addNewAnnotationWithScreenShot("bug");
-      } else {
-        addNewBug(""); // code for enter
       }
     }
   }, false);
@@ -291,13 +292,11 @@ document.addEventListener('DOMContentLoaded', function () {
   newIdeaDescription.addEventListener("keypress", function (e) {
     var key = e.which || e.keyCode;
     if ((e.keyCode == 10 || e.keyCode == 13) && e.ctrlKey) {
-      $('#newIdeaDescription').val($('#newIdeaDescription').val() + '\n');
+      addNewIdea("");
     }
     if (key == 13) { // 13 is enter
       if (e.shiftKey == true) {
         addNewAnnotationWithScreenShot("idea");
-      } else {
-        addNewIdea(""); // code for enter
       }
     }
   }, false);
@@ -308,13 +307,11 @@ document.addEventListener('DOMContentLoaded', function () {
   newNoteDescription.addEventListener("keypress", function (e) {
     var key = e.which || e.keyCode;
     if ((e.keyCode == 10 || e.keyCode == 13) && e.ctrlKey) {
-      $('#newNoteDescription').val($('#newNoteDescription').val() + '\n');
+      addNewNote("");
     }
     if (key == 13) { // 13 is enter
       if (e.shiftKey == true) {
         addNewAnnotationWithScreenShot("note");
-      } else {
-        addNewNote(""); // code for enter
       }
     }
   }, false);
@@ -325,13 +322,11 @@ document.addEventListener('DOMContentLoaded', function () {
   newQuestionDescription.addEventListener("keypress", function (e) {
     var key = e.which || e.keyCode;
     if ((e.keyCode == 10 || e.keyCode == 13) && e.ctrlKey) {
-      $('#newQuestionDescription').val($('#newQuestionDescription').val() + '\n');
+      addNewQuestion("");
     }
     if (key == 13) { // 13 is enter
       if (e.shiftKey == true) {
         addNewAnnotationWithScreenShot("question");
-      } else {
-        addNewQuestion(""); // code for enter
       }
     }
   }, false);
diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
   "short_name": "Chrome Exploratory Testing",
   "description": "Exploratory testing session using Chrome",
   "author": "@morvader",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "icons": {
     "16": "/icons/iconbig.png",
     "48": "/icons/iconbig.png",
@@ -27,7 +27,7 @@
     "tabs"
   ],
   "browser_action": {
-    "default_icon": "/icons/icon.png",
+    "default_icon": "/icons/iconbig.png",
     "default_popup": "popup.html"
   }
 }
diff --git a/popup.html b/popup.html
@@ -20,11 +20,11 @@
                 </div>
                 <div id="addNewBug" class="reportAnnotation card-body">
                     <div class="form-group">
-                        <textarea id="newBugDescription" rows="4" placeholder="Bug description..." title="[Crtl + Enter] to add a new line" class="form-control-sm"></textarea>
+                        <textarea id="newBugDescription" rows="4" placeholder="Bug description..." title="[Enter] to add a new line" class="form-control-sm"></textarea>
                     </div>
                     <div class="card-footer">
                         <div class="btn-group-sm annotation-group" role="group" aria-label="Annotation Options">
-                            <button id="addNewBugBtn" class="btn btn-outline-danger add" title="Add new Bug [Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
+                            <button id="addNewBugBtn" class="btn btn-outline-danger add" title="Add new Bug [Crtl + Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
                             <button id="addNewBugSCBtn" class="btn btn-outline-danger screenshot" title="Add new Bug with screenshot [Shift + Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
                             <button name="Cancel" class="btn btn-outline-secondary btn-sm cancel" title="Cancel annotation">Cancel</button>
                         </div>
@@ -38,11 +38,11 @@
                 </div>
                 <div id="addNewNote" class="reportAnnotation card-body">
                     <div class="form-group">
-                        <textarea id="newNoteDescription" rows="4" placeholder="Note description..." title="[Crtl + Enter] to add a new line" class="form-control-sm"></textarea>
+                        <textarea id="newNoteDescription" rows="4" placeholder="Note description..." title="[Enter] to add a new line" class="form-control-sm"></textarea>
                     </div>
                     <div class="card-footer">
                         <div class="btn-group-sm annotation-group" role="group" aria-label="Annotation Options">
-                            <button id="addNewNoteBtn" class="btn btn-outline-warning add" title="Add new Note [Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
+                            <button id="addNewNoteBtn" class="btn btn-outline-warning add" title="Add new Note [Crtl + Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
                             <button id="addNewNoteSCBtn" class="btn btn-outline-warning screenshot" title="Add new Note with screenshot [Shift + Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
                             <button name="Cancel" class="btn btn-outline-secondary btn-sm cancel" title="Cancel annotation">Cancel</button>
                         </div>
@@ -56,11 +56,11 @@
                 </div>
                 <div id="addNewQuestion" class="reportAnnotation card-body">
                     <div class="form-group">
-                        <textarea id="newQuestionDescription" rows="4" placeholder="Question description..." title="[Crtl + Enter] to add a new line" class="form-control-sm"></textarea>
+                        <textarea id="newQuestionDescription" rows="4" placeholder="Question description..." title="[Enter] to add a new line" class="form-control-sm"></textarea>
                     </div>
                     <div class="card-footer">
                         <div class="btn-group-sm annotation-group" role="group" aria-label="Annotation Options">
-                            <button id="addNewQuestionBtn" class="btn btn-outline-success add" title="Add new Question [Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
+                            <button id="addNewQuestionBtn" class="btn btn-outline-success add" title="Add new Question [Crtl + Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
                             <button id="addNewQuestionSCBtn" class="btn btn-outline-success screenshot" title="Add new Question with screenshot [Shift + Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
                             <button name="Cancel" class="btn btn-outline-secondary btn-sm cancel" title="Cancel annotation">Cancel</button>
                         </div>
@@ -74,11 +74,11 @@
                 </div>
                 <div id="addNewIdea" class="reportAnnotation card-body">
                     <div class="form-group">
-                        <textarea id="newIdeaDescription" rows="4" placeholder="Idea description..." title="[Crtl + Enter] to add a new line" class="form-control-sm"></textarea>
+                        <textarea id="newIdeaDescription" rows="4" placeholder="Idea description..." title="[Enter] to add a new line" class="form-control-sm"></textarea>
                     </div>
                     <div class="card-footer">
                         <div class="btn-group-sm annotation-group" role="group" aria-label="Annotation Options">
-                            <button id="addNewIdeaBtn" class="btn btn-outline-info add" title="Add new Idea [Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
+                            <button id="addNewIdeaBtn" class="btn btn-outline-info add" title="Add new Idea [Crtl + Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
                             <button id="addNewIdeaSCBtn" class="btn btn-outline-info screenshot" title="Add new Idea with screenshot [Shift + Enter]" data-toggle="tooltip" data-placement="top">&nbsp;</button>
                             <button name="Cancel" class="btn btn-outline-secondary btn-sm cancel" title="Cancel annotation">Cancel</button>
                         </div>

Original file line number	Diff line number	Diff line change
`@@ -273,14 +273,15 @@ document.addEventListener('DOMContentLoaded', function () {`
`273`	`273`	`var newBugDescription = document.getElementById("newBugDescription");`
`274`	`274`	`newBugDescription.addEventListener("keypress", function (e) {`
`275`	`275`	`var key = e.which \|\| e.keyCode;`
	`276`	`+ // if ((e.keyCode == 10 \|\| e.keyCode == 13) && e.ctrlKey) {`
	`277`	`+ // $('#newBugDescription').val($('#newBugDescription').val() + '\n');`
	`278`	`+ // }`
`276`	`279`	`if ((e.keyCode == 10 \|\| e.keyCode == 13) && e.ctrlKey) {`
`277`		`- $('#newBugDescription').val($('#newBugDescription').val() + '\n');`
	`280`	`+ addNewBug("");`
`278`	`281`	`}`
`279`	`282`	`if (key == 13) { // 13 is enter`
`280`	`283`	`if (e.shiftKey == true) {`
`281`	`284`	`addNewAnnotationWithScreenShot("bug");`
`282`		`- } else {`
`283`		`- addNewBug(""); // code for enter`
`284`	`285`	`}`
`285`	`286`	`}`
`286`	`287`	`}, false);`
`@@ -291,13 +292,11 @@ document.addEventListener('DOMContentLoaded', function () {`
`291`	`292`	`newIdeaDescription.addEventListener("keypress", function (e) {`
`292`	`293`	`var key = e.which \|\| e.keyCode;`
`293`	`294`	`if ((e.keyCode == 10 \|\| e.keyCode == 13) && e.ctrlKey) {`
`294`		`- $('#newIdeaDescription').val($('#newIdeaDescription').val() + '\n');`
	`295`	`+ addNewIdea("");`
`295`	`296`	`}`
`296`	`297`	`if (key == 13) { // 13 is enter`
`297`	`298`	`if (e.shiftKey == true) {`
`298`	`299`	`addNewAnnotationWithScreenShot("idea");`
`299`		`- } else {`
`300`		`- addNewIdea(""); // code for enter`
`301`	`300`	`}`
`302`	`301`	`}`
`303`	`302`	`}, false);`
`@@ -308,13 +307,11 @@ document.addEventListener('DOMContentLoaded', function () {`
`308`	`307`	`newNoteDescription.addEventListener("keypress", function (e) {`
`309`	`308`	`var key = e.which \|\| e.keyCode;`
`310`	`309`	`if ((e.keyCode == 10 \|\| e.keyCode == 13) && e.ctrlKey) {`
`311`		`- $('#newNoteDescription').val($('#newNoteDescription').val() + '\n');`
	`310`	`+ addNewNote("");`
`312`	`311`	`}`
`313`	`312`	`if (key == 13) { // 13 is enter`
`314`	`313`	`if (e.shiftKey == true) {`
`315`	`314`	`addNewAnnotationWithScreenShot("note");`
`316`		`- } else {`
`317`		`- addNewNote(""); // code for enter`
`318`	`315`	`}`
`319`	`316`	`}`
`320`	`317`	`}, false);`
`@@ -325,13 +322,11 @@ document.addEventListener('DOMContentLoaded', function () {`
`325`	`322`	`newQuestionDescription.addEventListener("keypress", function (e) {`
`326`	`323`	`var key = e.which \|\| e.keyCode;`
`327`	`324`	`if ((e.keyCode == 10 \|\| e.keyCode == 13) && e.ctrlKey) {`
`328`		`- $('#newQuestionDescription').val($('#newQuestionDescription').val() + '\n');`
	`325`	`+ addNewQuestion("");`
`329`	`326`	`}`
`330`	`327`	`if (key == 13) { // 13 is enter`
`331`	`328`	`if (e.shiftKey == true) {`
`332`	`329`	`addNewAnnotationWithScreenShot("question");`
`333`		`- } else {`
`334`		`- addNewQuestion(""); // code for enter`
`335`	`330`	`}`
`336`	`331`	`}`
`337`	`332`	`}, false);`