aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjs/helper-classes/3D/view-utils.js4
-rwxr-xr-xjs/panels/Splitter.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 0a4fe0ac..0080bf90 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -1005,9 +1005,9 @@ exports.ViewUtils = Montage.create(Component, {
1005 this.popViewportObj(); 1005 this.popViewportObj();
1006 1006
1007 if (elt === this.application.ninja.currentDocument.documentRoot) break; 1007 if (elt === this.application.ninja.currentDocument.documentRoot) break;
1008 if (this.application.ninja.currentDocument.documentRoot && elt === this.application.ninja.currentDocument.documentRoot.parentNode) break; 1008 if (elt === this.application.ninja.currentDocument.documentRoot.parentNode) break;
1009 elt = elt.offsetParent; 1009 elt = elt.offsetParent;
1010 if (this.application.ninja.currentDocument.documentRoot && elt === this.application.ninja.currentDocument.documentRoot.parentNode) break; 1010 if (elt === this.application.ninja.currentDocument.documentRoot.parentNode) break;
1011 } 1011 }
1012 1012
1013 return mat; 1013 return mat;
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 8675d314..f0fb1a45 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -111,7 +111,7 @@ exports.Splitter = Montage.create(Component, {
111 } else { 111 } else {
112 this.panel.removeEventListener("webkitTransitionEnd", this, false); 112 this.panel.removeEventListener("webkitTransitionEnd", this, false);
113 } 113 }
114 if(this.application.ninja.currentDocument.currentView === "design"){ 114 if(this.application.ninja.currentDocument && this.application.ninja.currentDocument.currentView === "design"){
115 this.application.ninja.stage.resizeCanvases = true; 115 this.application.ninja.stage.resizeCanvases = true;
116 } 116 }
117 } 117 }