From 509d916f32a8e249b80b931095e1278ef93e03f1 Mon Sep 17 00:00:00 2001 From: David Bushong Date: Thu, 26 Jan 2012 18:47:07 -0800 Subject: [PATCH 1/2] stop using js keyword "interface"; replace with "iface" * breaks YUI compressor when trying to produce minified JS from the dev dist --- src/synapse/hooks/jquery.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/synapse/hooks/jquery.coffee b/src/synapse/hooks/jquery.coffee index 1f34832..9832dcb 100644 --- a/src/synapse/hooks/jquery.coffee +++ b/src/synapse/hooks/jquery.coffee @@ -30,14 +30,14 @@ get: (object, name, args...) -> [name, key] = name.split '.' if key? then args = [key].concat(args) - if (interface = @registry[name]) - return interface.get.apply(object, args) + if (iface = @registry[name]) + return iface.get.apply(object, args) set: (object, name, args...) -> [name, key] = name.split '.' if key? then args = [key].concat(args) - if (interface = @registry[name]) - return interface.set.apply(object, args) + if (iface = @registry[name]) + return iface.set.apply(object, args) # ### Built-In interfaces # Each setter and getter for compound interfaces are defined up front @@ -271,8 +271,8 @@ detectInterface: (object) -> for item in elementInterfaces - [selector, interface] = item - if object.is(selector) then return interface + [selector, iface] = item + if object.is(selector) then return iface return 'text' detectOtherInterface: (object) -> From 6f26e45a58f991b494b180ae1f0d1b3e19467f10 Mon Sep 17 00:00:00 2001 From: David Bushong Date: Thu, 26 Jan 2012 18:52:20 -0800 Subject: [PATCH 2/2] same "interface" keyword fix as done to jquery.coffee --- src/synapse/hooks/backbone-model.coffee | 6 +++--- src/synapse/hooks/backbone-view.coffee | 12 ++++++------ src/synapse/hooks/zepto.coffee | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/synapse/hooks/backbone-model.coffee b/src/synapse/hooks/backbone-model.coffee index 12ce8e9..18e73ed 100644 --- a/src/synapse/hooks/backbone-model.coffee +++ b/src/synapse/hooks/backbone-model.coffee @@ -59,8 +59,8 @@ # the what the interface refers to. Interfaces in the context of # Backbone Models are simply data attributes. The interface is checked # to ensure it does not represent a method on the model instance. - detectEvent: (object, interface) -> - if interface and not object[interface] - return "change:#{interface}" + detectEvent: (object, iface) -> + if iface and not object[iface] + return "change:#{iface}" return 'change' } diff --git a/src/synapse/hooks/backbone-view.coffee b/src/synapse/hooks/backbone-view.coffee index 5baf202..2cf5eb0 100644 --- a/src/synapse/hooks/backbone-view.coffee +++ b/src/synapse/hooks/backbone-view.coffee @@ -35,14 +35,14 @@ get: (object, name, args...) -> [name, key] = name.split '.' if key? then args = [key].concat(args) - if (interface = @registry[name]) - return interface.get.apply(object, args) + if (iface = @registry[name]) + return iface.get.apply(object, args) set: (object, name, args...) -> [name, key] = name.split '.' if key? then args = [key].concat(args) - if (interface = @registry[name]) - return interface.set.apply(object, args) + if (iface = @registry[name]) + return iface.set.apply(object, args) # ### Built-In interfaces # Each setter and getter for compound interfaces are defined up front @@ -288,8 +288,8 @@ detectInterface: (object) -> el = object.$(object.el) for item in elementInterfaces - [selector, interface] = item - if el.is(selector) then return interface + [selector, iface] = item + if el.is(selector) then return iface return 'text' detectOtherInterface: (object) -> diff --git a/src/synapse/hooks/zepto.coffee b/src/synapse/hooks/zepto.coffee index 7ebd542..1030ef5 100644 --- a/src/synapse/hooks/zepto.coffee +++ b/src/synapse/hooks/zepto.coffee @@ -31,14 +31,14 @@ get: (object, name, args...) -> [name, key] = name.split '.' if key? then args = [key].concat(args) - if (interface = @registry[name]) - return interface.get.apply(object, args) + if (iface = @registry[name]) + return iface.get.apply(object, args) set: (object, name, args...) -> [name, key] = name.split '.' if key? then args = [key].concat(args) - if (interface = @registry[name]) - return interface.set.apply(object, args) + if (iface = @registry[name]) + return iface.set.apply(object, args) # ### Built-In interfaces # Each setter and getter for compound interfaces are defined up front @@ -273,8 +273,8 @@ detectInterface: (object) -> for item in elementInterfaces - [selector, interface] = item - if object.is(selector) then return interface + [selector, iface] = item + if object.is(selector) then return iface return 'text' detectOtherInterface: (object) ->