diff options
Diffstat (limited to 'js')
-rwxr-xr-x | js/controllers/document-controller.js | 9 | ||||
-rwxr-xr-x | js/document/html-document.js | 97 | ||||
-rwxr-xr-x | js/helper-classes/3D/draw-utils.js | 10 | ||||
-rw-r--r-- | js/mediators/io-mediator.js | 8 | ||||
-rwxr-xr-x | js/panels/Panel.reel/Panel.html | 20 | ||||
-rwxr-xr-x | js/panels/Panel.reel/Panel.js | 4 | ||||
-rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.js | 77 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 26 |
8 files changed, 208 insertions, 43 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 194496a6..a8056519 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -336,14 +336,23 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
336 | nextDocumentIndex = closeDocumentIndex - 1; | 336 | nextDocumentIndex = closeDocumentIndex - 1; |
337 | } | 337 | } |
338 | this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); | 338 | this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); |
339 | if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();} | ||
339 | this._removeDocumentView(doc.container); | 340 | this._removeDocumentView(doc.container); |
340 | }else if(this._documents.length === 0){ | 341 | }else if(this._documents.length === 0){ |
342 | if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){ | ||
343 | this.activeDocument.pauseAndStopVideos(); | ||
344 | } | ||
341 | this.activeDocument = null; | 345 | this.activeDocument = null; |
342 | this._removeDocumentView(doc.container); | 346 | this._removeDocumentView(doc.container); |
343 | this.application.ninja.stage.stageView.hideRulers(); | 347 | this.application.ninja.stage.stageView.hideRulers(); |
344 | document.getElementById("iframeContainer").style.display="block"; | 348 | document.getElementById("iframeContainer").style.display="block"; |
345 | 349 | ||
346 | this.application.ninja.stage.hideCanvas(true); | 350 | this.application.ninja.stage.hideCanvas(true); |
351 | }else{//closing inactive document tab - just clear DOM | ||
352 | if(typeof doc.pauseAndStopVideos !== "undefined"){ | ||
353 | doc.pauseAndStopVideos(); | ||
354 | } | ||
355 | this._removeDocumentView(doc.container); | ||
347 | } | 356 | } |
348 | 357 | ||
349 | NJevent("closeDocument", doc.uri); | 358 | NJevent("closeDocument", doc.uri); |
diff --git a/js/document/html-document.js b/js/document/html-document.js index 80930af2..23b55e92 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -437,8 +437,8 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
437 | } else if (prop.indexOf('url') !== -1) { //From CSS property | 437 | } else if (prop.indexOf('url') !== -1) { //From CSS property |
438 | //TODO: Add functionality | 438 | //TODO: Add functionality |
439 | var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/')); | 439 | var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/')); |
440 | prop = prop.replace(/[^()\\""\\'']+/g, test); | 440 | prop = prop.replace(/[^()\\""\\'']+/g, cssUrlToNinjaUrl); |
441 | function test (s) { | 441 | function cssUrlToNinjaUrl (s) { |
442 | if (s !== 'url') { | 442 | if (s !== 'url') { |
443 | s = docRootUrl + s; | 443 | s = docRootUrl + s; |
444 | } | 444 | } |
@@ -451,9 +451,12 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
451 | // | 451 | // |
452 | function ninjaUrlPrepend (url) { | 452 | function ninjaUrlPrepend (url) { |
453 | var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/')); | 453 | var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/')); |
454 | return '"'+docRootUrl+url.replace(/\"/gi, '')+'"'; | 454 | if (url.indexOf('data:image') !== -1) { |
455 | return url; | ||
456 | } else { | ||
457 | return '"'+docRootUrl+url.replace(/\"/gi, '')+'"'; | ||
458 | } | ||
455 | } | 459 | } |
456 | |||
457 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// | 460 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
458 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// | 461 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
459 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// | 462 | //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
@@ -570,8 +573,22 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
570 | } | 573 | } |
571 | // | 574 | // |
572 | fileCouldDirUrl = this._document.styleSheets[i].href.split(this._document.styleSheets[i].href.split('/')[this._document.styleSheets[i].href.split('/').length-1])[0]; | 575 | fileCouldDirUrl = this._document.styleSheets[i].href.split(this._document.styleSheets[i].href.split('/')[this._document.styleSheets[i].href.split('/').length-1])[0]; |
573 | prefixUrl = 'url('+fileCouldDirUrl; //This should be re-written with better RegEx | 576 | |
574 | tag.innerHTML = cssData.content.replace(/url\(/gi, prefixUrl); | 577 | tag.innerHTML = cssData.content.replace(/url\(()(.+?)\1\)/g, detectUrl); |
578 | |||
579 | function detectUrl (prop) { | ||
580 | return prop.replace(/[^()\\""\\'']+/g, prefixUrl);; | ||
581 | } | ||
582 | |||
583 | function prefixUrl (url) { | ||
584 | if (url !== 'url') { | ||
585 | if (!url.match(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi)) { | ||
586 | url = fileCouldDirUrl+url; | ||
587 | } | ||
588 | } | ||
589 | return url; | ||
590 | } | ||
591 | |||
575 | //Looping through DOM to insert style tag at location of link element | 592 | //Looping through DOM to insert style tag at location of link element |
576 | query = this._templateDocument.html.querySelectorAll(['link']); | 593 | query = this._templateDocument.html.querySelectorAll(['link']); |
577 | for (var j in query) { | 594 | for (var j in query) { |
@@ -600,12 +617,9 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
600 | } | 617 | } |
601 | } | 618 | } |
602 | } | 619 | } |
603 | |||
604 | |||
605 | |||
606 | |||
607 | /* | 620 | /* |
608 | //TODO: Figure out cross-domain XHR issue, might need cloud to handle | 621 | |
622 | //TODO: Figure out cross-domain XHR issue, might need cloud to handle | ||
609 | var xhr = new XMLHttpRequest(); | 623 | var xhr = new XMLHttpRequest(); |
610 | xhr.open("GET", this._document.styleSheets[i].href, true); | 624 | xhr.open("GET", this._document.styleSheets[i].href, true); |
611 | xhr.send(); | 625 | xhr.send(); |
@@ -613,20 +627,24 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
613 | if (xhr.readyState === 4) { | 627 | if (xhr.readyState === 4) { |
614 | console.log(xhr); | 628 | console.log(xhr); |
615 | } | 629 | } |
616 | */ | ||
617 | //tag.innerHTML = xhr.responseText //xhr.response; | 630 | //tag.innerHTML = xhr.responseText //xhr.response; |
618 | tag.innerHTML = 'noRULEjustHACK{background: #000}' | 631 | */ |
619 | //Currently no external styles will load if unable to load via XHR request | 632 | //Temp rule so it's registered in the array |
620 | 633 | tag.innerHTML = 'noRULEjustHACK{background: #000}'; | |
621 | //Disabling external style sheets | 634 | //Disabling external style sheets |
622 | query = this._templateDocument.html.querySelectorAll(['link']); | 635 | query = this._templateDocument.html.querySelectorAll(['link']); |
623 | for (var k in query) { | 636 | for (var k in query) { |
624 | if (query[k].href === this._document.styleSheets[i].href) { | 637 | if (query[k].href === this._document.styleSheets[i].href) { |
638 | |||
639 | //TODO: Removed the temp insertion of the stylesheet | ||
640 | //because it wasn't the proper way to do it | ||
641 | //need to be handled via XHR with proxy in Cloud Sim | ||
642 | |||
625 | //Disabling style sheet to reload via inserting in style tag | 643 | //Disabling style sheet to reload via inserting in style tag |
626 | var tempCSS = query[k].cloneNode(true); | 644 | //var tempCSS = query[k].cloneNode(true); |
627 | tempCSS.setAttribute('data-ninja-template', 'true'); | 645 | //tempCSS.setAttribute('data-ninja-template', 'true'); |
628 | query[k].setAttribute('disabled', 'true'); | 646 | query[k].setAttribute('disabled', 'true'); |
629 | this.iframe.contentWindow.document.head.appendChild(tempCSS); | 647 | //this.iframe.contentWindow.document.head.appendChild(tempCSS); |
630 | //Inserting tag | 648 | //Inserting tag |
631 | this._templateDocument.head.insertBefore(tag, query[k]); | 649 | this._templateDocument.head.insertBefore(tag, query[k]); |
632 | } | 650 | } |
@@ -824,6 +842,9 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
824 | this.undoStack = this.application.ninja.undocontroller.undoQueue.slice(0); | 842 | this.undoStack = this.application.ninja.undocontroller.undoQueue.slice(0); |
825 | this.redoStack = this.application.ninja.undocontroller.redoQueue.slice(0); | 843 | this.redoStack = this.application.ninja.undocontroller.redoQueue.slice(0); |
826 | this.application.ninja.undocontroller.clearHistory();//clear history to give the next document a fresh start | 844 | this.application.ninja.undocontroller.clearHistory();//clear history to give the next document a fresh start |
845 | |||
846 | //pause videos on switching or closing the document, so that the browser does not keep downloading the media data | ||
847 | this.pauseVideos(); | ||
827 | } | 848 | } |
828 | }, | 849 | }, |
829 | 850 | ||
@@ -852,6 +873,44 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
852 | 873 | ||
853 | 874 | ||
854 | } | 875 | } |
855 | } | 876 | }, |
856 | //////////////////////////////////////////////////////////////////// | 877 | //////////////////////////////////////////////////////////////////// |
878 | /** | ||
879 | *pause videos on switching or closing the document, so that the browser does not keep downloading the media data | ||
880 | */ | ||
881 | pauseVideos:{ | ||
882 | value:function(){ | ||
883 | var videosArr = this.documentRoot.getElementsByTagName("video"), i=0; | ||
884 | for(i=0;i<videosArr.length;i++){ | ||
885 | if(!videosArr[i].paused){ | ||
886 | videosArr[i].pause(); | ||
887 | } | ||
888 | } | ||
889 | } | ||
890 | }, | ||
891 | |||
892 | /** | ||
893 | * remove the video src on closing the document, so that the browser does not keep downloading the media data, if the tag does not get garbage collected | ||
894 | *removeSrc : boolean to remove the src if the video... set only in the close document flow | ||
895 | */ | ||
896 | stopVideos:{ | ||
897 | value:function(){ | ||
898 | var videosArr = this.documentRoot.getElementsByTagName("video"), i=0; | ||
899 | for |