diff options
author | Valerio Virgillito | 2012-05-22 14:47:17 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-22 14:47:17 -0700 |
commit | b3e85f609f704d668c8022c53418f8056bc71260 (patch) | |
tree | 122197204fff1b8adccfc089d6e6869e8c310550 /js/document/models | |
parent | 9b6da637d9654727426c6d78f17e3804bbd84ce5 (diff) | |
parent | c5dad8ddc94b2e1c80565dfee072bda88e8880da (diff) | |
download | ninja-b3e85f609f704d668c8022c53418f8056bc71260.tar.gz |
Merge pull request #250 from joseeight/Document
Montage components mapping & External data webGL support
Diffstat (limited to 'js/document/models')
-rwxr-xr-x | js/document/models/base.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/document/models/base.js b/js/document/models/base.js index c99e36c7..6d9d2e89 100755 --- a/js/document/models/base.js +++ b/js/document/models/base.js | |||
@@ -100,7 +100,7 @@ exports.BaseDocumentModel = Montage.create(Component, { | |||
100 | } | 100 | } |
101 | break; | 101 | break; |
102 | default: | 102 | default: |
103 | if (this.template.type === 'banner' || this.template.type === 'animation') { | 103 | if (this.template && (this.template.type === 'banner' || this.template.type === 'animation')) { |
104 | window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url); | 104 | window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url); |
105 | } else { | 105 | } else { |
106 | window.open(this.url); | 106 | window.open(this.url); |