adding the latest v0.10 montage

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

4 files changed, 68 insertions, 39 deletions

diff --git a/node_modules/montage/ui/token-field/token-field.reel/token-field.html b/node_modules/montage/ui/token-field/token-field.reel/token-field.html
index 0335de13..2a2d98d4 100644
--- a/node_modules/montage/ui/token-field/token-field.reel/token-field.html
+++ b/node_modules/montage/ui/token-field/token-field.reel/token-field.html
@@ -9,7 +9,7 @@
 {
 
     "owner": {
-        "prototype": "montage/ui/token-field/token-field.reel",
+        "prototype": "ui/token-field/token-field.reel",
         "properties": {
             "element": {"#": "token-field"},
             "_autocomplete": {"@": "autocomplete"},
@@ -22,18 +22,18 @@
         }
     },
     "tokensController": {
-        "prototype": "montage/ui/controller/array-controller",
+        "prototype": "ui/controller/array-controller",
         "properties": {
             "selectObjectsOnAddition": true,
             "automaticallyOrganizeObjects": true
         },
         "bindings": {
-            "content": {"<<->": "@owner.values"}
+            "content": {"<->": "@owner.values"}
         }
     },
 
     "tokenList": {
-        "prototype": "montage/ui/repetition.reel",
+        "prototype": "ui/repetition.reel",
         "properties": {
             "element": {
                 "#": "token-list"
@@ -45,7 +45,7 @@
     },
 
     "token": {
-        "prototype": "montage/ui/token-field/token.reel",
+        "prototype": "ui/token-field/token.reel",
         "properties": {
             "element": {"#": "token"}
         },
@@ -57,7 +57,7 @@
         }
     },
     "autocomplete": {
-        "prototype": "montage/ui/autocomplete/autocomplete.reel",
+        "prototype": "ui/autocomplete/autocomplete.reel",
         "properties": {
             "element": {"#": "autocomplete"},
             "identifier": "autocomplete",
diff --git a/node_modules/montage/ui/token-field/token-field.reel/token-field.js b/node_modules/montage/ui/token-field/token-field.reel/token-field.js
index 9f08e477..f8070993 100644
--- a/node_modules/montage/ui/token-field/token-field.reel/token-field.js
+++ b/node_modules/montage/ui/token-field/token-field.reel/token-field.js
@@ -15,21 +15,21 @@ KEY_DOWN = 40;
 
 exports.TokenField = Montage.create(Component, {
 
-    delegate: {value: null},
+    delegate: {value: null, serializable: true},
 
-    values: {value: null},
+    values: {value: null, serializable: true},
 
     /**
     * Path to a String within an Object that is representative of the Object
     */
-    textPropertyPath: {value: null},
+    textPropertyPath: {value: null, serializable: true},
 
     /**
     * Allow ad-hoc strings (strings that do not have corresponding represented object) to be entered.
     */
-    allowAdHocValues: {value: null},
+    allowAdHocValues: {value: null, serializable: true},
 
-    placeholder: {value: null},
+    placeholder: {value: null, serializable: true},
 
 
     // private
@@ -47,11 +47,12 @@ exports.TokenField = Montage.create(Component, {
         }
     },
 
-    _tokensController: {value: null},
-    _tokenList: {value: null, enumerable: false},
-    _autocomplete: {value: null, enumerable: false},
+    _tokensController: {value: null, serializable: true},
+    _tokenList: {value: null, serializable: true},
+    _autocomplete: {value: null, serializable: true},
     __autocompleteValue: {value: null},
     _autocompleteValue: {
+        serializable: true,
         get: function() {
             return this.__autocompleteValue;
         },
@@ -62,6 +63,7 @@ exports.TokenField = Montage.create(Component, {
 
     __suggestedValue: {value: null},
     _suggestedValue: {
+        serializable: true,
         get: function() {
             return this.__suggestedValue;
         },
@@ -84,6 +86,8 @@ exports.TokenField = Montage.create(Component, {
                     this.values.push(this.__suggestedValue);
                     this._autocomplete.value = '';
                 }
+                // nullify the value as autocomplete.value is empty
+                this.__suggestedValue = null;
 
             }
         }
@@ -129,7 +133,6 @@ exports.TokenField = Montage.create(Component, {
     },
 
     handleKeyup: {
-        enumerable: false,
         value: function(e) {
             var code = e.keyCode;
             //console.log('keyCode', code);
@@ -150,7 +153,8 @@ exports.TokenField = Montage.create(Component, {
                         // check if the selected token is the last one
                         if(selectedIndexes && selectedIndexes.length > 0) {
                             // removes the selected one
-                            this._tokensController.remove();
+                            this._tokensController.removeObjectsAtSelectedIndexes();
+                            this._tokensController.selectedIndexes = [];
                         } else {
                             this._tokensController.selectedIndexes = [this.values.length-1];
                         }
diff --git a/node_modules/montage/ui/token-field/token.reel/token.html b/node_modules/montage/ui/token-field/token.reel/token.html
index 54ba266e..c478ef0c 100644
--- a/node_modules/montage/ui/token-field/token.reel/token.html
+++ b/node_modules/montage/ui/token-field/token.reel/token.html
@@ -9,7 +9,7 @@
 {
 
     "tokenText": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "ui/dynamic-text.reel",
         "properties": {
             "element": {"#": "token-text"}            
         },
@@ -18,7 +18,7 @@
         }
     },
     "tokenDelete": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "ui/dynamic-text.reel",
         "properties": {
             "element": {"#": "token-delete"},
             "value": "✕"
@@ -26,7 +26,7 @@
     },
 
     "owner": {
-        "prototype": "montage/ui/token-field/token.reel",
+        "prototype": "ui/token-field/token.reel",
         "properties": {
             "element": {"#": "token"},