summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/scripts/controllers/modes/object.ts4
-rw-r--r--src/scripts/controllers/modes/room.ts4
-rw-r--r--src/scripts/controllers/simulationcontroller.ts4
-rw-r--r--src/scripts/projects.entry.ts6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/scripts/controllers/modes/object.ts b/src/scripts/controllers/modes/object.ts
index d974df7a..bc358d71 100644
--- a/src/scripts/controllers/modes/object.ts
+++ b/src/scripts/controllers/modes/object.ts
@@ -1,4 +1,4 @@
-import {AppMode, MapController, InteractionLevel} from "../mapcontroller";
+import {AppMode, InteractionLevel, MapController} from "../mapcontroller";
import {MapView} from "../../views/mapview";
import * as $ from "jquery";
@@ -88,7 +88,7 @@ export class ObjectModeController {
public setupEventListeners() {
// Handler for saving a new rack name
$("#rack-name-save").on("click", () => {
- this.currentRack.name = $("#rack-name-input").val();
+ this.currentRack.name = $("#rack-name-input").text();
this.mapController.api.updateRack(this.mapView.simulation.id,
this.mapView.currentDatacenter.id, this.mapController.roomModeController.currentRoom.id,
this.mapController.objectModeController.currentObjectTile.id, this.currentRack).then(
diff --git a/src/scripts/controllers/modes/room.ts b/src/scripts/controllers/modes/room.ts
index 8a982ef1..dc7f4a41 100644
--- a/src/scripts/controllers/modes/room.ts
+++ b/src/scripts/controllers/modes/room.ts
@@ -1,5 +1,5 @@
import {Util} from "../../util";
-import {InteractionLevel, MapController, AppMode} from "../mapcontroller";
+import {AppMode, InteractionLevel, MapController} from "../mapcontroller";
import {MapView} from "../../views/mapview";
import * as $ from "jquery";
@@ -124,7 +124,7 @@ export class RoomModeController {
// Handler for saving a new room name
$("#room-name-save").on("click", () => {
- this.currentRoom.name = $("#room-name-input").val();
+ this.currentRoom.name = $("#room-name-input").text();
this.mapController.api.updateRoom(this.mapView.simulation.id,
this.mapView.currentDatacenter.id, this.currentRoom).then(() => {
this.mapView.roomTextLayer.draw();
diff --git a/src/scripts/controllers/simulationcontroller.ts b/src/scripts/controllers/simulationcontroller.ts
index 2652d5d4..69997047 100644
--- a/src/scripts/controllers/simulationcontroller.ts
+++ b/src/scripts/controllers/simulationcontroller.ts
@@ -2,7 +2,7 @@
///<reference path="mapcontroller.ts" />
import * as $ from "jquery";
import {MapView} from "../views/mapview";
-import {MapController, InteractionLevel, AppMode} from "./mapcontroller";
+import {AppMode, InteractionLevel, MapController} from "./mapcontroller";
import {Util} from "../util";
import {StateCache} from "./simulation/statecache";
import {ChartController} from "./simulation/chart";
@@ -312,7 +312,7 @@ export class SimulationController {
const newExperiment: IExperiment = {
id: -1,
- name: nameInput.val(),
+ name: nameInput.text(),
pathId: parseInt($("#new-experiment-path-select").val()),
schedulerName: $("#new-experiment-scheduler-select").val(),
traceId: parseInt($("#new-experiment-trace-select").val()),
diff --git a/src/scripts/projects.entry.ts b/src/scripts/projects.entry.ts
index d0ddb8b9..daa0e2d6 100644
--- a/src/scripts/projects.entry.ts
+++ b/src/scripts/projects.entry.ts
@@ -380,7 +380,7 @@ class WindowController {
$(".project-name-form input").val(authorizations[0].simulation.name);
$(".project-name-form .btn").css("display", "inline-block").click(() => {
- const nameInput = $(".project-name-form input").val();
+ const nameInput = $(".project-name-form input").text();
if (nameInput !== "") {
authorizations[0].simulation.name = nameInput;
this.api.updateSimulation(authorizations[0].simulation);
@@ -501,7 +501,7 @@ class WindowController {
private createSimulation(callback: (simulationId: number) => any): void {
this.api.addSimulation({
id: -1,
- name: $(".project-name-form input").val(),
+ name: $(".project-name-form input").text(),
datetimeCreated: Util.getCurrentDateTime(),
datetimeLastEdited: Util.getCurrentDateTime()
}).then((data: any) => {
@@ -577,7 +577,7 @@ class WindowController {
*/
private handleParticipantAdd(callback: (userId: number) => any): void {
const inputForm = $(".participant-add-form input");
- this.api.getUserByEmail(inputForm.val()).then((data: any) => {
+ this.api.getUserByEmail(inputForm.text()).then((data: any) => {
let insert = true;
for (let i = 0; i < this.simAuthorizations.length; i++) {
if (this.simAuthorizations[i].userId === data.id) {