Fix previous commit: Version should be string

nwjs · Aug 30, 2012 · 885347f · 885347f
1 parent 37e30e2
commit 885347f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/patches/webkit.patch b/patches/webkit.patch
@@ -64,7 +64,7 @@ index 23760b1..b2b73f4 100644
      }
      if ($interfaceName eq "HTMLDocument") {
 diff --git a/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp b/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
-index e37b829..d4777c3 100644
+index e37b829..4214051 100644
 --- a/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
 +++ b/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
 @@ -64,6 +64,12 @@
@@ -162,7 +162,7 @@ index e37b829..d4777c3 100644
 +            "});"
 +
 +            // Save node-webkit version
-+            "process.versions['node-webkit'] = " NW_VERSION_STRING ";"
++            "process.versions['node-webkit'] = '" NW_VERSION_STRING "';"
 +        ));
 +        script->Run();
 +    }

diff --git a/src/nw_version.h b/src/nw_version.h
@@ -23,8 +23,8 @@
 
 #define NW_MAJOR_VERSION 0
 #define NW_MINOR_VERSION 2
-#define NW_PATCH_VERSION 4
-#define NW_VERSION_IS_RELEASE 1
+#define NW_PATCH_VERSION 5
+#define NW_VERSION_IS_RELEASE 0
 
 #ifndef NW_STRINGIFY
 #define NW_STRINGIFY(n) NW_STRINGIFY_HELPER(n)

diff --git a/src/resources/nw_version.html b/src/resources/nw_version.html
@@ -4,6 +4,7 @@
   <title>node-webkit versions</title>
 </head>
 <body>
-  node.js v<script>document.write(process.version);</script>
+  node-webkit v<script>document.write(process.versions['node-webkit']);</script><br/>
+  node.js v<script>document.write(process.versions['node']);</script><br/>
 </body>
 </html>