diff options
author | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
commit | 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch) | |
tree | 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /node_modules/montage/core/event/binding.js | |
parent | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/core/event/binding.js')
-rwxr-xr-x | node_modules/montage/core/event/binding.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/node_modules/montage/core/event/binding.js b/node_modules/montage/core/event/binding.js index 7a15e5b9..f061e89a 100755 --- a/node_modules/montage/core/event/binding.js +++ b/node_modules/montage/core/event/binding.js | |||
@@ -505,8 +505,6 @@ var PropertyChangeBindingListener = exports.PropertyChangeBindingListener = Obje | |||
505 | localPrevValue = event.minus, | 505 | localPrevValue = event.minus, |
506 | localTarget = event.target, | 506 | localTarget = event.target, |
507 | type = event.type, | 507 | type = event.type, |
508 | changeType = event.propertyChange, | ||
509 | localPropertyName = event.propertyName, | ||
510 | boundObjectValue, | 508 | boundObjectValue, |
511 | sourceObjectValue, | 509 | sourceObjectValue, |
512 | dotIndex, | 510 | dotIndex, |
@@ -676,8 +674,6 @@ var PropertyChangeBindingListener = exports.PropertyChangeBindingListener = Obje | |||
676 | localPrevValue = null; | 674 | localPrevValue = null; |
677 | localTarget = null; | 675 | localTarget = null; |
678 | type = null; | 676 | type = null; |
679 | changeType = null; | ||
680 | localPropertyName = null; | ||
681 | dotIndex = null; | 677 | dotIndex = null; |
682 | nextPathComponent = null; | 678 | nextPathComponent = null; |
683 | atSignIndex = null; | 679 | atSignIndex = null; |