set window.__nwWindowId in Window.open()

rogerwang · rogerwang · commit 5d7ca20dff38 · 2014-02-21T13:46:41.000+08:00
Fix nwjs#1519
diff --git a/src/api/dispatcher.cc b/src/api/dispatcher.cc
@@ -102,10 +102,14 @@ void Dispatcher::OnEvent(int object_id,
 }
 
 v8::Handle<v8::Object> Dispatcher::GetObjectRegistry() {
+  // need to enter node context to access the registry in
+  // some cases, e.g. normal frame in #1519
+  node::g_context->Enter();
   v8::Handle<v8::Value> registry =
     node::g_context->Global()->Get(v8_str("__nwObjectsRegistry"));
-  // if (registry->IsNull() || registry->IsUndefined())
-  //   return v8::Undefined();
+  node::g_context->Exit();
+  if (registry->IsNull() || registry->IsUndefined())
+    return v8::Undefined();
   return registry->ToObject();
 }
 
diff --git a/src/api/dispatcher_bindings.cc b/src/api/dispatcher_bindings.cc
@@ -242,7 +242,7 @@ DispatcherBindings::CreateShell(const v8::FunctionCallbackInfo<v8::Value>& args)
   RenderView* render_view = GetCurrentRenderView();
   if (!render_view) {
     args.GetReturnValue().Set(v8::ThrowException(v8::Exception::Error(v8::String::New(
-                                     "Unable to get render view in CallStaticMethod"))));
+                                     "Unable to get render view in CreateShell"))));
     return;
   }
 
diff --git a/src/api/window/window.js b/src/api/window/window.js
@@ -62,6 +62,7 @@ exports.Window = {
     // Create new shell and get it's routing id.
     var id = nw.allocateId();
     options.object_id = id;
+    options.nw_win_id = id;
     var routing_id = nw.createShell(url, options);
 
     return new global.Window(routing_id, true, id);
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -114,6 +114,10 @@ Shell* Shell::Create(WebContents* source_contents,
     params.override_user_agent = NavigationController::UA_OVERRIDE_TRUE;
     params.frame_name = std::string();
 
+    int nw_win_id = 0;
+    manifest->GetInteger("nw_win_id", &nw_win_id);
+    params.nw_win_id = nw_win_id;
+
     new_contents->GetController().LoadURLWithParams(params);
   }
   // Use the user agent value from the source WebContents.

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ DispatcherBindings::CreateShell(const v8::FunctionCallbackInfo<v8::Value>& args)`
`242`	`242`	`RenderView* render_view = GetCurrentRenderView();`
`243`	`243`	`if (!render_view) {`
`244`	`244`	`args.GetReturnValue().Set(v8::ThrowException(v8::Exception::Error(v8::String::New(`
`245`		`- "Unable to get render view in CallStaticMethod"))));`
	`245`	`+ "Unable to get render view in CreateShell"))));`
`246`	`246`	`return;`
`247`	`247`	`}`
`248`	`248`