diff options
author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /js/stage/stage-deps.js | |
parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
Diffstat (limited to 'js/stage/stage-deps.js')
-rwxr-xr-x | js/stage/stage-deps.js | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index a71b77be..1825eb06 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js | |||
@@ -52,7 +52,7 @@ exports.StageDeps = Montage.create(Component, { | |||
52 | userContentLeft: { | 52 | userContentLeft: { |
53 | get: function() { return this._userContentLeft; }, | 53 | get: function() { return this._userContentLeft; }, |
54 | set: function(value) { | 54 | set: function(value) { |
55 | if(value) { | 55 | if(value != null) { |
56 | viewUtils.setUserContentLeft(value); | 56 | viewUtils.setUserContentLeft(value); |
57 | } | 57 | } |
58 | } | 58 | } |
@@ -65,7 +65,7 @@ exports.StageDeps = Montage.create(Component, { | |||
65 | userContentTop: { | 65 | userContentTop: { |
66 | get: function() { return this._userContentTop; }, | 66 | get: function() { return this._userContentTop; }, |
67 | set: function(value) { | 67 | set: function(value) { |
68 | if(value) { | 68 | if(value != null) { |
69 | viewUtils.setUserContentTop(value); | 69 | viewUtils.setUserContentTop(value); |
70 | } | 70 | } |
71 | } | 71 | } |
@@ -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", |