diff --git a/arangod/V8Server/ApplicationV8.cpp b/arangod/V8Server/ApplicationV8.cpp index d3869a54e9..3664828f63 100644 --- a/arangod/V8Server/ApplicationV8.cpp +++ b/arangod/V8Server/ApplicationV8.cpp @@ -27,10 +27,12 @@ #include "ApplicationV8.h" +#include "Actions/actions.h" +#include "ApplicationServer/ApplicationServer.h" #include "Basics/ConditionLocker.h" #include "Basics/FileUtils.h" -#include "Basics/MutexLocker.h" #include "Basics/Mutex.h" +#include "Basics/MutexLocker.h" #include "Basics/ReadLocker.h" #include "Basics/StringUtils.h" #include "Basics/Thread.h" @@ -44,11 +46,11 @@ #include "V8Server/v8-query.h" #include "V8Server/v8-vocbase.h" #include "VocBase/server.h" -#include "Actions/actions.h" using namespace triagens; using namespace triagens::basics; using namespace triagens::arango; +using namespace triagens::rest; using namespace std; //////////////////////////////////////////////////////////////////////////////// @@ -201,6 +203,7 @@ ApplicationV8::ApplicationV8 (TRI_server_t* server) _devAppPath(), _useActions(true), _developmentMode(false), + _frontendDevelopmentMode(false), _performUpgrade(false), _skipUpgrade(false), _gcInterval(1000), @@ -570,11 +573,16 @@ void ApplicationV8::setupOptions (map ("javascript.dev-app-path", &_devAppPath, "directory for Foxx applications (development mode)") ("javascript.startup-directory", &_startupPath, "path to the directory containing JavaScript startup scripts") ("javascript.v8-options", &_v8Options, "options to pass to v8") + // deprecated options ("javascript.action-directory", &DeprecatedPath, "path to the JavaScript action directory (deprecated)") ("javascript.modules-path", &DeprecatedPath, "one or more directories separated by semi-colons (deprecated)") ("javascript.package-path", &DeprecatedPath, "one or more directories separated by semi-colons (deprecated)") ; + + options[ApplicationServer::OPTIONS_HIDDEN] + ("javascript.frontend-development", &_frontendDevelopmentMode, "allows rebuild frontend assets") + ; } //////////////////////////////////////////////////////////////////////////////// @@ -775,6 +783,7 @@ bool ApplicationV8::prepareV8Instance (const size_t i) { TRI_AddGlobalVariableVocbase(context->_context, "APP_PATH", v8::String::New(_appPath.c_str(), _appPath.size())); TRI_AddGlobalVariableVocbase(context->_context, "DEV_APP_PATH", v8::String::New(_devAppPath.c_str(), _devAppPath.size())); TRI_AddGlobalVariableVocbase(context->_context, "DEVELOPMENT_MODE", v8::Boolean::New(_developmentMode)); + TRI_AddGlobalVariableVocbase(context->_context, "FE_DEVELOPMENT_MODE", v8::Boolean::New(_frontendDevelopmentMode)); } // set global flag before loading system files diff --git a/arangod/V8Server/ApplicationV8.h b/arangod/V8Server/ApplicationV8.h index 01ca343abf..2a2e7c451b 100644 --- a/arangod/V8Server/ApplicationV8.h +++ b/arangod/V8Server/ApplicationV8.h @@ -429,11 +429,17 @@ namespace triagens { bool _useActions; //////////////////////////////////////////////////////////////////////////////// -/// @brief use development mode +/// @brief enables development mode //////////////////////////////////////////////////////////////////////////////// bool _developmentMode; +//////////////////////////////////////////////////////////////////////////////// +/// @brief enables frontend development mode +//////////////////////////////////////////////////////////////////////////////// + + bool _frontendDevelopmentMode; + //////////////////////////////////////////////////////////////////////////////// /// @brief perform a database upgrade /// diff --git a/js/apps/system/aardvark/frontend/html/body.html.part b/js/apps/system/aardvark/frontend/html/body.html.part index 894c524818..af96e3214e 100644 --- a/js/apps/system/aardvark/frontend/html/body.html.part +++ b/js/apps/system/aardvark/frontend/html/body.html.part @@ -1,4 +1,5 @@ + HHALO