From b3200a944fc88a277fce287b1df0b406e864f8e6 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 22 Aug 2012 15:08:36 -0700
Subject: [PATCH] Move native function declarations to js file

This allows multiple native handlers to load it
as an extension without duplicating all the expected
native function calls names internally.
---
 Atom-Linux/native_handler.cpp |  8 +++
 Atom/src/native_handler.mm    | 16 ++----
 src/stdlib/native-handler.js  | 94 +++++++++++++++++++++++++++++++++++
 3 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 src/stdlib/native-handler.js

diff --git a/Atom-Linux/native_handler.cpp b/Atom-Linux/native_handler.cpp
index 51b08ca3d..9ee59c25f 100644
--- a/Atom-Linux/native_handler.cpp
+++ b/Atom-Linux/native_handler.cpp
@@ -67,6 +67,14 @@ NativeHandler::NativeHandler() :
     object->SetValue(functionName, function, V8_PROPERTY_ATTRIBUTE_NONE);
   }
 
+  string nativePath = io_utils_real_app_path(
+      "/../src/stdlib/native-handler.js");
+  if (!nativePath.empty()) {
+    string extensionCode;
+    if (io_utils_read(nativePath, &extensionCode) > 0)
+      CefRegisterExtension("v8/native-handler", extensionCode, this);
+  }
+
   notifyFd = inotify_init();
   if (notifyFd != -1)
     g_thread_create_full(NotifyWatchersCallback, this, 0, true, false,
diff --git a/Atom/src/native_handler.mm b/Atom/src/native_handler.mm
index 84f7b1d69..d891189ab 100644
--- a/Atom/src/native_handler.mm
+++ b/Atom/src/native_handler.mm
@@ -31,19 +31,9 @@ void throwException(const CefRefPtr<CefV8Value>& global, CefRefPtr<CefV8Exceptio
 }
 
 NativeHandler::NativeHandler() : CefV8Handler() {  
-  std::string extensionCode =  "var $native = {}; (function() {";
-  
-  const char *functionNames[] = {"exists", "alert", "read", "write", "absolute", "list", "isFile", "isDirectory", "remove", "asyncList", "open", "openDialog", "quit", "writeToPasteboard", "readFromPasteboard", "showDevTools", "toggleDevTools", "newWindow", "saveDialog", "exit", "watchPath", "unwatchPath", "makeDirectory", "move", "moveToTrash", "reload", "lastModified", "md5ForPath", "exec", "getPlatform"};
-  NSUInteger arrayLength = sizeof(functionNames) / sizeof(const char *);
-  for (NSUInteger i = 0; i < arrayLength; i++) {
-    std::string functionName = std::string(functionNames[i]);
-    extensionCode += "native function " + functionName + "(); $native." + functionName + " = " + functionName + ";";
-  }
-  
-  extensionCode += "})();";
-  
-  // Register the extension.
-  CefRegisterExtension("v8/test", extensionCode, this);
+  NSString *filePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"src/stdlib/native-handler.js"];
+  NSString *extensionCode = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil];
+  CefRegisterExtension("v8/native-handler", [extensionCode UTF8String], this);
 }
 
 bool NativeHandler::Execute(const CefString& name,
diff --git a/src/stdlib/native-handler.js b/src/stdlib/native-handler.js
new file mode 100644
index 000000000..721db73d2
--- /dev/null
+++ b/src/stdlib/native-handler.js
@@ -0,0 +1,94 @@
+var $native = {};
+(function() {
+
+  native function exists();
+  $native.exists = exists;
+
+  native function alert();
+  $native.alert = alert;
+
+  native function read();
+  $native.read = read;
+
+  native function write();
+  $native.write = write;
+
+  native function absolute();
+  $native.absolute = absolute;
+
+  native function list();
+  $native.list = list;
+
+  native function isFile();
+  $native.isFile = isFile;
+
+  native function isDirectory();
+  $native.isDirectory = isDirectory;
+
+  native function remove();
+  $native.remove = remove;
+
+  native function asyncList();
+  $native.asyncList = asyncList;
+
+  native function open();
+  $native.open = open;
+
+  native function openDialog();
+  $native.openDialog = openDialog;
+
+  native function quit();
+  $native.quit = quit;
+
+  native function writeToPasteboard();
+  $native.writeToPasteboard = writeToPasteboard;
+
+  native function readFromPasteboard();
+  $native.readFromPasteboard = readFromPasteboard;
+
+  native function showDevTools();
+  $native.showDevTools = showDevTools;
+
+  native function toggleDevTools();
+  $native.toggleDevTools = toggleDevTools;
+
+  native function newWindow();
+  $native.newWindow = newWindow;
+
+  native function saveDialog();
+  $native.saveDialog = saveDialog;
+
+  native function exit();
+  $native.exit = exit;
+
+  native function watchPath();
+  $native.watchPath = watchPath;
+
+  native function unwatchPath();
+  $native.unwatchPath = unwatchPath;
+
+  native function makeDirectory();
+  $native.makeDirectory = makeDirectory;
+
+  native function move();
+  $native.move = move;
+
+  native function moveToTrash();
+  $native.moveToTrash = moveToTrash;
+
+  native function reload();
+  $native.reload = reload;
+
+  native function lastModified();
+  $native.lastModified = lastModified;
+
+  native function md5ForPath();
+  $native.md5ForPath = md5ForPath;
+
+  native function exec();
+  $native.exec = exec;
+
+  native function getPlatform();
+  $native.getPlatform = getPlatform;
+
+})();