azkaban-uncached
Changes
src/web/js/azkaban.common.utils.js 38(+38 -0)
src/web/js/azkaban.flow.graph.view.js 14(+9 -5)
src/web/js/azkaban.flow.view.js 23(+0 -23)
src/web/js/azkaban.job.status.utils.js 26(+0 -26)
src/web/js/azkaban.staging.flow.view.js 26(+0 -26)
src/web/js/azkaban.svg.graph.view.js 41(+9 -32)
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index a593875..5c4f1d4 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -25,6 +25,7 @@
<script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
<script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+ <script type="text/javascript" src="${context}/js/azkaban.common.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.context.menu.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.ajax.utils.js"></script>
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
index f903ac5..f338e2d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
@@ -17,6 +17,7 @@
<script type="text/javascript" src="${context}/js/azkaban.layout.js"></script>
<script type="text/javascript" src="${context}/js/svgNavigate.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.context.menu.js"></script>
+<script type="text/javascript" src="${context}/js/azkaban.common.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.svg.graph.view.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.flow.execute.view.js"></script>
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 755f518..cde432c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -28,6 +28,7 @@
<script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.ajax.utils.js"></script>
+ <script type="text/javascript" src="${context}/js/azkaban.common.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.layout.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.flow.job.view.js"></script>
src/web/js/azkaban.common.utils.js 38(+38 -0)
diff --git a/src/web/js/azkaban.common.utils.js b/src/web/js/azkaban.common.utils.js
new file mode 100644
index 0000000..411de17
--- /dev/null
+++ b/src/web/js/azkaban.common.utils.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2012 LinkedIn Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+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 hasClass(el, name) {
+ var classes = el.getAttribute("class");
+ if (classes == null) {
+ return false;
+ }
+ return new RegExp('(\\s|^)'+name+'(\\s|$)').test(classes);
+}
src/web/js/azkaban.flow.graph.view.js 14(+9 -5)
diff --git a/src/web/js/azkaban.flow.graph.view.js b/src/web/js/azkaban.flow.graph.view.js
index 22aa24c..338b08c 100644
--- a/src/web/js/azkaban.flow.graph.view.js
+++ b/src/web/js/azkaban.flow.graph.view.js
@@ -120,9 +120,9 @@ azkaban.SvgGraphView = Backbone.View.extend({
this.nodes[id].disabled = true;
addClass(g, "disabled");
}
- else {
- this.nodes[id].disabled = false;
- removeClass(g, "disabled");
+ else {
+ this.nodes[id].disabled = false;
+ removeClass(g, "disabled");
}
}
},
@@ -226,7 +226,6 @@ azkaban.SvgGraphView = Backbone.View.extend({
var xOffset = 10;
var yOffset = 10;
-
var nodeG = document.createElementNS(svgns, "g");
nodeG.setAttributeNS(null, "class", "jobnode");
@@ -250,7 +249,12 @@ azkaban.SvgGraphView = Backbone.View.extend({
text.setAttributeNS(null, "y", 15);
text.setAttributeNS(null, "height", 10);
- this.addBounds(bounds, {minX:node.x - xOffset, minY: node.y - yOffset, maxX: node.x + xOffset, maxY: node.y + yOffset});
+ this.addBounds(bounds, {
+ minX: node.x - xOffset,
+ minY: node.y - yOffset,
+ maxX: node.x + xOffset,
+ maxY: node.y + yOffset
+ });
var backRect = document.createElementNS(svgns, 'rect');
backRect.setAttributeNS(null, "x", 0);
src/web/js/azkaban.flow.view.js 23(+0 -23)
diff --git a/src/web/js/azkaban.flow.view.js b/src/web/js/azkaban.flow.view.js
index de7a240..ce01dbc 100644
--- a/src/web/js/azkaban.flow.view.js
+++ b/src/web/js/azkaban.flow.view.js
@@ -40,29 +40,6 @@ var handleJobMenuClick = function(action, el, pos) {
}
}
-function hasClass(el, name) {
- var classes = el.getAttribute("class");
- if (classes == null) {
- return false;
- }
- 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 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, ''));
- }
-}
-
var flowTabView;
azkaban.FlowTabView= Backbone.View.extend({
events : {
src/web/js/azkaban.job.status.utils.js 26(+0 -26)
diff --git a/src/web/js/azkaban.job.status.utils.js b/src/web/js/azkaban.job.status.utils.js
index a4f90e4..ee03ae6 100644
--- a/src/web/js/azkaban.job.status.utils.js
+++ b/src/web/js/azkaban.job.status.utils.js
@@ -29,29 +29,3 @@ var statusStringMap = {
"UNKNOWN": "Unknown",
"PAUSED": "Paused"
};
-
-function hasClass(el, name)
-{
- var classes = el.getAttribute("class");
- if (classes == null) {
- return false;
- }
- 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 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, ''));
- }
-}
src/web/js/azkaban.staging.flow.view.js 26(+0 -26)
diff --git a/src/web/js/azkaban.staging.flow.view.js b/src/web/js/azkaban.staging.flow.view.js
index 9104759..1b00553 100644
--- a/src/web/js/azkaban.staging.flow.view.js
+++ b/src/web/js/azkaban.staging.flow.view.js
@@ -168,32 +168,6 @@ function recurseAllDescendents(nodes, disabledMap, id, disable) {
}
}
-function hasClass(el, name)
-{
- var classes = el.getAttribute("class");
- if (classes == null) {
- return false;
- }
- 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 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, ''));
- }
-}
-
var flowTabView;
azkaban.FlowTabView= Backbone.View.extend({
events : {
src/web/js/azkaban.svg.graph.view.js 41(+9 -32)
diff --git a/src/web/js/azkaban.svg.graph.view.js b/src/web/js/azkaban.svg.graph.view.js
index 1aa7092..380dff0 100644
--- a/src/web/js/azkaban.svg.graph.view.js
+++ b/src/web/js/azkaban.svg.graph.view.js
@@ -14,33 +14,6 @@
* the License.
*/
-function hasClass(el, name)
-{
- var classes = el.getAttribute("class");
- if (classes == null) {
- return false;
- }
- 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 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",
@@ -167,9 +140,9 @@ azkaban.SvgGraphView = Backbone.View.extend({
this.nodes[id].disabled = true;
addClass(g, "disabled");
}
- else {
- this.nodes[id].disabled = false;
- removeClass(g, "disabled");
+ else {
+ this.nodes[id].disabled = false;
+ removeClass(g, "disabled");
}
}
},
@@ -304,7 +277,6 @@ azkaban.SvgGraphView = Backbone.View.extend({
circle.setAttributeNS(null, "r", 12);
circle.setAttributeNS(null, "style", "width:inherit;stroke-opacity:1");
-
var text = document.createElementNS(svgns, 'text');
var textLabel = document.createTextNode(node.label);
text.appendChild(textLabel);
@@ -312,7 +284,12 @@ azkaban.SvgGraphView = Backbone.View.extend({
text.setAttributeNS(null, "y", 15);
text.setAttributeNS(null, "height", 10);
- this.addBounds(bounds, {minX:node.x - xOffset, minY: node.y - yOffset, maxX: node.x + xOffset, maxY: node.y + yOffset});
+ this.addBounds(bounds, {
+ minX: node.x - xOffset,
+ minY: node.y - yOffset,
+ maxX: node.x + xOffset,
+ maxY: node.y + yOffset
+ });
var backRect = document.createElementNS(svgns, 'rect');
backRect.setAttributeNS(null, "x", 0);