Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 27 insertions, 3 deletions

diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.js b/js/components/tools-properties/selection-properties.reel/selection-properties.js
index c25e96d1..43622960 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.js
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.js
@@ -14,15 +14,39 @@ exports.SelectionProperties = Montage.create(ToolProperties, {
     _controls: { value: false },
 
     _subPrepare: {
-        value: function() {
+        value: function () {
             this.transform.addEventListener("change", this, false);
+
+            // The functionality for these buttons is not currently implemented
+            // Until it is we will make them all disabled by default.
+            this.topAlign.disabled = true;
+
+            this.middleAlign.disabled = true;
+            this.bottomAlign.disabled = true;
+
+            this.leftAlign.disabled = true;
+            this.centerAlign.disabled = true;
+            this.rightAlign.disabled = true;
+
+            this.distTop.disabled = true;
+            this.distMiddle.disabled = true;
+            this.distBottom.disabled = true;
+
+            this.distLeft.disabled = true;
+            this.distCenter.disabled = true;
+            this.distRight.disabled = true;
+
+            this.arrangeBringForward.disabled = true;
+            this.arrangeSendBackward.disabled = true;
+            this.arrangeBringToFront.disabled = true;
+            this.arrangeSendToBack.disabled = true;
         }
     },
 
     handleChange: {
-        value: function(event) {
+        value: function (event) {
             this._controls = this.transform.checked;
-            NJevent("toolOptionsChange", {source: "SelectionProperties", inTransformMode: this.transform.checked});
+            NJevent("toolOptionsChange", { source: "SelectionProperties", inTransformMode: this.transform.checked });
         }
     }