diff options
author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
tree | 762d98ba8852b858c03760f4b9bef294fae6486c /node_modules/montage/core/event/binding.js | |
parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz |
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>
Diffstat (limited to 'node_modules/montage/core/event/binding.js')
-rwxr-xr-x | node_modules/montage/core/event/binding.js | 8 |
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, | |||
19 | Serializer = require("core/serializer").Serializer, | 19 | Serializer = require("core/serializer").Serializer, |
20 | Deserializer = require("core/deserializer").Deserializer, | 20 | Deserializer = require("core/deserializer").Deserializer, |
21 | defaultEventManager = require("core/event/event-manager").defaultEventManager, | 21 | defaultEventManager = require("core/event/event-manager").defaultEventManager, |
22 | AT_TARGET = 2; | 22 | AT_TARGET = 2, |
23 | UNDERSCORE = "_"; | ||
24 | |||
23 | 25 | ||
24 | /** | 26 | /** |
25 | @member external:Array#dispatchChangeEvent | 27 | @member external:Array#dispatchChangeEvent |
@@ -918,7 +920,7 @@ Object.defineProperty(Object.prototype, "addEventListener", { | |||
918 | if ("value" in currentPropertyDescriptor) { | 920 | if ("value" in currentPropertyDescriptor) { |
919 | 921 | ||
920 | //Create internal storage: | 922 | //Create internal storage: |
921 | Object.defineProperty(currentObject, (internalStorageProperty = "_" + key), { | 923 | Object.defineProperty(currentObject, (internalStorageProperty = UNDERSCORE + key), { |
922 | value: currentObject.getProperty(key), | 924 | value: currentObject.getProperty(key), |
923 | configurable: true, | 925 | configurable: true, |
924 | writable: true | 926 | writable: true |
@@ -1009,7 +1011,7 @@ Object.defineProperty(Object.prototype, "addEventListener", { | |||
1009 | //TODO this is all duplicated from above, clean it up | 1011 | //TODO this is all duplicated from above, clean it up |
1010 | 1012 | ||
1011 | //Create internal storage: | 1013 | //Create internal storage: |
1012 | Object.defineProperty(currentObject, (internalStorageProperty = "_" + key), { | 1014 | Object.defineProperty(currentObject, (internalStorageProperty = UNDERSCORE + key), { |
1013 | value: currentObject.getProperty(key), | 1015 | value: currentObject.getProperty(key), |
1014 | configurable: true, | 1016 | configurable: true, |
1015 | writable: true | 1017 | writable: true |