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

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

1 files changed, 4 insertions, 4 deletions

diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index 4effc686..f923e30c 100755
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -80,7 +80,7 @@ exports.Combobox = Montage.create(Component, {
             }
         }
     },
-    
+
     _value: {
         enumerable: false,
         value: null
@@ -153,12 +153,12 @@ exports.Combobox = Montage.create(Component, {
     handleChange:
     {
         value:function(event)
-                {
+        {
             this._valueSyncedWithInputField = true;
             this._wasSetByCode = false;
             this.value = this.element.value;
             this.needsDraw = true;
-                }
+        }
     },
 
     willDraw: {
@@ -166,7 +166,7 @@ exports.Combobox = Montage.create(Component, {
             if(!this._valueSyncedWithInputField)
             {
                 this.element.innerHTML = "";
-                
+
                 var optionItem = document.createElement("option");
                 var items = this._items;
                 var len = items.length;