From 5d7e470351fd150d5e70a97332fa2f2553797499 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Mon, 7 May 2012 11:09:45 -0700
Subject: Initial Setup of the binding Tool

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 .../layout/tools-list.reel/tools-list.html         |  4 +++
 .../tools-properties.reel/tools-properties.html    | 10 ++++++-
 .../binding-properties.reel/binding-properties.css |  6 ++++
 .../binding-properties.html                        | 35 ++++++++++++++++++++++
 .../binding-properties.reel/binding-properties.js  | 25 ++++++++++++++++
 5 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100755 js/components/tools-properties/binding-properties.reel/binding-properties.css
 create mode 100755 js/components/tools-properties/binding-properties.reel/binding-properties.html
 create mode 100755 js/components/tools-properties/binding-properties.reel/binding-properties.js

(limited to 'js/components')

diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index acee20b2..f9361dd6 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -112,6 +112,9 @@
             "ZoomTool1": {
                 "prototype": "js/tools/ZoomTool"
             },
+            "BindingTool1": {
+                "prototype": "js/tools/BindingTool"
+            },
 
             "disable": {
                 "prototype": "montage/ui/condition.reel",
@@ -151,6 +154,7 @@
                     "RotateStageTool3D":      {"@": "RotateStageTool3D1"},
                     "PanTool":                {"@": "PanTool1"},
                     "ZoomTool":               {"@": "ZoomTool1"},
+                    "bindingTool":            {"@": "BindingTool1"},
                     "components": [
                         {"@": "repetition1"}
                     ]
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 8dd0f713..90da0fbe 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -120,6 +120,12 @@
                     "element": {"#": "zoomProperties"}
                 }
             },
+            "bindingProperties1": {
+                "prototype": "js/components/tools-properties/binding-properties.reel",
+                "properties": {
+                    "element": {"#": "bindingProperties"}
+                }
+            },
 
             "disable": {
                 "prototype": "montage/ui/condition.reel",
@@ -155,7 +161,8 @@
                     "eraserProperties":             {"@": "eraserProperties1"},
                     "rotateStageProperties":        {"@": "rotateStageProperties1"},
                     "panProperties":                {"@": "panProperties1"},
-                    "zoomProperties":               {"@": "zoomProperties1"}
+                    "zoomProperties":               {"@": "zoomProperties1"},
+                    "bindingProperties":            {"@": "bindingProperties1"}
                 },
                 "bindings": {
                     "currentSelectedTool": {
@@ -188,6 +195,7 @@
             <div id="rotateStageProperties"></div>
             <div id="panProperties"></div>
             <div id="zoomProperties"></div>
+            <div id="bindingProperties"></div>
             <div id="disabledCondition" class="panelDisabled"></div>
         </div>
     </body>
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.css b/js/components/tools-properties/binding-properties.reel/binding-properties.css
new file mode 100755
index 00000000..7f1b0f7f
--- /dev/null
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.css
@@ -0,0 +1,6 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html
new file mode 100755
index 00000000..5a55d0a4
--- /dev/null
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+<html>
+    <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <link rel="stylesheet" type="text/css" href="binding-properties.css">
+
+        <script type="text/montage-serialization">
+        {
+
+            "owner": {
+                "prototype": "js/components/tools-properties/binding-properties.reel",
+                "properties": {
+                    "element": {"#": "bindingProperties"}
+                }
+            }
+    	}
+	    </script>
+      
+    </head>
+
+    <body>
+        <div id="bindingProperties" class="subToolHolderPanel">
+            <label>View All Bindings</label>
+            <input type="checkbox" />
+        </div>
+    </body>
+
+</html>
+
+        
\ No newline at end of file
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.js b/js/components/tools-properties/binding-properties.reel/binding-properties.js
new file mode 100755
index 00000000..8d30d855
--- /dev/null
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.js
@@ -0,0 +1,25 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+var Montage = require("montage/core/core").Montage;
+var Component = require("montage/ui/component").Component;
+var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
+
+exports.BindingProperties = Montage.create(ToolProperties, {
+
+    _subPrepare: {
+        value: function() {
+
+        }
+    },
+
+    handleClick: {
+        value: function(event) {
+
+        }
+    }
+
+});
\ No newline at end of file
-- 
cgit v1.2.3


From e3efa52c409ef05c28bfc5f1f25a750b5132c3bd Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Wed, 9 May 2012 09:28:03 -0700
Subject: After merge file change

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/components/layout/tools-properties.reel/tools-properties.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js/components')

diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 112cfcb0..9061cd12 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -195,6 +195,7 @@
             <div data-montage-id="rotateStageProperties"></div>
             <div data-montage-id="panProperties"></div>
             <div data-montage-id="zoomProperties"></div>
+            <div data-montage-id="bindingProperties"></div>
             <div data-montage-id="disabledCondition" class="panelDisabled"></div>
         </div>
     </body>
-- 
cgit v1.2.3


From 9fc3b70bf57e10846e71808c6041fbc339a435d1 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Mon, 14 May 2012 11:43:40 -0700
Subject: Changes

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 .../binding-properties.reel/binding-properties.css            | 11 +++++++++++
 .../binding-properties.reel/binding-properties.html           |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'js/components')

diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.css b/js/components/tools-properties/binding-properties.reel/binding-properties.css
index 7f1b0f7f..19d2b6c6 100755
--- a/js/components/tools-properties/binding-properties.reel/binding-properties.css
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.css
@@ -4,3 +4,14 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
+.bindingSubTools {
+    padding:9px;
+    font-size:12px;
+}
+
+.bindingSubTools label {
+
+}
+.bindingSubTools input[type=checkbox] {
+    margin: 0px 3px;
+}
\ No newline at end of file
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html
index 5a55d0a4..cd0e0a50 100755
--- a/js/components/tools-properties/binding-properties.reel/binding-properties.html
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html
@@ -24,9 +24,9 @@
     </head>
 
     <body>
-        <div id="bindingProperties" class="subToolHolderPanel">
+        <div id="bindingProperties" class="subToolHolderPanel bindingSubTools">
+            <input class="nj-skinned" type="checkbox" />
             <label>View All Bindings</label>
-            <input type="checkbox" />
         </div>
     </body>
 
-- 
cgit v1.2.3


From 7d3bdf39e6d1534de1848ca2744aed66dfeb5d2a Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Tue, 5 Jun 2012 23:13:03 -0700
Subject: Initial Text Tool Changes

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 .../text-properties.reel/text-properties.html      |   9 +-
 .../text-properties.reel/text-properties.js        | 154 +++++++++------------
 2 files changed, 65 insertions(+), 98 deletions(-)

(limited to 'js/components')

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..a3477e99 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -93,14 +93,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 fa2ec066..35d46cc7 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,
+//                  boundObjectPropertyPath: "justifyfull",
+//                  boundValueMutator: this.validatePressed,
+//                  oneway: true
+//                });
+//
+//                Object.defineBinding(this.numberedList, "pressed", {
+//                  boundObject: this.application.ninja.stage.textTool,
+//                  boundObjectPropertyPath: "insertorderedlist",
+//                  boundValueMutator: this.validatePressed,
+//                  oneway: true
+//                });
+//
+//                Object.defineBinding(this.bulletedList, "pressed", {
+//                  boundObject: this.application.ninja.stage.textTool,
+//                  boundObjectPropertyPath: "insertunorderedlist",
+//                  boundValueMutator: this.validatePressed,
+//                  oneway: true
+//                });
+//
+//                Object.defineBinding(this.fontSelection, "value", {
+//                  boundObject: this.application.ninja.stage.textTool,
+//                  boundObjectPropertyPath: "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
+//                });
 
                 this.initialized = true;
             }
@@ -331,8 +303,8 @@ exports.TextProperties = Montage.create(ToolProperties, {
 
     handleFontColorChange: {
         value: function(e) {
-            this.application.ninja.stage.textTool.element.firstChild.style.color = e._event.color.css;
-            this.application.ninja.stage.textTool.element.firstChild.focus();
+            this.application.ninja.stage.textTool.element.style.color = e._event.color.css;
+            this.application.ninja.stage.textTool.element.focus();
             //this.application.ninja.stage.textTool.doAction("forecolor",e._event.color.css);
 
         }
-- 
cgit v1.2.3


From e737ce214eb59b552e6c7dd074c4f4d719bb31d4 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Sun, 10 Jun 2012 16:32:34 -0700
Subject: Hintable - Array type check fix for arrays created with map() method.

---
 js/components/hintable.reel/hintable.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'js/components')

diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 803770db..e16c5f8a 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -185,12 +185,12 @@ exports.Hintable = Montage.create(Editable, {
     handleInput : {
         value : function handleInput(e) {
             this._super(arguments);
-            
+
             var val = this.value,
                  matches, hint;
             //console.log('val = "' + val + '"');
             //// Handle auto-suggest if configured
-            if(this.hints instanceof Array) {
+            if(this.hints && this.hints.length) {
 
                 if(val.length > 0) { // content is not empty
                     
@@ -305,7 +305,8 @@ exports.Hintable = Montage.create(Editable, {
 
     /* --------- CONFIG ---------- */
     hints : {
-        value : ['Testing a hint.', 'Testing another hint.', 'Testing the last hint.']
+        value : ['Testing a hint.', 'Testing another hint.', 'Testing the last hint.'],
+        distinct: true
     },
     hintClass : {
         value : "hintable-hint"
-- 
cgit v1.2.3


From a0079f570ce996cb5acbf050a7abb1df1ad788eb Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Mon, 18 Jun 2012 18:56:04 -0700
Subject: Hintable - Fix editable/hintable value property so it is bindable.

---
 js/components/editable.reel/editable.js | 45 +++++++++++++++++++++++++++++----
 js/components/hintable.reel/hintable.js | 36 +-------------------------
 2 files changed, 41 insertions(+), 40 deletions(-)

(limited to 'js/components')

diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 103e418f..88b93b2c 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -93,12 +93,43 @@ exports.Editable = Montage.create(Component, {
             }
         }
     },
+
+    _value : { value: null },
     value : {
-        get: function() {
-            return this._element.textContent;
-        },
-        set: function(str) {
-            this._element.textContent = str;
+        get : function() { return this._value; },
+        set : function(value) {
+            if(value === this._value) { return; }
+
+            var node = this._getFirstTextNode();
+            node.textContent = value;
+
+            this._value = value;
+        }
+    },
+    _getFirstTextNode : {
+        value : function(el) {
+            ///// optional el argument specified container element
+            var e = el || this._element,
+                nodes = e.childNodes, node;
+
+            if(nodes.length) {
+                for(var i=0; i<nodes.length; i++) {
+                    if(nodes[i].nodeType === 3) {
+                        ///// found the first text node
+                        node = nodes[i];
+                        break;
+                    }
+                }
+            }
+
+            ///// Text node not found
+            if(!node) {
+                node = document.createTextNode('');
+                e.appendChild(node);
+            }
+
+
+            return node;
         }
     },
 
@@ -207,6 +238,8 @@ exports.Editable = Montage.create(Component, {
     ///// Text input has changed values
     handleInput : {
         value : function(e) {
+            this.value = this._getFirstTextNode().textContent;
+
             if(!this.isDirty) {
                  this.isDirty = true;
              }
@@ -230,6 +263,8 @@ exports.Editable = Montage.create(Component, {
         value: function(e) {
             e.preventDefault();
             document.execCommand('insertHTML', null, e._event.clipboardData.getData("Text"));
+            this.value = this._element.textContent;
+
             this._sendEvent('paste', e);
         }
     },
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index e16c5f8a..d09cdbd2 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -140,15 +140,6 @@ exports.Hintable = Montage.create(Editable, {
             }
         }
     },
-    value : {
-        get: function() {
-            return this._getFirstTextNode().textContent;
-        },
-        set: function(str) {
-            var node = this._getFirstTextNode();
-            node.textContent = str;
-        }
-    },
 
     handleKeydown : {
         value : function handleKeydown(e) {
@@ -196,6 +187,7 @@ exports.Hintable = Montage.create(Editable, {
                     
                     this._matchIndex = 0;                    
                     this.matches = this.hints.filter(function(h) {
+                        if(!h) { return false; }
                         return h.indexOf(val) === 0;
                     }).sort();
                     
@@ -271,32 +263,6 @@ exports.Hintable = Montage.create(Editable, {
             return Array.prototype.slice.call(arrayLikeObj);
         }
     },
-    _getFirstTextNode : {
-        value : function(el) {
-            ///// optional el argument specified container element
-            var e = el || this._element,
-                nodes = e.childNodes, node;
-            
-            if(nodes.length) {
-                for(var i=0; i<nodes.length; i++) {
-                    if(nodes[i].nodeType === 3) {
-                        ///// found the first text node
-                        node = nodes[i];
-                        break;
-                    }
-                }
-            }
-            
-            ///// Text node not found
-            if(!node) {
-                node = document.createTextNode('');
-                e.appendChild(node);
-            }
-        
-        
-            return node;
-        }
-    },
     _super : {
         value : function(args) {
             this.inheritsFrom[arguments.callee.caller.name].apply(this, args);
-- 
cgit v1.2.3


From 8abe69f8d179a3edd2498119ae2947d283c1b758 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Thu, 21 Jun 2012 13:54:53 -0700
Subject: Binding View - Minor Fixes to remove warnings

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/components/toolbar.reel/toolbar.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'js/components')

diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index 51e7ebec..c23e082f 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -19,8 +19,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             },
             
             "buttonList": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype" : "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "repetition"}
                 },
-- 
cgit v1.2.3


From fcaa8a35e3091595a5cd8ceb67a825e54d9c19a2 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Thu, 21 Jun 2012 16:26:08 -0700
Subject: Hintable - Remove overridden method

---
 js/components/hintable.reel/hintable.js | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'js/components')

diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 810f0d65..fb55c937 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -140,19 +140,6 @@ exports.Hintable = Montage.create(Editable, {
             }
         }
     },
-    value : {
-        get: function() {
-            return this._getFirstTextNode().textContent;
-        },
-        set: function(str) {
-            var node = this._getFirstTextNode();
-            if (node.textContent !== str) {
-            	node.textContent = str;
-            }
-            
-            //node.innerText = str;
-        }
-    },
 
     handleKeydown : {
         value : function handleKeydown(e) {
-- 
cgit v1.2.3


From 23aec4144f9d4352ba6d10367288f51d57ba990f Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Sat, 23 Jun 2012 13:44:49 -0700
Subject: Text Tool Fix - Can Not Switch Document when Text Tool Initialized

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 .../tools-properties/text-properties.reel/text-properties.js      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'js/components')

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 72a6f034..c5729e98 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -296,14 +296,18 @@ exports.TextProperties = Montage.create(ToolProperties, {
 
     handleFontSelectionChange: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("fontname", this.fontSelection.value);
             this.application.ninja.stage.textTool.element.focus();
+            this.application.ninja.stage.textTool.doAction("fontname", this.fontSelection.value);
+
+            //Note: Set Font Color on selection to ColorChip Component;
+            //this.this.application.ninja.stage.textTool.foreColor
+
         }
     },
 
     handleFontColorChange: {
         value: function(e) {
-            this.application.ninja.stage.textTool.element.style.color = e._event.color.css;
+            this.application.ninja.stage.textTool.foreColor = e._event.color.css;
             this.application.ninja.stage.textTool.element.focus();
             //this.application.ninja.stage.textTool.doAction("forecolor",e._event.color.css);
 
-- 
cgit v1.2.3