diff options
| author | Eric Guzman | 2012-05-22 15:57:23 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-22 15:57:23 -0700 |
| commit | ad3b4595d7377e5bf75bcb8ad81007859b0a8a02 (patch) | |
| tree | ecb7fe289824a625b1dc422a97c2236826081ec3 /js/document/models/base.js | |
| parent | 0eb95ff2dbba1fe7213eed2e0140b4d07bda3dd5 (diff) | |
| parent | 2b207ef8b2594927f8cd6cd63a8483d205cb86c4 (diff) | |
| download | ninja-ad3b4595d7377e5bf75bcb8ad81007859b0a8a02.tar.gz | |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/document/models/base.js')
| -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); |