diff options
author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/montage/ui/substitution.reel/substitution.js | |
parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/substitution.reel/substitution.js')
-rwxr-xr-x | node_modules/montage/ui/substitution.reel/substitution.js | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/node_modules/montage/ui/substitution.reel/substitution.js b/node_modules/montage/ui/substitution.reel/substitution.js index ad4034c1..bf3ddcaa 100755 --- a/node_modules/montage/ui/substitution.reel/substitution.js +++ b/node_modules/montage/ui/substitution.reel/substitution.js | |||
@@ -73,19 +73,5 @@ exports.Substitution = Montage.create(Slot, /** @lends module:"montage/ui/substi | |||
73 | transition: { | 73 | transition: { |
74 | enumerable: false, | 74 | enumerable: false, |
75 | value: null | 75 | value: null |
76 | }, | ||
77 | /** | ||
78 | Description TODO | ||
79 | @function | ||
80 | */ | ||
81 | prepareForDraw: { | ||
82 | enumerable: false, | ||
83 | value: function() { | ||
84 | |||
85 | if (this.switchComponents) { | ||
86 | this.content = this.switchComponents[this.switchValue]; | ||
87 | } | ||
88 | } | ||
89 | } | 76 | } |
90 | |||
91 | }); | 77 | }); |