diff options
author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/document/document-html.js | |
parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-x | js/document/document-html.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index b9c8e797..56f4e3d3 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -106,7 +106,8 @@ exports.HtmlDocument = Montage.create(Component, { | |||
106 | } | 106 | } |
107 | }, | 107 | }, |
108 | handleViewReady: { | 108 | handleViewReady: { |
109 | value: function() { | 109 | value: function(mObjects) { |
110 | this.model.mObjects = mObjects; | ||
110 | // TODO: Find a better way to initialize this property | 111 | // TODO: Find a better way to initialize this property |
111 | // Assign the domContainer to be the document root on open | 112 | // Assign the domContainer to be the document root on open |
112 | if(typeof this.model.domContainer !== "undefined") { | 113 | if(typeof this.model.domContainer !== "undefined") { |