aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-13 16:57:52 -0800
committerJose Antonio Marquez2012-02-13 16:57:52 -0800
commit79f7727ed077d054d791337d822c8e2259925084 (patch)
treef409fe261193dca124273b6ab1f6e9c06d3b3fe3 /js/controllers
parent5b55cfe0bc333a9a18be6329fdc21b5a6652a15a (diff)
parentf3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (diff)
downloadninja-79f7727ed077d054d791337d822c8e2259925084.tar.gz
Merge branch 'refs/heads/AnanyaFileIO' into FileIO
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 9f9e4757..b80dfe56 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -259,6 +259,9 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
259 nextDocumentIndex = closeDocumentIndex - 1; 259 nextDocumentIndex = closeDocumentIndex - 1;
260 } 260 }
261 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); 261 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
262 }else{
263 //if there are no documents to switch to then just show the iframeContainer
264 document.getElementById("iframeContainer").style.display="block";
262 } 265 }
263 } 266 }
264 }, 267 },