From 8b8507e9cf3672a5d263e9bedfa92006705ba523 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 27 Oct 2015 13:36:04 -0400
Subject: [PATCH] load script ui
---
css/main.css | 14 ++++++++++++--
index.html | 5 +++--
js/menus/otherUI/Console.js | 9 ++++++++-
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/css/main.css b/css/main.css
index 273211a7..5cae6e4a 100644
--- a/css/main.css
+++ b/css/main.css
@@ -600,9 +600,19 @@ label {
.consoleComment {
color: darkgray;
}
-
-#consoleSaveScript {
+#consoleButtons{
height: 42px;
border-width: 0;
+ padding: 0;
border-radius: 0;
+}
+#consoleButtons>span {
+ height: 42px;
+ border-top-width: 0;
+ border-bottom-width: 0;
+ border-right-width: 0;
+ border-radius: 0;
+}
+#consoleLoadScript{
+ border: 2px solid #aaa;
}
\ No newline at end of file
diff --git a/index.html b/index.html
index 51d27b01..d59622dc 100644
--- a/index.html
+++ b/index.html
@@ -132,8 +132,9 @@
<div>
<div id="consoleOutput"></div>
<div class="input-group">
- <input id="consoleInput" value="" aria-describedby="consoleSaveScript" placeholder="Type Command" class="form-control" type="text">
- <span class="input-group-addon btn btn-defualt" id="consoleSaveScript">Save Script</span>
+ <input id="consoleInput" value="" aria-describedby="consoleButtons" placeholder="Type Command" class="form-control" type="text">
+ <span id="consoleButtons" class="input-group-addon"><span class="btn btn-defualt" id="consoleSaveScript">Save Script</span>
+ <span class="btn btn-defualt" id="consoleLoadScript">Load Script</span></span>
</div>
</div>
</div>
diff --git a/js/menus/otherUI/Console.js b/js/menus/otherUI/Console.js
index 72c4b234..ad205134 100644
--- a/js/menus/otherUI/Console.js
+++ b/js/menus/otherUI/Console.js
@@ -10,7 +10,8 @@ define(['jquery', 'underscore', 'backbone', 'appState'], function($, _, Backbone
el: "#console",
events: {
- "click #consoleSaveScript": "_saveScript"
+ "click #consoleSaveScript": "_saveScript",
+ "click #consoleLoadScript": "_loadScript"
},
initialize: function(){
@@ -96,6 +97,7 @@ define(['jquery', 'underscore', 'backbone', 'appState'], function($, _, Backbone
},
_enterCommand: function($input){
+ if ($input === undefined) $input = $("#consoleInput");
// var command = $input.val();
var command = "nice try, this doesn't work yet :)";
$input.val("");
@@ -110,6 +112,11 @@ define(['jquery', 'underscore', 'backbone', 'appState'], function($, _, Backbone
})
},
+ _loadScript: function(e){
+ e.preventDefault();
+ this._enterCommand();
+ },
+
getConsoleData: function(){
var data = $("#consoleOutput").html().split("<br>");
data.pop();//last line is ""
--
GitLab