azkaban-uncached

Style changes.

11/9/2013 8:03:14 PM

Details

diff --git a/src/web/js/graph/azkaban.svg.graph.helper.js b/src/web/js/graph/azkaban.svg.graph.helper.js
index 67ee1f7..2b7b376 100644
--- a/src/web/js/graph/azkaban.svg.graph.helper.js
+++ b/src/web/js/graph/azkaban.svg.graph.helper.js
@@ -15,26 +15,37 @@ var openJobDisplayCallback = function(nodeId, flowId, evt) {
 	
 	$("#flowInfoBase").before(cloneStuff);
 	var requestURL = contextURL + "/manager";
-	
-	$.get(
-      requestURL,
-      {"project": projectName, "ajax":"fetchflownodedata", "flow":flowId, "node": nodeId},
-      function(data) {
-  		var graphModel = new azkaban.GraphModel();
-  		graphModel.set({id: data.id, flow: data.flowData, type: data.type, props: data.props});
+	var successHandler = function(data) {
+		var graphModel = new azkaban.GraphModel();
+		graphModel.set({
+			id: data.id, 
+			flow: data.flowData, 
+			type: data.type, 
+			props: data.props
+		});
+
+		var flowData = data.flowData;
+		if (flowData) {
+			createModelFromAjaxCall(flowData, graphModel);
+		}
+		
+		var backboneView = new azkaban.FlowExtendedViewPanel({
+			el: cloneStuff, 
+			model: graphModel
+		});
+		extendedViewPanels[nodeInfoPanelID] = backboneView;
+		extendedDataModels[nodeInfoPanelID] = graphModel;
+		backboneView.showExtendedView(evt);
+  };
+
+  var request = {
+		"project": projectName, 
+		"ajax": "fetchflownodedata", 
+		"flow": flowId, 
+		"node": nodeId
+	};
 
-  		var flowData = data.flowData;
-  		if (flowData) {
-  			createModelFromAjaxCall(flowData, graphModel);
-  		}
-  		
-  		var backboneView = new azkaban.FlowExtendedViewPanel({el:cloneStuff, model: graphModel});
-  		extendedViewPanels[nodeInfoPanelID] = backboneView;
-  		extendedDataModels[nodeInfoPanelID] = graphModel;
-  		backboneView.showExtendedView(evt);
-      },
-      "json"
-    );
+	$.get(requestURL, request, successHandler, "json");
 }
 
 var createModelFromAjaxCall = function(data, model) {
@@ -69,10 +80,12 @@ var nodeClickCallback = function(event, model, type) {
 	console.log("Node clicked callback");
 	var jobId = event.currentTarget.jobid;
 	var flowId = model.get("flowId");
-	var requestURL = contextURL + "/manager?project=" + projectName + "&flow=" + flowId + "&job=" + jobId;
+	var requestURL = contextURL + "/manager?project=" + projectName + 
+			"&flow=" + flowId + "&job=" + jobId;
 
 	if (event.currentTarget.jobtype == "flow") {
-		var flowRequestURL = contextURL + "/manager?project=" + projectName + "&flow=" + event.currentTarget.flowId;
+		var flowRequestURL = contextURL + "/manager?project=" + projectName + 
+				"&flow=" + event.currentTarget.flowId;
 		menu = [
 				{title: "View Flow...", callback: function() {openJobDisplayCallback(jobId, flowId, event)}},
 				{break: 1},
diff --git a/src/web/js/graph/azkaban.svg.graph.view.js b/src/web/js/graph/azkaban.svg.graph.view.js
index 3b82c10..09d5228 100644
--- a/src/web/js/graph/azkaban.svg.graph.view.js
+++ b/src/web/js/graph/azkaban.svg.graph.view.js
@@ -1,30 +1,26 @@
-function hasClass(el, name) 
-{
+function hasClass(el, name) {
 	var classes = el.getAttribute("class");
 	if (classes == null) {
 		return false;
 	}
-   return new RegExp('(\\s|^)'+name+'(\\s|$)').test(classes);
+	return new RegExp('(\\s|^)'+name+'(\\s|$)').test(classes);
 }
 
-function addClass(el, name)
-{
-   if (!hasClass(el, name)) { 
-   		var classes = el.getAttribute("class");
-   		classes += classes ? ' ' + name : '' +name;
-   		el.setAttribute("class", classes);
-   }
+function addClass(el, name) {
+	if (!hasClass(el, name)) { 
+		var classes = el.getAttribute("class");
+		classes += classes ? ' ' + name : '' +name;
+		el.setAttribute("class", classes);
+	}
 }
 
-function removeClass(el, name)
-{
-   if (hasClass(el, name)) {
-      var classes = el.getAttribute("class");
-      el.setAttribute("class", classes.replace(new RegExp('(\\s|^)'+name+'(\\s|$)'),' ').replace(/^\s+|\s+$/g, ''));
-   }
+function removeClass(el, name) {
+	if (hasClass(el, name)) {
+		var classes = el.getAttribute("class");
+		el.setAttribute("class", classes.replace(new RegExp('(\\s|^)'+name+'(\\s|$)'),' ').replace(/^\s+|\s+$/g, ''));
+	}
 }
 
-
 azkaban.SvgGraphView = Backbone.View.extend({
 	events: {
 		"click g" : "clickGraph",
@@ -208,7 +204,12 @@ azkaban.SvgGraphView = Backbone.View.extend({
 				var x = node.x - offset;
 				var y = node.y - offset;
 				
-				$(this.svgGraph).svgNavigate("transformToBox", {x: x, y: y, width: widthHeight, height: widthHeight});
+				$(this.svgGraph).svgNavigate("transformToBox", {
+					x: x, 
+					y: y, 
+					width: widthHeight, 
+					height: widthHeight
+				});
 			}
 		}
 	},
@@ -244,7 +245,9 @@ azkaban.SvgGraphView = Backbone.View.extend({
 			if (callbacks.node && currentTarget.jobid) {
 				callbacks.node(self, this.model);
 			}
-			else if (callbacks.edge && (currentTarget.nodeName == "polyline" || currentTarget.nodeName == "line")) {
+			else if (callbacks.edge && 
+					(currentTarget.nodeName == "polyline" || 
+					 currentTarget.nodeName == "line")) {
 				callbacks.edge(self, this.model);
 			}
 			else if (callbacks.graph) {