summaryrefslogtreecommitdiff
path: root/js/codeq/settings.js
diff options
context:
space:
mode:
authorRobert Zorko <robertz@gurucue.com>2015-12-16 14:21:33 +0100
committerRobert Zorko <robertz@gurucue.com>2015-12-16 14:21:33 +0100
commita7fa6cfffebe3026198ad8beb0e06543d3503bb6 (patch)
treef8d322a40900c778b1178807492ecbe0e6c58d66 /js/codeq/settings.js
parentca3aa94da7798bba4fed6ae467d8fa94324a832e (diff)
parente906718cefc3f5fc7a279c7cae3a76fbdc184961 (diff)
merge with Ales fixes
Diffstat (limited to 'js/codeq/settings.js')
-rw-r--r--js/codeq/settings.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/codeq/settings.js b/js/codeq/settings.js
index 3e72cbd..6fec614 100644
--- a/js/codeq/settings.js
+++ b/js/codeq/settings.js
@@ -34,6 +34,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
});
codeq.globalStateMachine.register('settings',{
+ 'jqScreen': jqScreenSettings,
+ 'isModal': true,
+
'enter':function(){
jqDisabledOverlay.css('display', '');
robotAddressInput.val(codeq.settings['robot_address']);//set the robot address once we enter the state