Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

2 files changed, 70 insertions, 99 deletions

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index f47ca0c8..8899ff3c 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -92,14 +92,9 @@
                     "identifier": "btnBold",
                     "pressedLabel": "B",
                     "unpressedLabel": "B"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                }
             },
+
             "btnItalic": {
                 "prototype": "montage/ui/toggle-button.reel",
                 "properties": {
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js
index 7fe5537c..c5729e98 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -72,7 +72,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
 
     handleEditorSelect: {
         value: function(e) {
-            this.application.ninja.stage.textTool.updateStates();
+            //this.application.ninja.stage.textTool.updateStates();
 //            this.fontSelection.value = this.application.ninja.stage.textTool.states.fontname;
 //
 //            for( var i = 0; i < this.fontSize.items.length; i++) {
@@ -96,30 +96,6 @@ exports.TextProperties = Montage.create(ToolProperties, {
 
         }
     },
-
-    handleBtnBoldAction: {
-        value: function(e) {
-            this.application.ninja.stage.textTool.doAction("bold");
-        }
-    },
-
-    handleBtnItalicAction: {
-        value: function(e) {
-            this.application.ninja.stage.textTool.doAction("italic");
-        }
-    },
-
-    handleBtnUnderlineAction: {
-        value: function(e) {
-            this.application.ninja.stage.textTool.doAction("underline");
-        }
-    },
-
-    handleBtnStrikethroughAction: {
-        value: function(e) {
-            this.application.ninja.stage.textTool.doAction("strikethrough");
-        }
-    },
     
     handleAlignLeftAction: {
         value: function(e) {
@@ -211,87 +187,83 @@ exports.TextProperties = Montage.create(ToolProperties, {
 
                 Object.defineBinding(this.btnBold, "pressed", {
                   boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.bold",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
+                  boundObjectPropertyPath: "bold",
+                  oneway: false
                 });
 
                 Object.defineBinding(this.btnItalic, "pressed", {
                   boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.italic",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
+                  boundObjectPropertyPath: "italic",
+                  oneway: false
                 });
 
                 Object.defineBinding(this.btnUnderline, "pressed", {
                   boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.underline",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
+                  boundObjectPropertyPath: "underline",
+                  oneway: false
                 });
 
                 Object.defineBinding(this.btnStrikethrough, "pressed", {
                   boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.strikethrough",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
+                  boundObjectPropertyPath: "strikeThrough",
+                  oneway: false
                 });
 
                 Object.defineBinding(this.alignLeft, "pressed", {
                   boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.justifyleft",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
-                });
-
-                Object.defineBinding(this.alignCenter, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.justifycenter",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
-                });
-
-                Object.defineBinding(this.alignRight, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.justifyright",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
-                });
-
-                Object.defineBinding(this.alignJustify, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.justifyfull",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
-                });
-
-                Object.defineBinding(this.numberedList, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.insertorderedlist",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
-                });
-
-                Object.defineBinding(this.bulletedList, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.insertunorderedlist",
-                  boundValueMutator: this.validatePressed,
-                  oneway: true
-                });
-
-                Object.defineBinding(this.fontSelection, "value", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.fontname",
-                  boundValueMutator: this.validateFont,
-                  oneway: true
-                });
-
-                Object.defineBinding(this.fontSize, "value", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "states.fontsize",
-                  boundValueMutator: this.validateFontSize.bind(this),
-                  oneway: true
+                  boundObjectPropertyPath: "justify",
+                  boundValueMutator: this.validateJustify,
+                  oneway: false
                 });
+//
+//                Object.defineBinding(this.alignCenter, "pressed", {
+//                  boundObject: this.application.ninja.stage.textTool,
+//                  boundObjectPropertyPath: "justifycenter",
+//                  boundValueMutator: this.validatePressed,
+//                  oneway: true
+//                });
+//
+//                Object.defineBinding(this.alignRight, "pressed", {
+//                  boundObject: this.application.ninja.stage.textTool,
+//                  boundObjectPropertyPath: "justifyright",
+//                  boundValueMutator: this.validatePressed,
+//                  oneway: true
+//                });
+//
+//                Object.defineBinding(this.alignJustify, "pressed", {
+//                  boundObject: this.application.ninja.stage.textTool,
+//