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 /js/stage/stage-deps.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 'js/stage/stage-deps.js')
-rwxr-xr-x | js/stage/stage-deps.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 33ba2359..1825eb06 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js | |||
@@ -95,12 +95,6 @@ exports.StageDeps = Montage.create(Component, { | |||
95 | handleAppLoaded: { | 95 | handleAppLoaded: { |
96 | value: function() { | 96 | value: function() { |
97 | 97 | ||
98 | Object.defineBinding(this, "currentDocument", { | ||
99 | boundObject: this.application.ninja, | ||
100 | boundObjectPropertyPath: "currentDocument", | ||
101 | oneway: true | ||
102 | }); | ||
103 | |||
104 | Object.defineBinding(this, "userContentLeft", { | 98 | Object.defineBinding(this, "userContentLeft", { |
105 | boundObject: this.stage, | 99 | boundObject: this.stage, |
106 | boundObjectPropertyPath: "_userContentLeft", | 100 | boundObjectPropertyPath: "_userContentLeft", |