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

10 files changed, 212 insertions, 152 deletions

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 08e87bf0..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) {
@@ -189,17 +176,18 @@ 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
                     
                     this._matchIndex = 0;                    
                     this.matches = this.hints.filter(function(h) {
+                        if(!h) { return false; }
                         return h.indexOf(val) === 0;
                     }).sort();
                     
@@ -275,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);
@@ -309,7 +271,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"
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 3a9661f5..5b175f49 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.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/>
@@ -95,6 +95,9 @@
             "ZoomTool1": {
                 "prototype": "js/tools/ZoomTool"
             },
+            "BindingTool1": {
+                "prototype": "js/tools/BindingTool"
+            },
 
             "disable": {
                 "prototype": "montage/ui/condition.reel",
@@ -126,7 +129,11 @@
                     "EraserTool":             {"@": "EraserTool1"},
                     "RotateStageTool3D":      {"@": "RotateStageTool3D1"},
                     "PanTool":                {"@": "PanTool1"},
-                    "ZoomTool":               {"@": "ZoomTool1"}
+                    "ZoomTool":               {"@": "ZoomTool1"},
+                    "bindingTool":            {"@": "BindingTool1"},
+                    "components": [
+                        {"@": "repetition1"}
+                    ]