projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix JavaScript error after Rendering API clean-up
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
module-loader
/
module-loader.cpp
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
12ad13c
..
0c993d4
100644
(file)
--- a/
plugins/dali-script-v8/src/module-loader/module-loader.cpp
+++ b/
plugins/dali-script-v8/src/module-loader/module-loader.cpp
@@
-105,7
+105,7
@@
bool ModuleLoader::ExecuteScriptFromFile( v8::Isolate* isolate,
}
/**
}
/**
- * ### var module = require("module
-n
ame");
+ * ### var module = require("module
N
ame");
*
*
* There is no standard for modules or the 'require' keyword in JavaScript.<br />
*
*
* There is no standard for modules or the 'require' keyword in JavaScript.<br />
@@
-161,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
* from an object literal with name-value pairs (exports object) to a function.
*
* // my_first_module.js
- * module.exports = function() { log("hello
-w
orld"); }
+ * module.exports = function() { log("hello
W
orld"); }
*
* <br />
*
*
* <br />
*
@@
-173,23
+173,24
@@
bool ModuleLoader::ExecuteScriptFromFile( v8::Isolate* isolate,
* #### Exporting as a constructor
*
*
* #### Exporting as a constructor
*
*
- * // Image
Actor
.js
- * function Image
Actor
( position, orientation, image, name )
+ * // Image
View
.js
+ * function Image
View
( position, orientation, image, name )
* {
* {
- * this = new dali.ImageActor( image );
+ * this = new dali.Control("ImageView");
+ * this.image = image;
* this.position = position;
* this.orientation = orientation;
* this.name = name;
* }
* this.position = position;
* this.orientation = orientation;
* this.name = name;
* }
- * module.exports = Image
Actor
;
+ * module.exports = Image
View
;
*
* <br />
*
* // main.js
*
*
* <br />
*
* // main.js
*
- * var Image
Actor = require(" ImageActor
.js");
+ * var Image
View = require(" ImageView
.js");
*
*
- * var image
Actor = new ImageActor
( position, orientation, image, "my first image actor");
+ * var image
View = new ImageView
( position, orientation, image, "my first image actor");
*
* #### Exporting as a singleton
*
*
* #### Exporting as a singleton
*