diff --git a/css/main.css b/css/main.css index 273211a76ff88802cd0fb4beb245ee93acfe6388..5cae6e4af5d8b1ec55bb67b87140c7d0c35e4190 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 51d27b01bfeeb4d90da58482dbdaebf3e5478748..d59622dca3a12a0428fbcb9a01c9f04c1b3c6b7c 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 72c4b234c0b747b5892e6a0ab026868c70ba3930..ad20513446b44def5383de4b5a7b30f5501a1f42 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 ""