Better HTML template in Mix.

Use happened in JS. Debugging QML enabled.
10 years ago · 4046debbc9
6 changed files with 13 additions and 5 deletions
--- a/libjsqrc/ethereumjs/dist/ethereum.js
+++ b/libjsqrc/ethereumjs/dist/ethereum.js
@ -590,6 +590,9 @@ var Filter = function(options, impl) {
 Filter.prototype.arrived = function(callback) {
    this.changed(callback);
 };
 Filter.prototype.happened = function(callback) {
    this.changed(callback);
 };
 /// gets called when there is new eth/shh message
 Filter.prototype.changed = function(callback) {
--- a/libjsqrc/ethereumjs/dist/ethereum.js.map
+++ b/libjsqrc/ethereumjs/dist/ethereum.js.map
--- a/libjsqrc/ethereumjs/dist/ethereum.min.js
+++ b/libjsqrc/ethereumjs/dist/ethereum.min.js
--- a/libjsqrc/ethereumjs/lib/filter.js
+++ b/libjsqrc/ethereumjs/lib/filter.js
@ -61,6 +61,9 @@ var Filter = function(options, impl) {
 Filter.prototype.arrived = function(callback) {
    this.changed(callback);
 };
 Filter.prototype.happened = function(callback) {
    this.changed(callback);
 };
 /// gets called when there is new eth/shh message
 Filter.prototype.changed = function(callback) {
--- a/mix/CMakeLists.txt
+++ b/mix/CMakeLists.txt
@ -26,6 +26,8 @@ else()
 	qt5_add_resources(UI_RESOURCES noweb.qrc)
 endif()
 add_definitions(-DQT_QML_DEBUG)
 # eth_add_executable is defined in cmake/EthExecutableHelper.cmake
 eth_add_executable(${EXECUTABLE} 
 	ICON mix
--- a/mix/qml/js/ProjectModel.js
+++ b/mix/qml/js/ProjectModel.js
@ -171,8 +171,8 @@ function doCreateProject(title, path) {
 		files: [ contractsFile, indexFile ]
 	};
 	//TODO: copy from template
-	fileIo.writeFile(dirPath + indexFile, "<html></html>");
+    fileIo.writeFile(dirPath + indexFile, "<html>\n<head>\n<script>\nvar web3 = parent.web3;\nvar theContract = parent.contract;\n</script>\n</head>\n<body>\n<script>\n</script>\n</body>\n</html>");
-	fileIo.writeFile(dirPath + contractsFile, "contract MyContract {\n}\n");
+    fileIo.writeFile(dirPath + contractsFile, "contract Contract {\n}\n");
 	newProject(projectData);
 	var json = JSON.stringify(projectData, null, "\t");
 	fileIo.writeFile(projectFile, json);