diff options
author | Ananya Sen | 2012-05-23 13:40:56 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-23 13:40:56 -0700 |
commit | 26d4cbf0f5c65f60051273f1648a0e8005d8c78a (patch) | |
tree | 416de824a695bc5ce91da61bf3856e6274afbf88 | |
parent | ae9f289ab9c6fd17ae88fd272dfaa7beabcd649b (diff) | |
download | ninja-26d4cbf0f5c65f60051273f1648a0e8005d8c78a.tar.gz |
- removed redundant change
- fixed js error on click of splitters when no documents are open
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 4 | ||||
-rwxr-xr-x | js/panels/Splitter.js | 2 |
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 | } |