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

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 279 insertions, 279 deletions

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
index f593073a..5f8b3854 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
@@ -71,7 +71,7 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
 
             ///// Set up collapsible sub sections
             ['sheets', 'styles'].forEach(function(section) {
-                var s = section;                
+                var s = section;
                 self.sections[s].heading.addEventListener('click', function(e) {
                     self.toggleSectionCollapse(s);
                 }, false);
@@ -132,24 +132,24 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
                 contEl        = sect.container,
                 userDocName   = nj.getFileNameFromPath(sect.doc.defaultView.location.href),
                 self          = this;
-            
+
             ///// Set current document name in Stylesheets section header
             nj.empty(sect.docNameEl).appendChild(nj.textNode(' - ' + userDocName));
-            
+
             ///// LOOP through stylesheet list
             ///// -------------------------------------------------------
             sheetsArray.forEach(function(sheet, index) {
                 var isStageStyleSheet = (sheet.ownerNode.id === this._stageStyleSheetId),
                     isDefaultStyleSheet = (sheet.ownerNode.id === this._defaultStyleSheetId),
                     sheetObj;
-                    
+
                 if(!isStageStyleSheet) {
                     sheetObj = new NJStyleSheet(sheet, index);
                     if(isDefaultStyleSheet) {
                         sheetObj.isProtected = sheetObj.isCurrent = true;
                         this.currentStyleSheet = this.defaultStyleSheet = sheetObj;
-                    }                 
-                    
+                    }
+
                     //// Add Default stylesheet selection
                     sheetObj.sheetNameEl.addEventListener('click', function(e) {
                         //console.log('clicking sheet');
@@ -157,27 +157,27 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
                         //e.stopPropagation();
                         self.currentStyleSheet = sheetObj;
                     }, false);
-                    
+
                     sheetObj.deleteEl.addEventListener('click', function(e) {
                         if(sheetObj.isCurrent) {
                             self.defaultStyleSheet.makeCurrent();
                         }
                     }, false);
-                    
+
                     sheetObj.render(listEl);
                 }
 
-                
+
             }, this);
             ///// ________________________________________________________
-            
+
             ///// save height of content, and convert height from "auto" to pixels
             //sect.height = contEl.style.height = nj.height(contEl);
-            
-            
-            
+
+
+
             //contEl.style.webkitTransition = 'all 0.15s ease-out';
-            
+
         }
     },
     clearStyleSheetList : {
@@ -195,7 +195,7 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
             NJCSSStyle.prototype.onStyleChange.push(function() {
                 self._stageUpdate();
             });
-            
+
             ///// Add some NJEditable functionality
             NJEditable.prototype.onStartEdit.push(function(e) {
                 if(this.isSelector && this.el.nodeContent === 'element.style') {
@@ -204,7 +204,7 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
                 var njStyle = this.el.parentNode.njcssstyle;
                 // //console.log('added start edit');
                 this.el.parentNode.classList.add('nj-editing');
-                if(this.el.nodeName === "DD") {                    
+                if(this.el.nodeName === "DD") {
                     this.el.parentNode.classList.add('nj-editing-val'); // controls wrapping of text
                     if(cssCompletionMap[njStyle.property]) {
                         this.suggestions = cssCompletionMap[njStyle.property];
@@ -240,7 +240,7 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
                 }
 
                 ////console.log('NJEditable onStopEdit callback');
-                       
+
                 if(e && [9,13,186].indexOf(e._event.keyCode) !== -1) { // if the user is tabbing between styles
                     e.preventDefault();
                     sibling = (e._event.keyCode === 9 && e._event.shiftKey) ? ['previousSibling', 'lastChild'] : ['nextSibling', 'firstChild'];
@@ -250,9 +250,9 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
                         if(nextEl[sibling[0]]) {
                             nextEl = nextEl[sibling[0]];
                         } else {
-                            
+
                             if(!nextEl.parentNode[sibling[0]]) { // no next style element
-                                /// get njcssrule and create add button, 
+                                /// get njcssrule and create add button,
                                 /// and activate it if the new styles isn't dirtied
                                 // //console.log('reached the end');
                                 njStyle = nextEl.parentNode.njcssstyle;
@@ -269,8 +269,8 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
                                 nextEl = false;
                                 break;
                             } else {
-                                nextEl = (nextEl.parentNode[sibling[0]]) ? 
-                                    nextEl.parentNode[sibling[0]][sibling[1]]: 
+                                nextEl = (nextEl.parentNode[sibling[0]]) ?
+                                    nextEl.parentNode[sibling[0]][sibling[1]]:
                                     nextEl.parentNode.parentNode[sibling[1]][sibling[1]];
                             }
                         }
@@ -299,14 +299,14 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
                         }
                     }
                 }
-                                
+
                 function isEditableNode(n) {
                     return n && n.nodeType === 1 && (n.nodeName === 'DT' || n.nodeName === 'DD');
                 }
             });
 
             NJEditable.prototype.onChange.push(_onEditableChange);
-            
+
             ///// Event delegation for editable nodes
             this.sections.styles.container.addEventListener('click', function(e) {
                 if(!this.njedit && (this.nodeName === 'DT' || this.nodeName === 'DD') && !self._inComputedStyleMode) {
@@ -314,22 +314,22 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
                         // //console.log('set up editable node!');
                         var edit = new NJEditable(this, null,  self.CSS_PROPERTY_NAMES); // TODO: window.propertyKeywords);
                         edit.startEditable();
-                    }                    
+                    }
                 }
             }, false);
-            
+
             function _onEditableChange(val, oldVal) {
                 if(this.isSelector) {