Issues #6 and #7 addressed. Hopefully resolved.

changhaitravis · Dec 1, 2015 · 06b93d5 · 06b93d5
1 parent 3b93706
commit 06b93d5
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 29 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ca.appbox.jira</groupId>
     <artifactId>foresight</artifactId>
-    <version>0.9.3-jira6</version>
+    <version>0.9.4-jira6</version>
     <organization>
         <name>Solutions Appbox inc.</name>
         <url>http://www.appbox.ca/</url>

diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
@@ -16,7 +16,10 @@
 		<resource type="download" name="d3.v3.min.js" location="/js/d3.v3.min.js" />
 		<resource type="download" name="foresight.js" location="/js/foresight.js" />
 		<resource type="download" name="images/" location="/images" />
-		<context>atl.general</context>
+		<context>jira.view.issue</context>
+		<context>jira.browse.project</context>
+		<context>jira.navigator.simple</context>
+		<context>jira.navigator.advanced</context>
 	</web-resource>
 
 	<servlet name="Foresight Dependency Graph Servlet" 

diff --git a/src/main/resources/js/foresight.js b/src/main/resources/js/foresight.js
@@ -302,37 +302,40 @@ function show_legend(){
 	}
 }
 
-AJS.toInit(function(){
-	AJS.$(document).ready(function(){
-	  //TODO Better way of determining viewType
-		if(JIRA.API !== undefined){
-		  if(JIRA.API.IssueSearch !== undefined && JIRA.ViewIssueTabs !== undefined){
-		    //issue navigator
-		  viewType = 'issueNav';
-		  //JIRA.ViewIssueTabs.onTabReady(function() {
-		  JIRA.ViewIssueTabs.onTabReady(function() {
-			      //run foresight_show if this is the first time loading an issue, or loading a new issue.
-			    if(AJS.$('div#foresight, canvas#foresight-legend').length == 2){
-				    foresight_show();
-			      }
-			});
-		  }else if(JIRA.API.Projects !== undefined){
-		  //project tab
-		    viewType = 'projectTab';
-		    AJS.$('input#includeOutward, input#includeInward').parent().hide();
-		    foresight_show();
-		  }
-		}else if(JIRA.Issue !== undefined){
-		  //issue view
-		    viewType = 'issue';
+//AJS.toInit(function(){
+//	AJS.$(document).ready(function(){
+//	  //TODO Better way of determining viewType
+//		if(JIRA.API !== undefined){
+//		  if(JIRA.API.IssueSearch !== undefined && JIRA.ViewIssueTabs !== undefined){
+//		    //issue navigator
+//		  viewType = 'issueNav';
+//		  foresight_show_onTabReady();
+//		  }else if(JIRA.API.Projects !== undefined){
+//		  //project tab
+//		    viewType = 'projectTab';
+//		    AJS.$('input#includeOutward, input#includeInward').parent().hide();
+//		    foresight_show();
+//		  }
+//		}else if(JIRA.Issue !== undefined){
+//		  //issue view
+//		    viewType = 'issue';
+//		    foresight_show();
+//		    foresight_show_onTabReady();
+//		}
+//		
+//	});
+//});
+
+function foresight_show_onTabReady(){
+	JIRA.ViewIssueTabs.onTabReady(function() {
+	      //run foresight_show if this is the first time loading an issue, or loading a new issue.
+	    if(AJS.$('div#foresight, canvas#foresight-legend').length == 2){
 		    foresight_show();
-		}
-
+	      }
 	});
-});
+}
 
 function foresight_show(){
-
 	if(!pluginSettings){
 	  init_plugin_settings();
 	}else{

diff --git a/src/main/resources/templates/dependency-graph-panel.vm b/src/main/resources/templates/dependency-graph-panel.vm
@@ -24,3 +24,28 @@
 	<div id="issue-dependency-viewer-graph-container"></div>
 	<canvas id="foresight-legend" width="848" height="200"></canvas>
 </div>
+<script>
+AJS.toInit(function(){
+	AJS.$(document).ready(function(){
+	  //TODO Better way of determining viewType
+		if(JIRA.API !== undefined){
+		  if(JIRA.API.IssueSearch !== undefined && JIRA.ViewIssueTabs !== undefined){
+		    //issue navigator
+		  viewType = 'issueNav';
+		  foresight_show_onTabReady();
+		  }else if(JIRA.API.Projects !== undefined){
+		  //project tab
+		    viewType = 'projectTab';
+		    AJS.$('input#includeOutward, input#includeInward').parent().hide();
+		    foresight_show();
+		  }
+		}else if(JIRA.Issue !== undefined){
+		  //issue view
+		    viewType = 'issue';
+		    foresight_show();
+		    foresight_show_onTabReady();
+		}
+
+	});
+});
+</script>