From a7424b7e41181db94cf8a439f5ba1aedc362a083 Mon Sep 17 00:00:00 2001
From: hjank <jank@uni-potsdam.de>
Date: Tue, 8 Dec 2015 10:58:27 +0100
Subject: [PATCH] # replaced inputValue with chosenValue in contextInfoModel
and parameterModel + added chosenOperator in contextInfoModel
---
js/authoring/models/contextInfoModel.js | 19 ++++++++++++++-----
js/authoring/models/parameterModel.js | 10 +++++-----
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/js/authoring/models/contextInfoModel.js b/js/authoring/models/contextInfoModel.js
index cdd8d66..3d33f5e 100644
--- a/js/authoring/models/contextInfoModel.js
+++ b/js/authoring/models/contextInfoModel.js
@@ -13,8 +13,9 @@ function ContextInformation() {
this._min = "";
this._max = "";
this._default = "";
- this._inputValue = "";
+ this._chosenValue = "";
this._operators = [];
+ this._chosenOperator = "";
this._enums = [];
this._parameters = [];
@@ -46,14 +47,18 @@ ContextInformation.prototype.getDefault = function () {
return this._default;
};
-ContextInformation.prototype.getInputValue = function () {
- return this._inputValue;
+ContextInformation.prototype.getChosenValue = function () {
+ return this._chosenValue;
};
ContextInformation.prototype.getOperators = function () {
return this._operators;
};
+ContextInformation.prototype.getChosenOperator = function () {
+ return this._chosenOperator;
+};
+
ContextInformation.prototype.getEnums = function () {
return this._enums;
};
@@ -90,14 +95,18 @@ ContextInformation.prototype.setDefault = function (def) {
this._default = def;
};
-ContextInformation.prototype.setInputValue = function (value) {
- this._inputValue = value;
+ContextInformation.prototype.setChosenValue = function (value) {
+ this._chosenValue = value;
};
ContextInformation.prototype.setOperators = function (operators) {
this._operators = operators;
};
+ContextInformation.prototype.setChosenOperator = function (operator) {
+ this._chosenOperator = operator;
+};
+
ContextInformation.prototype.setEnums = function (enums) {
this._enums = enums;
};
diff --git a/js/authoring/models/parameterModel.js b/js/authoring/models/parameterModel.js
index be3014f..7f784bc 100644
--- a/js/authoring/models/parameterModel.js
+++ b/js/authoring/models/parameterModel.js
@@ -9,7 +9,7 @@ function Parameter() {
this._min = "";
this._max = "";
this._default = "";
- this._inputValue = "";
+ this._chosenValue = "";
this._enums = [];
return this;
@@ -36,8 +36,8 @@ Parameter.prototype.getDefault = function () {
return this._default;
};
-Parameter.prototype.getInputValue = function () {
- return this._inputValue;
+Parameter.prototype.getChosenValue = function () {
+ return this._chosenValue;
};
Parameter.prototype.getEnums = function () {
@@ -69,8 +69,8 @@ Parameter.prototype.setDefault = function (def) {
this._default = def;
};
-Parameter.prototype.setInputValue = function (value) {
- this._inputValue = value;
+Parameter.prototype.setChosenValue = function (value) {
+ this._chosenValue = value;
};
Parameter.prototype.setEnums = function (enums) {
--
GitLab