diff options
author | Armen Kesablyan | 2012-06-01 13:13:21 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-01 13:13:21 -0700 |
commit | 10d97af27fca224752ad04551ca5c41982222d1f (patch) | |
tree | 27d2899cca3a9f28a0b6e222d39436d83009fafc /js/document/views/design.js | |
parent | 9e187e40d9982654081e52be656e00b3ca4d36b5 (diff) | |
parent | 77677e5ffb08a5dec4bf0be279130d7b1a99d03f (diff) | |
download | ninja-10d97af27fca224752ad04551ca5c41982222d1f.tar.gz |
Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding
Diffstat (limited to 'js/document/views/design.js')
-rwxr-xr-x | js/document/views/design.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/document/views/design.js b/js/document/views/design.js index c7313708..947ad196 100755 --- a/js/document/views/design.js +++ b/js/document/views/design.js | |||
@@ -395,11 +395,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { | |||
395 | initMontage: { | 395 | initMontage: { |
396 | value: function (scripttags) { | 396 | value: function (scripttags) { |
397 | // | 397 | // |
398 | //debugger; | ||
398 | this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () { | 399 | this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () { |
399 | //Initializing template with user's seriliazation | 400 | //Initializing template with user's seriliazation |
400 | var template = this.iframe.contentWindow.mjsTemplate.create(); | 401 | var template = this.iframe.contentWindow.mjsTemplate.create(); |
402 | |||
401 | template.initWithDocument(this.iframe.contentWindow.document); | 403 | template.initWithDocument(this.iframe.contentWindow.document); |
402 | template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (e){/*Nothing just a required extra parameter*/}); | 404 | template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (e){ |
405 | this.model.objects = template.deserializer.getObjectsFromLastDeserialization(); | ||
406 | }.bind(this)); | ||
403 | }.bind(this), false); | 407 | }.bind(this), false); |
404 | } | 408 | } |
405 | }, | 409 | }, |