Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

4 files changed, 76 insertions, 17 deletions

diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index c7588b9e..2b81bb71 100644
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -56,9 +56,9 @@
                     <label class="label"> Tag Name:</label>
 
                     <select id="customTagCB" class="nj-skinned">
-                        <option>Article</option>
-                        <option>Aside</option>
-                        <option>Section</option>
+                        <option>article</option>
+                        <option>aside</option>
+                        <option>section</option>
                     </select>
                 </div>
 
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 21024125..011caec5 100644
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -175,6 +175,8 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             }
             
             stylesheet.insertRule(ruleText, index);
+
+            this.styleSheetModified(stylesheet);
             
             rule = stylesheet.rules[index];
             
@@ -283,6 +285,8 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 sheet.deleteRule(index);
             }
 
+            this.styleSheetModified(sheet);
+
             return index;
         }
     },
@@ -531,6 +535,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         value : function(rule, selector) {
             rule.selectorText = selector;
             rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(selector);
+
+            this.styleSheetModified(rule.parentStyleSheet);
+
             return rule;
         }
     },
@@ -780,6 +787,8 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// method to apply/test the new value
             dec.setProperty(property, value, priority);
 
+            this.styleSheetModified(rule.parentStyleSheet);
+
             ///// Return browser value for value we just set
             return dec.getPropertyValue(property);
         }
@@ -838,7 +847,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     
     deleteStyle : {
         value : function(rule, property) {
+            this.styleSheetModified(rule.parentStyleSheet);
+
             rule.style.removeProperty(property);
+
             return rule;
         }
     },
@@ -1070,9 +1082,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     
     createStylesheet : {
         value: function(id, document) {
-            var doc = document || this._activeDocument;
+            var doc = document || this._activeDocument._document,
+                sheetElement, sheet;
             
-            sheet = nj.make('style', { 
+            sheetElement = nj.make('style', {
                 type  : 'text/css',
                 rel   : 'stylesheet',
                 id    : id || "",
@@ -1080,9 +1093,12 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 title : 'Temp'
             });
 
-            doc.head.appendChild(sheet);
-            
-            return this.getSheetFromElement(sheet, doc);
+            doc.head.appendChild(sheetElement);
+            sheet = this.getSheetFromElement(sheetElement, doc);
+
+            this.styleSheetModified(sheet);
+
+            return sheet;
         }
     },
     
@@ -1103,7 +1119,52 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             
         }
     },
-    
+
+    ///// Style Sheet Modified
+    ///// Method to call whenever a stylesheet change is made
+    ///// Dispatches an event, and keeps list of dirty style sheets
+
+    styleSheetModified : {
+        value: function(sheet, eventData) {
+            var sheetSearch = this.dirtyStyleSheets.filter(function(sheetObj) {
+                return sheetObj.stylesheet === sheet;
+            });
+
+            ///// If the sheet doesn't already exist in the list of modified
+            ///// sheets, dispatch dirty event and add the sheet to the list
+            if(sheetSearch.length === 0) {
+                NJevent('styleSheetDirty', eventData);
+                this.dirtyStyleSheets.push({
+                    document : sheet.ownerNode.ownerDocument,
+                    stylesheet : sheet
+                });
+            }
+        }
+    },
+
+    ///// Dirty Style Sheets
+    ///// List of modified style sheets
+
+    dirtyStyleSheets : {
+        value : []
+    },
+
+    ///// Clear Dirty Style Sheets
+    ///// Refreshes the list of dirty style sheets
+    ///// If optional document object is supplied, only the styles sheets
+    ///// of a particular document are cleared
+    ///// Useful to call after a "Save" or "Save All" event
+
+    clearDirtyStyleSheets : {
+        value: function(doc) {
+            if(!doc) {
+                this.dirtyStyleSheets = null;
+                this.dirtyStyleSheets = [];
+            }
+
+        }
+    },
+
     /* ----------------- Utils ------------------- */
 
     _generateRandomAlphaNumeric : {
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index aacb228c..ede71383 100644
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -122,7 +122,7 @@ exports.DragDropMediator = Montage.create(Component, {
 
                     NJUtils.makeElementModel(domElem, "SVG", "block");
                 } else { // treat as a regular image
-                    domElem = NJUtils.makeNJElement("image", "Image", "block");
+                    domElem = NJUtils.makeNJElement("image", "image", "image");
                     domElem.src = evt2.currentTarget.result;
                 }
 
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index c527edf3..e3f49bbe 100644
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -158,19 +158,17 @@ exports.TagTool = Montage.create(DrawingTool, {
             selectedTag = this.options.selectedElement;
 
             if(selectedTag === "divTool") {
-                newTag = NJUtils.makeNJElement("div", "Div", "block");
+                newTag = NJUtils.makeNJElement("div", "div", "block");
             } else if(selectedTag === "imageTool") {
-                newTag = NJUtils.makeNJElement("image", "Image", "image");
+                newTag = NJUtils.makeNJElement("image", "image", "image");
             } else if(selectedTag === "videoTool") {
-                newTag = NJUtils.makeNJElement("video", "Video", "video", {
+                newTag = NJUtils.makeNJElement("video", "video", "video", {
                         innerHTML: "Your browser does not support the VIDEO element."
                 });
             } else if(selectedTag === "canvasTool") {
-                newTag = NJUtils.makeNJElement("canvas", "Canvas", "canvas");
+                newTag = NJUtils.makeNJElement("canvas", "canvas", "canvas");
             } else if(selectedTag === "customTool") {
-                newTag = document.createElement(this.options.customName.value);
-                newTag.Ninja = {};
-                newTag.Ninja.selectionType = this.options.customName.value;
+                newTag = NJUtils.makeNJElement(this.options.customName.value, this.options.customName.value, "block");
             }
             /* SWF Tag tool - Not used for now. Will revisit this at a later time.
             else if(selectedTag === "flashTool") {