Merge branch 'refs/heads/Ninja-Internal' into Color

2 files changed, 24 insertions, 38 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 725e1d22..e7fafd0d 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -89,7 +89,6 @@
                 "properties": {
                     "element": {"#": "btnBold"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "btnBold",
                     "pressedLabel": "B",
                     "unpressedLabel": "B"
@@ -106,7 +105,6 @@
                 "properties": {
                     "element": {"#": "btnItalic"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "btnItalic",
                     "pressedLabel": "I",
                     "unpressedLabel": "I"
@@ -123,7 +121,6 @@
                 "properties": {
                     "element": {"#": "btnUnderline"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "btnUnderline",
                     "pressedLabel": "U",
                     "unpressedLabel": "U"
@@ -140,7 +137,6 @@
                 "properties": {
                     "element": {"#": "btnStrikethrough"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "btnStrikethrough",
                     "pressedLabel": "S",
                     "unpressedLabel": "S"
@@ -158,7 +154,6 @@
                 "properties": {
                     "element": {"#": "alignLeft"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "alignLeft",
                     "pressedLabel": "",
                     "unpressedLabel": ""
@@ -175,7 +170,6 @@
                 "properties": {
                     "element": {"#": "alignCenter"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "alignCenter",
                     "pressedLabel": "",
                     "unpressedLabel": ""
@@ -192,7 +186,6 @@
                 "properties": {
                     "element": {"#": "alignRight"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "alignRight",
                     "pressedLabel": "",
                     "unpressedLabel": ""
@@ -209,7 +202,6 @@
                 "properties": {
                     "element": {"#": "alignJustify"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "alignJustify",
                     "pressedLabel": "",
                     "unpressedLabel": ""
@@ -225,10 +217,8 @@
                 "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "indent"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "indent",
-                    "label": ">>"
+                    "value": ">>"
                 },
                 "listeners": [
                     {
@@ -241,10 +231,8 @@
                 "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "outdent"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "outdent",
-                    "label": "<<"
+                    "value": "<<"
                 },
                 "listeners": [
                     {
@@ -258,7 +246,6 @@
                 "properties": {
                     "element": {"#": "bulletedList"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "bulletedList",
                     "pressedLabel": "• • •",
                     "unpressedLabel": "• • •"
@@ -275,7 +262,6 @@
                 "properties": {
                     "element": {"#": "numberedList"},
                     "pressedClass": "active",
-                    "preventFocus": true,
                     "identifier": "numberedList",
                     "pressedLabel": "1 2 3",
                     "unpressedLabel": "1 2 3"
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 fa2ec066..7fe5537c 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -10,28 +10,28 @@ var ArrayController = require("montage/ui/controller/array-controller").ArrayCon
 var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
 
 exports.TextProperties = Montage.create(ToolProperties, {
-    className: {value: null},
-    tagType: {value: null},
-    fontSelection: {value: null},
-    fontSettings: {value: null},
-    fontSize: {value: null},
-    fontColor: {value: null},
-    btnBold: {value: null},
-    btnItalic: {value: null},
-    btnUnderline: {value: null},
-    btnStrikethrough: {value: null},
-    txtLink: {value: null},
-    linkTarget: {value: null},
-    alignLeft: {value: null},
-    alignCenter: {value: null},
-    alignRight: {value: null},
-    alignJustify: {value: null},
-    indent: {value: null},
-    outdent: {value: null},
-    numberedList: {value: null},
-    bulletedList: {value: null},
-    fontTypes: {value: null},
-    fontSizes: {value: null},
+    className: {value: null, serializable: true},
+    tagType: {value: null, serializable: true},
+    fontSelection: {value: null, serializable: true},
+    fontSettings: {value: null, serializable: true},
+    fontSize: {value: null, serializable: true},
+    fontColor: {value: null, serializable: true},
+    btnBold: {value: null, serializable: true},
+    btnItalic: {value: null, serializable: true},
+    btnUnderline: {value: null, serializable: true},
+    btnStrikethrough: {value: null, serializable: true},
+    txtLink: {value: null, serializable: true},
+    linkTarget: {value: null, serializable: true},
+    alignLeft: {value: null, serializable: true},
+    alignCenter: {value: null, serializable: true},
+    alignRight: {value: null, serializable: true},
+    alignJustify: {value: null, serializable: true},
+    indent: {value: null, serializable: true},
+    outdent: {value: null, serializable: true},
+    numberedList: {value: null, serializable: true},
+    bulletedList: {value: null, serializable: true},
+    fontTypes: {value: null, serializable: true},
+    fontSizes: {value: null, serializable: true},