Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

3 files changed, 78 insertions, 6 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index b80dfe56..b066a9c2 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -187,7 +187,7 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
                                         var code = Montage.create(TextDocument, {"source": {value: doc.content}}), docuuid = Uuid.generate(), textArea;
                                         textArea = this.application.ninja.stage.stageView.createTextAreaElement(docuuid);
                                         code.initialize(doc, docuuid, textArea, textArea.parentNode);
-                                        code.init(doc.name, doc.uri, doc.extension, null, docuuid);
+                                        //code.init(doc.name, doc.uri, doc.extension, null, docuuid);
                                         code.textArea.value = doc.content;
                                         this.application.ninja.stage.stageView.createTextView(code);
                                         break;
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index b8170826..af7c4858 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -75,6 +75,8 @@ exports.StageController = Montage.create(ElementController, {
     getProperty: {
         value: function(el, p) {
             switch(p) {
+                case "background" :
+                    return el.elementModel.stageBackground.style.getProperty(p);
                 case "border":
                     return el.elementModel.stageView.style.getProperty(p);
                 case "height":
@@ -92,7 +94,7 @@ exports.StageController = Montage.create(ElementController, {
         value: function(el, p, value) {
             switch(p) {
                 case "background":
-                    el.elementModel.body.style.setProperty(p, value);
+                    el.elementModel.stageBackground.style.setProperty(p, value);
                     break;
                 case "overflow":
                     el.elementModel.viewPort.style.setProperty(p, value);
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 44e0e798..44ca50e1 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -128,7 +128,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 } else {
                     this._defaultStylesheet = sheets[lastIndex];
                 }
-                
+
             }
         }
     },
@@ -179,14 +179,14 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             this.styleSheetModified(stylesheet);
             
             rule = stylesheet.rules[index];
-            
+
             ///// attach specificity to rule object
-            // if rule is css keyframes, return rule and don't attach specificity
+            ///// if rule is css keyframes, return rule and don't attach specificity
             if (rule instanceof WebKitCSSKeyframesRule) {
                 return rule;
             }
             rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText);
-            
+
             ///// return the rule we just inserted
             return rule;
         }
@@ -844,6 +844,61 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         }
     },
 
+    ///// Get Animation Rule With Name
+    ///// Returns the CSSKeyframesRule with given name
+
+    getAnimationRuleWithName : {
+        value: function(name, document) {
+            var doc = document || this._activeDocument._document,
+                animRules = this.getDocumentAnimationRules(doc),
+                rule, i;
+
+            for(i = 0; i < animRules.length; i++) {
+                rule = animRules[i];
+                if(rule.name === name) {
+                    return rule;
+                }
+            }
+
+            return;
+        }
+    },
+
+    ///// Get Document Animation Rules
+    ///// Returns all CSSKeyframesRules in active document, or in
+    ///// optionally passed-in document
+    ///// If none are found, returns an empty array
+
+    getDocumentAnimationRules : {
+        value: function(document) {
+            var sheets = (document) ? document.styleSheets : this._activeDocument._document.styleSheets,
+                rules = [];
+
+            nj.toArray(sheets).forEach(function(sheet) {
+                rules = rules.concat(this.getStyleSheetAnimationRules(sheet));
+            }, this);
+
+            return rules;
+        }
+    },
+
+    ///// Get Style Sheet Animation Rules
+    ///// Returns all CSSKeyframesRules from the given stylesheet
+    ///// If none are found, returns an empty array
+
+    getStyleSheetAnimationRules : {
+        value: function(sheet) {
+            var rules = [];
+
+            if(sheet.rules) {
+                rules = rules.concat(nj.toArray(sheet.rules).filter(function(rule) {
+                    return rule instanceof WebKitCSSKeyframesRule;
+                }));
+            }
+
+            return rules;
+        }
+    },
 
     ///// Delete style
     ///// Removes the property from the style declaration/rule
@@ -1049,6 +1104,21 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         }
     },
 
+    ///// Get Element Animation Rule
+    ///// Returns the CSSKeyframesRule applied to an element
+
+    getElementAnimationRule : {
+        value: function(element) {
+            var animationName = this.getElementStyle(element, '-webkit-animation-name');
+
+            if(!animationName) {
+                return null;
+            }
+
+            return this.getAnimationRuleWithName(animationName);
+        }
+    },
+
     ///// Create Rule From Inline Style
     ///// Creates a rule for an inline style with a specified, or partially random selector.