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

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

1 files changed, 138 insertions, 138 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 1030acb4..973c3aa1 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -59,26 +59,26 @@ Methods:
      - Delete stylesheets
      - Enable  stylesheets
      - Disable stylesheets
-     
+
      use case : set background color
       - needs to know most specific rule WITH that property
-      - 
+      -
 
 */
 
 var stylesController = exports.StylesController = Montage.create(Component, {
-    
+
     ///// Initialize after the active document has been set, and
     ///// bind the document to prop w/ setter. The setter calls to find
     ///// the stage and default css files.
 
-    ///// Active document gets automatically set when the 
+    ///// Active document gets automatically set when the
     ///// document controller changes it
     _currentDocument : {
         value : null,
         enumerable : false
     },
-    
+
     currentDocument : {
         get : function() {
             return this._currentDocument;
@@ -97,7 +97,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
             ///// setting document via binding
             this._currentDocument = document;
-            
+
             ///// Stage stylesheet should always be found
             this._stageStylesheet  = this.getSheetFromElement(this.CONST.STAGE_SHEET_ID);
             // Returns null if sheet not found (as in non-ninja projects)
@@ -191,29 +191,29 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         }
     },
     /* ----------------- Rule methods ----------------- */
-    
+
     ///// Add Rule
     ///// Passed in rule will be appended to the default stylesheet
     ///// The rule can be in the form of a string (one argument), or
     ///// the selector string and declaration string (two arguments), or
     ///// the selector string and a declaration object.
     ///// Optionally pass in the rule index (defaults to end of sheet)
-    
+
     /*
-    Signature 1 : 
+    Signature 1 :
     addRule( "#div1", "color:blue; width:100px;", 3)
               [str]    [str]                    [num]
-    
-    Signature 2 (w/ styles object literal): 
+
+    Signature 2 (w/ styles object literal):
     addRule( "#div1", { color:"blue", width:"100px" }, 3)
               [str]    [obj]                         [num]
-    
-    Signature 3 (w/ full rule as one string) : 
+
+    Signature 3 (w/ full rule as one string) :
     addRule( "#div1 { color:blue; width:100px; }", 3)
               [str]                              [num]
-    
+
     */
-    
+
     addRule : {
         value : function(selector, declaration, stylesheet, index) {
             stylesheet = stylesheet || this._defaultStylesheet;
@@ -228,20 +228,20 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 rule;
 
             index = index || (argType === 'number') ? declaration : rulesLength;
-            
+
             if(argType === 'string') {
                 ruleText += '{' + declaration + '}';
             } else if(argType === 'object') {
                 ruleText += '{' + this.cssFromObject(declaration) + '}';
             }
-            
+
             stylesheet.insertRule(ruleText, index);
 
             ///// Invalidate cache because rule dominance is affected
             this._clearCache();
 
             this.styleSheetModified(stylesheet);
-            
+
             rule = stylesheet.rules[index];
 
             ///// attach specificity to rule object
@@ -256,7 +256,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             return rule;
         }
     },
-    
+
     ///// Create Override Rule
     ///// Takes a given rule and creates a rule with a selector of equal
     ///// or greater specificity, and inserts it after the original rule
@@ -264,10 +264,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     ///// and the class will have to be applied to the element in order for
     ///// the rule to stick
     ///// Returns an object containing this classname and the rule itself
-    
+
     createOverrideRule : {
         value : function(ruleToOverride, element) {
-            
+
             ///// Locally-scoped function to de-clutter variable declarations
             function getSelector(el, rule) {
                 return this._getMostSpecificSelectorForElement(el, rule[this.CONST.SPECIFICITY_KEY]).selector;
@@ -283,12 +283,12 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
             ///// Create new rule with selector and insert it after the rule we're overriding
             rule = this.addRule(overrideData.selector + ' { }', this.getRuleIndex(ruleToOverride)+1);
-            
+
             return {
                 className : overrideData.className,
                 rule      : rule
             };
-            
+
         }
     },
 
@@ -341,18 +341,18 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             };
         }
     },
-    
+
     ///// Delete Rule
     ///// Deletes the passed-in rule from its stylesheet
     ///// Argument can be the index of the rule, or the rule itself
     ///// If the index is passed, the sheet must be passed in
-    
+
     deleteRule : {
         value : function(rule, sheet) {
             var index;
-            
+
             if(typeof rule === 'number') {
-                ///// 1st arg is the index 
+                ///// 1st arg is the index
                 index = rule;
             } else {
                 ///// derive the index of the rule
@@ -360,7 +360,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 ///// the sheet is a property of the rule
                 sheet = rule.parentStyleSheet;
             }
-            
+
             if(index > -1) {
                 sheet.deleteRule(index);
             }
@@ -370,22 +370,22 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             return index;
         }
     },
-    
+