diff options
| author | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
| commit | 3f5aa43b5b545cd551c5585ef5f2d478c2d49cad (patch) | |
| tree | fe5beec45a8d7f45a90659e95c4f13a679ae35d5 /js/mediators | |
| parent | 5c4ff40d7950282a179dcfd49c5ea9234e0a8185 (diff) | |
| parent | fcb6309915161d16a74a4385b905742f35b7d62d (diff) | |
| download | ninja-3f5aa43b5b545cd551c5585ef5f2d478c2d49cad.tar.gz | |
Merge branch 'refs/heads/master' into montage-v11-integration
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/mediators')
| -rwxr-xr-x | js/mediators/element-mediator.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index 611cf214..017ed20a 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
| @@ -13,7 +13,6 @@ var ElementController = require("js/controllers/elements/element-controller").El | |||
| 13 | 13 | ||
| 14 | exports.ElementMediator = Montage.create(Component, { | 14 | exports.ElementMediator = Montage.create(Component, { |
| 15 | 15 | ||
| 16 | |||
| 17 | addDelegate: { | 16 | addDelegate: { |
| 18 | enumerable: false, | 17 | enumerable: false, |
| 19 | value: null | 18 | value: null |