Merge branch 'refs/heads/ninja-internal' into MaterialsUI

4 files changed, 23 insertions, 13 deletions

diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index f43b1a2c..015a50ff 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.js
@@ -220,14 +220,6 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
                         linktags = template.file.content.document.getElementsByTagName('link'),
                         njtemplatetags = template.file.content.document.querySelectorAll('[data-ninja-template]');
                 
-                //////////////////////////////////////////////////
-                //TODO: Remove, temp hack, this is to be fixed by Montage
-                var basetags = template.file.content.document.getElementsByTagName('base');
-                for (var g in basetags) {
-                        if (basetags[g].getAttribute && basetags[g].href && basetags[g].href.indexOf('chrome-extension://') !== -1) toremovetags.push(basetags[g]);
-                }
-                //////////////////////////////////////////////////
-                
                 //Adding to tags to be removed form template
                 for (var f in njtemplatetags) {
                         if (njtemplatetags[f].getAttribute) toremovetags.push(njtemplatetags[f]);
@@ -284,8 +276,6 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             
             
             
-            
-            
             //TODO: Make proper CSS method
             
             
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 626dc0bc..037c1197 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -18,9 +18,11 @@
         
         <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
                 * {
+                -webkit-animation: none !important;
                         -webkit-transition-duration: 0s !important;
                         -webkit-animation-duration: 0s !important;
                         -webkit-animation-name: none !important;
+                -webkit-animation-fill-mode: none !important;
                         }
                         
                         body {
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 8fc0d82f..ef68a3c0 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -21,9 +21,11 @@
         
         <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
                 * {
+                -webkit-animation: none !important;
                         -webkit-transition-duration: 0s !important;
                         -webkit-animation-duration: 0s !important;
                         -webkit-animation-name: none !important;
+                -webkit-animation-fill-mode: none !important;
                         }
                         
                         body {
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 5c7ba4fc..f8020f2b 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -285,7 +285,8 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 userStyles,
                 stags = this.document.getElementsByTagName('style'),
                 ltags = this.document.getElementsByTagName('link'), i, orgNodes,
-                scripttags = this.document.getElementsByTagName('script');
+                scripttags = this.document.getElementsByTagName('script'),
+                videotags = this.document.getElementsByTagName('video');
                 //Temporarily checking for disabled special case (we must enabled for Ninja to access styles)
                 this.ninjaDisableAttribute(stags);
                 this.ninjaDisableAttribute(ltags);
@@ -308,10 +309,25 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                                         }
                                 }
                         }
-
+                        //Checking for video tags
+                        if (videotags.length > 0) {
+                                //Looping through all video tags
+                                for (i = 0; i < videotags.length; i++) {
+                                        //Stopping all videos from playing on open
+                    videotags[i].addEventListener('canplay', function(e) {
+                        //TODO: Figure out why the video must be seeked to the end before pausing
+                        var time = Math.ceil(this.duration);
+                        //Trying to display the last frame (doing minus 2 seconds if long video)
+                        if (time > 2) this.currentTime = time - 2;
+                        else if (time > 1) this.currentTime = time - 1;
+                        else this.currentTime = time || 0;
+                        //Pauing video
+                        this.pause();
+                    }, false);
+                                }
+                        }
             // Assign the modelGenerator reference from the template to our own modelGenerator
             this.document.modelGenerator = ElementModel.modelGenerator;
-
                 //Checking for script tags then parsing check for montage and webgl
             if (scripttags.length > 0) {
                 //Checking and initializing webGL