diff options
author | hwc487 | 2012-03-12 14:46:32 -0700 |
---|---|---|
committer | hwc487 | 2012-03-12 14:46:32 -0700 |
commit | ef2dd5dfc557154d4755914f73963da8e858c4f1 (patch) | |
tree | b2b3e7c5b948f210b9fcc5d3dbd39ae9752938f8 /js/document | |
parent | 124c1e0e4bf7a0523e641ee37352128690f15c28 (diff) | |
parent | e50077ad43f18f16de106ff6547520f73746932e (diff) | |
download | ninja-ef2dd5dfc557154d4755914f73963da8e858c4f1.tar.gz |
Merge branch 'integration' of github.com:ericmueller/ninja-internal into integration
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 79450494..051490f5 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -871,8 +871,12 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
871 | value: function () { | 871 | value: function () { |
872 | //TODO: Add logic to handle save before preview | 872 | //TODO: Add logic to handle save before preview |
873 | this.application.ninja.documentController.handleExecuteSaveAll(null); | 873 | this.application.ninja.documentController.handleExecuteSaveAll(null); |
874 | //Launching 'blank' tab for testing movie | 874 | //Temp check for webGL Hack |
875 | window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]); | 875 | if (this.application.ninja.documentController.activeDocument.glData.length && this.application.ninja.documentController.activeDocument.glData.length > 0) { |
876 | setTimeout(function () {window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);}.bind(this), 3500); | ||
877 | } else { | ||
878 | window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]); | ||
879 | } | ||
876 | //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]}); | 880 | //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]}); |
877 | } | 881 | } |
878 | }, | 882 | }, |