Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/node_modules/montage/core/event/binding.js b/node_modules/montage/core/event/binding.js
index f061e89a..21b40609 100755
--- a/node_modules/montage/core/event/binding.js
+++ b/node_modules/montage/core/event/binding.js
@@ -19,7 +19,9 @@ var Montage = require("montage").Montage,
     Serializer = require("core/serializer").Serializer,
     Deserializer = require("core/deserializer").Deserializer,
     defaultEventManager = require("core/event/event-manager").defaultEventManager,
-    AT_TARGET = 2;
+    AT_TARGET = 2,
+    UNDERSCORE = "_";
+
 
 /**
     @member external:Array#dispatchChangeEvent
@@ -918,7 +920,7 @@ Object.defineProperty(Object.prototype, "addEventListener", {
                                     if ("value" in currentPropertyDescriptor) {
 
                                         //Create internal storage:
-                                        Object.defineProperty(currentObject, (internalStorageProperty = "_" + key), {
+                                        Object.defineProperty(currentObject, (internalStorageProperty = UNDERSCORE + key), {
                                             value: currentObject.getProperty(key),
                                             configurable: true,
                                             writable: true
@@ -1009,7 +1011,7 @@ Object.defineProperty(Object.prototype, "addEventListener", {
                                 //TODO this is all duplicated from above, clean it up
 
                                 //Create internal storage:
-                                Object.defineProperty(currentObject, (internalStorageProperty = "_" + key), {
+                                Object.defineProperty(currentObject, (internalStorageProperty = UNDERSCORE + key), {
                                     value: currentObject.getProperty(key),
                                     configurable: true,
                                     writable: true