Merge branch 'refs/heads/NINJAmaster' into TimelineUber

5 files changed, 62 insertions, 18 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 478fc1db..6e363798 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -632,7 +632,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             if(!rule) {
                 ///// This should never be hit if providing cssText from existing rule (like those
                 ///// returned from getMatchedCSSRules()
-                console.warn('StylesController::_getRuleWithCSSText - No rule found with given cssText.');
+                //console.warn('StylesController::_getRuleWithCSSText - No rule found with given cssText.');
             }
 
             return rule;
@@ -646,16 +646,31 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     getMatchingRules : {          //TODO: Remove omitPseudos from here and usages
         value: function(element, omitPseudos, useStageStyleSheet) {
             var rules,
+                matchedRules,
                 mappedRules,
                 doc = element.ownerDocument,
                 win = doc.defaultView;
 
+            if(!element.parentNode) {
+                //console.warn('StylesController::getMatchingRules - Un-attached element queried');
+                return [];
+            }
+
             try {
-                mappedRules = nj.toArray(win.getMatchedCSSRules(element)).map(function(rule) {
+                matchedRules = win.getMatchedCSSRules(element);
+
+                if(!matchedRules) {
+                    //console.warn('StylesController::getMatchingRules - matched rules are null');
+                    return [];
+                }
+
+                mappedRules = nj.toArray(matchedRules).map(function(rule) {
                     return this._getRuleWithCSSText(rule.cssText, doc);
                 }, this);
 
                 rules = mappedRules.filter(function(rule) {
+                    if(!rule) { return false; }
+
                     //// useStageStyleSheet flag indicates whether to only return rules from the stylesheet,
                     //// or only use rules for other stylesheets
 
@@ -676,7 +691,8 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 }, this);
 
             } catch(ERROR) {
-                console.warn('StylesController::getMatchingRules - Un-attached element queried.');
+                //console.warn('StylesController::getMatchingRules - getMatchedCSSRules Exception.');
+                return [];
             }
             ///// Function for sorting by specificity values
             function sorter(ruleA, ruleB) {
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/views/design.js b/js/document/views/design.js
index 6a60e1f9..b7c50a7c 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
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index 31918f92..80e6150d 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -86,11 +86,15 @@ exports.TagTool = Montage.create(DrawingTool, {
             // Create the element
             if(this.options.selectedElement === "custom") {
                 element = document.application.njUtils.make(this.options.customName.value, null, this.application.ninja.currentDocument);
-
             } else {
                 element = document.application.njUtils.make(this.options.selectedElement, null, this.application.ninja.currentDocument);
             }
 
+            // Adding a canplay event to videos to pause them and prevent autoplay on stage
+            if(this.options.selectedElement === "video") {
+                element.addEventListener("canplay", this, false);
+            }
+
             // Create the styles
             styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData);
 
@@ -109,6 +113,24 @@ exports.TagTool = Montage.create(DrawingTool, {
             // Add the element and styles
             this.application.ninja.elementMediator.addElements(element, styles);
         }
+    },
+
+    handleCanplay: {
+        value: function(event) {
+            //TODO: Figure out why the video must be seeked to the end before pausing
+            var time = Math.ceil(event.target.duration);
+            //Trying to display the last frame (doing minus 2 seconds if long video)
+            if (time > 2) {
+                event.target.currentTime = time - 2;
+            } else if (time > 1) {
+                event.target.currentTime = time - 1;
+            } else {
+                event.target.currentTime = time || 0;
+            }
+            //Pauing video
+            event.target.pause();
+        }
     }
+
 });
 
diff --git a/manifest.json b/manifest.json
index f1703b99..874f0c2f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Ninja",
   "description": "Ninja HTML5 Authoring Tool - Alpha Release",
-  "version": "0.6.0.0",
+  "version": "0.7.0.0",
   "app": {
     "launch": {
       "local_path": "index.html"