From ca7e72e384143be329efd0346ef753578c59c78f Mon Sep 17 00:00:00 2001
From: Ryan Izard <rizard@g.clemson.edu>
Date: Sun, 21 Dec 2014 15:29:04 -0500
Subject: [PATCH] Add in OF1.0 support for regular 'actions'.
---
src/main/resources/web/js/models/switchmodel.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/web/js/models/switchmodel.js b/src/main/resources/web/js/models/switchmodel.js
index b6a18f991..cb1452064 100644
--- a/src/main/resources/web/js/models/switchmodel.js
+++ b/src/main/resources/web/js/models/switchmodel.js
@@ -196,14 +196,14 @@ window.Switch = Backbone.Model.extend({
f.applyActionText += key + ":" + value + " ";
},f);
} else {
- f.applyActionText = "---";
+ 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 = "---";
+ f.writeActionText = "----";
}
if(f.instructions.hasOwnProperty('instruction_clear_actions')) {
f.clearActionText = "clear";
@@ -231,7 +231,14 @@ window.Switch = Backbone.Model.extend({
f.experimenterText = "---";
}
+ } else if(f.hasOwnProperty('actions')) { // OF1.0's actions will go under "apply actions"
+ _.each(f.actions, function(value, key) {
+ f.applyActionText += key + ":" + value + " ";
+ },f);
+ } else {
+ f.applyActionText = "----";
}
+
// build human-readable instrucions
f.applyActionText = f.applyActionText.substr(0, f.applyActionText.length - 1);
f.writeActionText = f.writeActionText.substr(0, f.writeActionText.length - 1);
--
GitLab