From 948e50285d0c79b8a5721454e87ac2e49d962ac4 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Sat, 27 Apr 2013 19:13:24 +0800 Subject: [PATCH] Use camelCase not under_score, I forgot it's coffee script. --- browser/api/lib/ipc.coffee | 6 ++--- browser/api/lib/window.coffee | 2 +- browser/atom/atom.coffee | 2 +- browser/atom/objects_registry.coffee | 12 +++++----- browser/atom/rpc_server.coffee | 44 ++++++++++++++++++------------------ common/api/atom_bindings.cc | 4 ++-- common/api/lib/id_weak_map.coffee | 2 +- renderer/api/lib/ipc.coffee | 2 +- renderer/api/lib/remote.coffee | 2 +- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/browser/api/lib/ipc.coffee b/browser/api/lib/ipc.coffee index eea279c..f9accca 100644 --- a/browser/api/lib/ipc.coffee +++ b/browser/api/lib/ipc.coffee @@ -1,5 +1,5 @@ EventEmitter = require('events').EventEmitter -send = process.atom_binding('ipc').send +send = process.atomBinding('ipc').send class Ipc extends EventEmitter constructor: -> @@ -8,8 +8,8 @@ class Ipc extends EventEmitter process.on 'ATOM_INTERNAL_MESSAGE_SYNC', (args...) => @emit(args...) - send: (process_id, routing_id, args...) -> - @sendChannel(process_id, routing_id, 'message', args...) + send: (processId, routingId, args...) -> + @sendChannel(processId, routingId, 'message', args...) sendChannel: (args...) -> send('ATOM_INTERNAL_MESSAGE', args...) diff --git a/browser/api/lib/window.coffee b/browser/api/lib/window.coffee index 9e6deab..1f63f7d 100644 --- a/browser/api/lib/window.coffee +++ b/browser/api/lib/window.coffee @@ -1,6 +1,6 @@ EventEmitter = require('events').EventEmitter -Window = process.atom_binding('window').Window +Window = process.atomBinding('window').Window Window.prototype.__proto__ = EventEmitter.prototype module.exports = Window diff --git a/browser/atom/atom.coffee b/browser/atom/atom.coffee index d6ad0bb..9a907a7 100644 --- a/browser/atom/atom.coffee +++ b/browser/atom/atom.coffee @@ -2,7 +2,7 @@ fs = require 'fs' path = require 'path' # Enable idle gc. -process.atom_binding('idle_gc').start() +process.atomBinding('idle_gc').start() # Provide default Content API implementations. atom = {} diff --git a/browser/atom/objects_registry.coffee b/browser/atom/objects_registry.coffee index 680e5a7..fb886eb 100644 --- a/browser/atom/objects_registry.coffee +++ b/browser/atom/objects_registry.coffee @@ -26,8 +26,8 @@ class ObjectsStore throw new Error("Invalid key #{id} for ObjectsStore") unless @has id @objects[id] - @forRenderView: (process_id, routing_id) -> - key = "#{process_id}_#{routing_id}" + @forRenderView: (processId, routingId) -> + key = "#{processId}_#{routingId}" @stores[key] = new ObjectsStore unless @stores[key]? @stores[key] @@ -52,7 +52,7 @@ process.on 'ATOM_BROWSER_INTERNAL_NEW', (obj) -> # Also remember all windows. windowsWeakMap.add obj if obj.constructor.name is 'Window' -exports.add = (process_id, routing_id, obj) -> +exports.add = (processId, routingId, obj) -> # Some native objects may already been added to objectsWeakMap, be care not # to add it twice. objectsWeakMap.add obj unless obj.id? @@ -60,7 +60,7 @@ exports.add = (process_id, routing_id, obj) -> # Store and reference the object, then return the storeId which points to # where the object is stored. The caller can later dereference the object # with the storeId. - store = ObjectsStore.forRenderView process_id, routing_id + store = ObjectsStore.forRenderView processId, routingId store.add obj exports.get = (id) -> @@ -70,5 +70,5 @@ exports.getAllWindows = () -> keys = windowsWeakMap.keys() windowsWeakMap.get key for key in keys -exports.remove = (process_id, routing_id, storeId) -> - ObjectsStore.forRenderView(process_id, routing_id).remove storeId +exports.remove = (processId, routingId, storeId) -> + ObjectsStore.forRenderView(processId, routingId).remove storeId diff --git a/browser/atom/rpc_server.coffee b/browser/atom/rpc_server.coffee index d4da3e9..69fdfa9 100644 --- a/browser/atom/rpc_server.coffee +++ b/browser/atom/rpc_server.coffee @@ -5,21 +5,21 @@ objectsRegistry = require './objects_registry.js' # Convert a real value into a POD structure which carries information of this # value. class Meta - constructor: (process_id, routing_id, value) -> + constructor: (processId, routingId, value) -> @type = typeof value @type = 'value' if value is null @type = 'array' if Array.isArray value if @type is 'array' @members = [] - @members.push new Meta(process_id, routing_id, el) for el in value + @members.push new Meta(processId, routingId, el) for el in value else if @type is 'object' or @type is 'function' @name = value.constructor.name # Reference the original value if it's an object, because when it's # passed to renderer we would assume the renderer keeps a reference of # it. - @storeId = objectsRegistry.add process_id, routing_id, value + @storeId = objectsRegistry.add processId, routingId, value @id = value.id @members = [] @@ -28,68 +28,68 @@ class Meta @type = 'value' @value = value -ipc.on 'ATOM_INTERNAL_REQUIRE', (event, process_id, routing_id, module) -> +ipc.on 'ATOM_INTERNAL_REQUIRE', (event, processId, routingId, module) -> try - event.result = new Meta(process_id, routing_id, require(module)) + event.result = new Meta(processId, routingId, require(module)) catch e event.result = type: 'error', value: e.message -ipc.on 'ATOM_INTERNAL_CURRENT_WINDOW', (event, process_id, routing_id) -> +ipc.on 'ATOM_INTERNAL_CURRENT_WINDOW', (event, processId, routingId) -> try windows = objectsRegistry.getAllWindows() for window in windows - break if window.getProcessID() == process_id and - window.getRoutingID() == routing_id - event.result = new Meta(process_id, routing_id, window) + break if window.getProcessID() == processId and + window.getRoutingID() == routingId + event.result = new Meta(processId, routingId, window) catch e event.result = type: 'error', value: e.message -ipc.on 'ATOM_INTERNAL_CONSTRUCTOR', (event, process_id, routing_id, id, args) -> +ipc.on 'ATOM_INTERNAL_CONSTRUCTOR', (event, processId, routingId, id, args) -> try constructor = objectsRegistry.get id # Call new with array of arguments. # http://stackoverflow.com/questions/1606797/use-of-apply-with-new-operator-is-this-possible obj = new (Function::bind.apply(constructor, [null].concat(args))) - event.result = new Meta(process_id, routing_id, obj) + event.result = new Meta(processId, routingId, obj) catch e event.result = type: 'error', value: e.message -ipc.on 'ATOM_INTERNAL_FUNCTION_CALL', (event, process_id, routing_id, id, args) -> +ipc.on 'ATOM_INTERNAL_FUNCTION_CALL', (event, processId, routingId, id, args) -> try func = objectsRegistry.get id ret = func.apply global, args - event.result = new Meta(process_id, routing_id, ret) + event.result = new Meta(processId, routingId, ret) catch e event.result = type: 'error', value: e.message -ipc.on 'ATOM_INTERNAL_MEMBER_CALL', (event, process_id, routing_id, id, method, args) -> +ipc.on 'ATOM_INTERNAL_MEMBER_CALL', (event, processId, routingId, id, method, args) -> try obj = objectsRegistry.get id ret = obj[method].apply(obj, args) - event.result = new Meta(process_id, routing_id, ret) + event.result = new Meta(processId, routingId, ret) catch e event.result = type: 'error', value: e.message -ipc.on 'ATOM_INTERNAL_MEMBER_SET', (event, process_id, routing_id, id, name, value) -> +ipc.on 'ATOM_INTERNAL_MEMBER_SET', (event, processId, routingId, id, name, value) -> try obj = objectsRegistry.get id obj[name] = value catch e event.result = type: 'error', value: e.message -ipc.on 'ATOM_INTERNAL_MEMBER_GET', (event, process_id, routing_id, id, name) -> +ipc.on 'ATOM_INTERNAL_MEMBER_GET', (event, processId, routingId, id, name) -> try obj = objectsRegistry.get id - event.result = new Meta(process_id, routing_id, obj[name]) + event.result = new Meta(processId, routingId, obj[name]) catch e event.result = type: 'error', value: e.message -ipc.on 'ATOM_INTERNAL_REFERENCE', (event, process_id, routing_id, id) -> +ipc.on 'ATOM_INTERNAL_REFERENCE', (event, processId, routingId, id) -> try obj = objectsRegistry.get id - event.result = new Meta(process_id, routing_id, obj) + event.result = new Meta(processId, routingId, obj) catch e event.result = type: 'error', value: e.message -ipc.on 'ATOM_INTERNAL_DEREFERENCE', (process_id, routing_id, storeId) -> - objectsRegistry.remove process_id, routing_id, storeId +ipc.on 'ATOM_INTERNAL_DEREFERENCE', (processId, routingId, storeId) -> + objectsRegistry.remove processId, routingId, storeId diff --git a/common/api/atom_bindings.cc b/common/api/atom_bindings.cc index bbaf0e5..6bc85b4 100644 --- a/common/api/atom_bindings.cc +++ b/common/api/atom_bindings.cc @@ -21,7 +21,7 @@ AtomBindings::~AtomBindings() { void AtomBindings::BindTo(v8::Handle process) { v8::HandleScope scope; - node::SetMethod(process, "atom_binding", Binding); + node::SetMethod(process, "atomBinding", Binding); } // static @@ -42,7 +42,7 @@ v8::Handle AtomBindings::Binding(const v8::Arguments& args) { // Cached in process.__atom_binding_cache. v8::Local binding_cache; - v8::Local bc_name = v8::String::New("__atom_binding_cache"); + v8::Local bc_name = v8::String::New("__atomBindingCache"); if (process->Has(bc_name)) { binding_cache = process->Get(bc_name)->ToObject(); DCHECK(!binding_cache.IsEmpty()); diff --git a/common/api/lib/id_weak_map.coffee b/common/api/lib/id_weak_map.coffee index 4860a3e..794573b 100644 --- a/common/api/lib/id_weak_map.coffee +++ b/common/api/lib/id_weak_map.coffee @@ -1,3 +1,3 @@ -IDWeakMap = process.atom_binding('id_weak_map').IDWeakMap +IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap module.exports = IDWeakMap diff --git a/renderer/api/lib/ipc.coffee b/renderer/api/lib/ipc.coffee index 0592940..2ef1290 100644 --- a/renderer/api/lib/ipc.coffee +++ b/renderer/api/lib/ipc.coffee @@ -1,5 +1,5 @@ EventEmitter = require('events').EventEmitter -ipc = process.atom_binding('ipc') +ipc = process.atomBinding('ipc') class Ipc extends EventEmitter constructor: -> diff --git a/renderer/api/lib/remote.coffee b/renderer/api/lib/remote.coffee index bee625d..5f0d075 100644 --- a/renderer/api/lib/remote.coffee +++ b/renderer/api/lib/remote.coffee @@ -1,5 +1,5 @@ ipc = require 'ipc' -v8_util = process.atom_binding 'v8_util' +v8_util = process.atomBinding 'v8_util' # Transform the description of value into a value or delegate object. metaToValue = (meta) -> -- 2.7.4