From e11bd9b98a718c9d69df24401629d93d21c87851 Mon Sep 17 00:00:00 2001
From: jonobr1 <jonobrandel@gmail.com>
Date: Fri, 28 Jan 2011 19:55:43 -0700
Subject: [PATCH] Merged in mr doobs changes for watchers and changed setName
 to name

---
 controllers/controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/controller.js b/controllers/controller.js
index ab9ae44..92c770f 100644
--- a/controllers/controller.js
+++ b/controllers/controller.js
@@ -4,7 +4,7 @@ var Controller = function() {
 
 	this.parent = null;
 
-	this.setName = function(n) {
+	this.name = function(n) {
 	    this.propertyNameElement.innerHTML = n;
 	    return this;
 	}
@@ -57,7 +57,7 @@ var Controller = function() {
 
 	this.propertyNameElement = document.createElement('span');
 	this.propertyNameElement.setAttribute('class', 'guidat-propertyname');
-	this.setName(this.propertyName);
+	this.name(this.propertyName);
 	this.domElement.appendChild(this.propertyNameElement);
 
 	this.makeUnselectable(this.domElement);