X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Fmodule-loader%2Fmodule-loader.cpp;h=6623374ba0d6981b7ef09b487118dc57a440001c;hb=a073ebfd862b49692c8e6d7dff2b128e62a4f6df;hp=c9d58ea3fc4c13c1e5315b3caa12dcc277d096e6;hpb=4c85a797e24c20bfb1670c079e5f66a9a5d6fa0e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git
diff --git a/plugins/dali-script-v8/src/module-loader/module-loader.cpp b/plugins/dali-script-v8/src/module-loader/module-loader.cpp
index c9d58ea..6623374 100644
--- a/plugins/dali-script-v8/src/module-loader/module-loader.cpp
+++ b/plugins/dali-script-v8/src/module-loader/module-loader.cpp
@@ -29,7 +29,6 @@ namespace V8Plugin
ModuleLoader::ModuleLoader()
{
-
}
ModuleLoader::~ModuleLoader()
@@ -97,11 +96,16 @@ bool ModuleLoader::ExecuteScriptFromFile( v8::Isolate* isolate,
V8Utils::GetFileContents( fileName, contents );
+ if( contents.empty() )
+ {
+ return false;
+ }
+
return ExecuteScript( isolate, contents, fileName );
}
/**
- * ### var module = require("module-name");
+ * ### var module = require("moduleName");
*
*
* There is no standard for modules or the 'require' keyword in JavaScript.
@@ -157,7 +161,7 @@ bool ModuleLoader::ExecuteScriptFromFile( v8::Isolate* isolate,
* from an object literal with name-value pairs (exports object) to a function.
*
* // my_first_module.js
- * module.exports = function() { log("hello-world"); }
+ * module.exports = function() { log("helloWorld"); }
*
*
*
@@ -170,11 +174,11 @@ bool ModuleLoader::ExecuteScriptFromFile( v8::Isolate* isolate,
*
*
* // ImageActor.js
- * function ImageActor( position, rotation, image, name )
+ * function ImageActor( position, orientation, image, name )
* {
* this = new dali.ImageActor( image );
* this.position = position;
- * this.rotation = rotation;
+ * this.orientation = orientation;
* this.name = name;
* }
* module.exports = ImageActor;
@@ -185,7 +189,7 @@ bool ModuleLoader::ExecuteScriptFromFile( v8::Isolate* isolate,
*
* var ImageActor = require(" ImageActor.js");
*
- * var imageActor = new ImageActor( position, rotation, image, "my first image actor");
+ * var imageActor = new ImageActor( position, orientation, image, "my first image actor");
*
* #### Exporting as a singleton
*
@@ -306,9 +310,7 @@ bool ModuleLoader::ExecuteScriptFromFile( v8::Isolate* isolate,
* @for ModuleLoader
*
*/
-void ModuleLoader::Require(const v8::FunctionCallbackInfo< v8::Value >& args,
-
- v8::Persistent& globalObjectTemplate )
+void ModuleLoader::Require(const v8::FunctionCallbackInfo< v8::Value >& args )
{
v8::Isolate* isolate = args.GetIsolate();
v8::HandleScope handleScope( isolate );
@@ -388,6 +390,12 @@ void ModuleLoader::Require(const v8::FunctionCallbackInfo< v8::Value >& args,
args.GetReturnValue().Set( moduleExports );
}
+
+void ModuleLoader::StorePreBuiltModule( v8::Isolate* isolate, v8::Local& exportObject, const std::string& name )
+{
+ StoreModule( "", name, name, isolate, exportObject );
+}
+
void ModuleLoader::StoreScriptInfo( const std::string& sourceFileName )
{
V8Utils::GetFileDirectory( sourceFileName, mCurrentScriptPath);