From 4030404b084a5c4c2cf6ea53d8906b8e5998c8e8 Mon Sep 17 00:00:00 2001
From: Ryan Izard <rizard@g.clemson.edu>
Date: Sun, 21 Dec 2014 15:06:47 -0500
Subject: [PATCH] Another tweak to the JS.
---
src/main/resources/web/js/models/switchmodel.js | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/main/resources/web/js/models/switchmodel.js b/src/main/resources/web/js/models/switchmodel.js
index a76ff6f87..36e1b8ce3 100644
--- a/src/main/resources/web/js/models/switchmodel.js
+++ b/src/main/resources/web/js/models/switchmodel.js
@@ -178,6 +178,8 @@ window.Switch = Backbone.Model.extend({
_.each(f.match, function(value , key) {
f.matchHTML += key + "=" + value +" ";
},f);
+ } else {
+ f.matchHTML = "---";
}
f.matchHTML = f.matchHTML.substr(0, f.matchHTML.length - 1);
@@ -193,23 +195,35 @@ window.Switch = Backbone.Model.extend({
_.each(f.instructions.instruction_apply_actions, function(value, key) {
f.applyActionText += key + ":" + value + " ";
},f);
+ } else {
+ f.applyActionText = "---";
}
if(f.instructions.hasOwnProperty('instruction_write_actions')) {
_.each(f.instructions.instruction_write_actions, function(value, key) {
f.writeActionText += key + ":" + value + " ";
},f);
+ } else {
+ f.writeActionText = "---";
}
if(f.instructions.hasOwnProperty('instruction_clear_actions')) {
f.clearActionText = "clear";
+ } else {
+ f.clearActionText = "---";
}
if(f.instructions.hasOwnProperty('instruction_write_metadata')) {
f.writeMetadataText = f.instructions.instruction_write_metadata;
+ } else {
+ f.writeMetadataText = "---";
}
if(f.instructions.hasOwnProperty('instruction_goto_group')) {
f.gotoGroupText = f.instructions.instruction_goto_group;
+ } else {
+ f.gotoGroupText = "---";
}
if(f.instructions.hasOwnProperty('instruction_goto_meter')) {
f.gotoMeterText = f.instructions.instruction_goto_meter;
+ } else {
+ f.gotoMeterText = "---";
}
}
@@ -227,6 +241,8 @@ window.Switch = Backbone.Model.extend({
f.tableText = '';
if(f.hasOwnProperty('tableId')) {
f.tableText = f.tableId;
+ } else {
+ f.applyActionText = "---";
}
f.tableText = f.tableText.substr(0, f.tableText.length - 1);
--
GitLab