From 0f7af4ea51744cda23c4d3c7481f9c332973d1d4 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Thu, 5 Jan 2017 09:16:00 -0300
Subject: -Changed most project settings in the engine, so they have major and
 minor categories. -Changed SectionedPropertyEditor to support this -Renamed
 Globals singleton to GlobalConfig, makes more sense. -Changed the logic
 behind persisten global settings, instead of the persist checkbox, a revert
 button is now available

---
 platform/javascript/os_javascript.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'platform/javascript/os_javascript.cpp')

diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp
index f1b67021f..3553bdc7a 100644
--- a/platform/javascript/os_javascript.cpp
+++ b/platform/javascript/os_javascript.cpp
@@ -309,7 +309,7 @@ void OS_JavaScript::initialize(const VideoMode& p_desired,int p_video_driver,int
 
 #ifdef JAVASCRIPT_EVAL_ENABLED
 	javascript_eval = memnew(JavaScript);
-	Globals::get_singleton()->add_singleton(Globals::Singleton("JavaScript", javascript_eval));
+	GlobalConfig::get_singleton()->add_singleton(GlobalConfig::Singleton("JavaScript", javascript_eval));
 #endif
 }
 
@@ -807,7 +807,7 @@ String OS_JavaScript::get_data_dir() const {
 	//if (get_data_dir_func)
 	//	return get_data_dir_func();
 	return "/userfs";
-	//return Globals::get_singleton()->get_singleton_object("GodotOS")->call("get_data_dir");
+	//return GlobalConfig::get_singleton()->get_singleton_object("GodotOS")->call("get_data_dir");
 };
 
 String OS_JavaScript::get_executable_path() const {
-- 
cgit v1.2.3-70-g09d2