X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Fmodule-loader%2Fmodule-loader.cpp;h=9255574b3451f830e4633fb5fa910b228e3230fe;hb=697145b86697d27ad5d66ba0fb7a49a018b1f29c;hp=c9d58ea3fc4c13c1e5315b3caa12dcc277d096e6;hpb=e8efa9549ccedae5b8377c9eb331aa8392895879;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..9255574 100644
--- a/plugins/dali-script-v8/src/module-loader/module-loader.cpp
+++ b/plugins/dali-script-v8/src/module-loader/module-loader.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include "module-loader.h"
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
+
 // INTERNAL INCLUDES
 #include <v8-utils.h>
 
@@ -29,7 +32,6 @@ namespace V8Plugin
 
 ModuleLoader::ModuleLoader()
 {
-
 }
 
 ModuleLoader::~ModuleLoader()
@@ -97,11 +99,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.<br />
@@ -157,7 +164,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"); }
  *
  * <br />
  *
@@ -169,23 +176,24 @@ bool ModuleLoader::ExecuteScriptFromFile( v8::Isolate* isolate,
  * #### Exporting as a constructor
  *
  *
- *     // ImageActor.js
- *     function ImageActor( position, rotation, image, name )
+ *     // ImageView.js
+ *     function ImageView( position, orientation, image, name )
  *     {
- *         this = new dali.ImageActor( image );
+ *         this = new dali.Control("ImageView");
+ *         this.image = image;
  *         this.position = position;
- *         this.rotation = rotation;
+ *         this.orientation = orientation;
  *         this.name = name;
  *     }
- *     module.exports = ImageActor;
+ *     module.exports = ImageView;
  *
  * <br />
  *
  *     // main.js
  *
- *     var ImageActor = require(" ImageActor.js");
+ *     var ImageView = require(" ImageView.js");
  *
- *     var imageActor = new ImageActor( position, rotation, image, "my first image actor");
+ *     var imageView = new ImageView( position, orientation, image, "my first image actor");
  *
  * #### Exporting as a singleton
  *
@@ -306,9 +314,7 @@ bool ModuleLoader::ExecuteScriptFromFile( v8::Isolate* isolate,
  * @for ModuleLoader
  *
  */
-void ModuleLoader::Require(const v8::FunctionCallbackInfo< v8::Value >& args,
-
-                           v8::Persistent<v8::ObjectTemplate>& globalObjectTemplate )
+void ModuleLoader::Require(const v8::FunctionCallbackInfo< v8::Value >& args )
 {
   v8::Isolate* isolate = args.GetIsolate();
   v8::HandleScope handleScope( isolate );
@@ -388,6 +394,12 @@ void ModuleLoader::Require(const v8::FunctionCallbackInfo< v8::Value >& args,
   args.GetReturnValue().Set( moduleExports );
 
 }
+
+void ModuleLoader::StorePreBuiltModule( v8::Isolate* isolate, v8::Local<v8::Object>& exportObject, const std::string& name )
+{
+  StoreModule( "", name, name, isolate, exportObject );
+}
+
 void ModuleLoader::StoreScriptInfo( const std::string& sourceFileName )
 {
   V8Utils::GetFileDirectory( sourceFileName, mCurrentScriptPath);