From a40853a398c5285ee25e8c2d288dc92aab7b26ba Mon Sep 17 00:00:00 2001 From: Sean Zhu Date: Thu, 12 Jun 2014 21:41:37 -0700 Subject: [PATCH] set default global robot_application on initial load --- .gitignore | 2 ++ angel-player/src/chrome/content/common/global_state.js | 4 ++++ angel-player/src/chrome/content/texteditor/editor.html | 1 + angel-player/src/chrome/content/texteditor/editor.js | 1 + 4 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 97ba348e..5cdab1d9 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,5 @@ nosetests.xml .pydevproject + +run-angel-player.app/run-angel-player diff --git a/angel-player/src/chrome/content/common/global_state.js b/angel-player/src/chrome/content/common/global_state.js index d996562b..6f18edef 100644 --- a/angel-player/src/chrome/content/common/global_state.js +++ b/angel-player/src/chrome/content/common/global_state.js @@ -1,6 +1,8 @@ /* jshint globalstrict: true */ "use strict"; +const robot_application = require('tenshi/common/robot_application'); + // Nothing is in here by itself; things get shoved into this module to be // stored across pages. @@ -15,3 +17,5 @@ exports.set = function(key, val) { exports.get = function(key) { return state[key]; }; + +exports.set('robot_application', robot_application.CreateEmptyRobotApplication()); diff --git a/angel-player/src/chrome/content/texteditor/editor.html b/angel-player/src/chrome/content/texteditor/editor.html index d7b8fbb0..c855be60 100644 --- a/angel-player/src/chrome/content/texteditor/editor.html +++ b/angel-player/src/chrome/content/texteditor/editor.html @@ -12,6 +12,7 @@ } + diff --git a/angel-player/src/chrome/content/texteditor/editor.js b/angel-player/src/chrome/content/texteditor/editor.js index 0eecc026..b866056e 100644 --- a/angel-player/src/chrome/content/texteditor/editor.js +++ b/angel-player/src/chrome/content/texteditor/editor.js @@ -37,6 +37,7 @@ exports.init = function(_window) { ace = window.ace; editor = ace.edit("editor"); + editor.getSession().setMode('ace/mode/lua'); let robotApp = global_state.get('robot_application'); editor.setValue(robotApp.text_code);