From d52aca45e0357b5597e13d9b74998abb75fabea5 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 16 Feb 2012 10:54:48 -0800
Subject: integrating the latest montage fixes for v0.6 into master

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../montage/ui/select-input.reel/select-input.js   | 53 ++++++++++------------
 1 file changed, 24 insertions(+), 29 deletions(-)

(limited to 'node_modules/montage/ui/select-input.reel/select-input.js')

diff --git a/node_modules/montage/ui/select-input.reel/select-input.js b/node_modules/montage/ui/select-input.reel/select-input.js
index 76de1a5a..09a064d4 100644
--- a/node_modules/montage/ui/select-input.reel/select-input.js
+++ b/node_modules/montage/ui/select-input.reel/select-input.js
@@ -7,14 +7,8 @@
 var Montage = require("montage").Montage,
     Component = require("ui/component").Component,
     ArrayController = require("ui/controller/array-controller").ArrayController,
-    NativeControl = require("ui/native-control").NativeControl;
-
-var STRING_CLASS = '[object String]';
-var _toString = Object.prototype.toString;
-
-var isString = function(object) {
-    return _toString.call(object) === STRING_CLASS;
-};
+    NativeControl = require("ui/native-control").NativeControl,
+    PressComposer = require("ui/composer/press-composer").PressComposer;
 
 var SelectInput = exports.SelectInput =  Montage.create(NativeControl, {
 
@@ -154,9 +148,6 @@ var SelectInput = exports.SelectInput =  Montage.create(NativeControl, {
 
     deserializedFromTemplate: {
         value: function() {
-            // @todo - Need a better way to do this.
-            var fn = Object.getPrototypeOf(SelectInput).deserializedFromTemplate;
-            fn.call(this);
 
             /*
             1) If <option> is provided in the markup but contentController is not,
@@ -168,18 +159,6 @@ var SelectInput = exports.SelectInput =  Montage.create(NativeControl, {
         }
     },
 
-    /**
-    Description TODO
-    @function
-    */
-    prepareForDraw: {
-        enumerable: false,
-        value: function() {
-            var el = this.element;
-            el.addEventListener("focus", this);
-            el.addEventListener('change', this);
-        }
-    },
 
     _removeAll: {
         value: function(elem) {
@@ -192,12 +171,11 @@ var SelectInput = exports.SelectInput =  Montage.create(NativeControl, {
 
     _refreshOptions: {
         value: function() {
-            console.log('==== refreshOptions ====');
             var arr = this.content||[], len = arr.length, i, option;
             var text, value;
             for(i=0; i< len; i++) {
                 option = document.createElement('option');
-                if(isString(arr[i])) {
+                if(String.isString(arr[i])) {
                     text = value = arr[i];
                 } else {
                     text = arr[i][this.textPropertyPath || 'text'];
@@ -217,6 +195,26 @@ var SelectInput = exports.SelectInput =  Montage.create(NativeControl, {
         }
     },
 
+    /**
+    Description TODO
+    @function
+    */
+    prepareForDraw: {
+        enumerable: false,
+        value: function() {
+            this.element.addEventListener("focus", this);
+            this.element.addEventListener('change', this);
+        }
+    },
+
+    prepareForActivationEvents: {
+        value: function() {
+            // add pressComposer to handle the claimPointer related work
+            var pressComposer = PressComposer.create();
+            this.addComposer(pressComposer);
+        }
+    },
+
     /**
     Description TODO
     @function
@@ -242,7 +240,7 @@ var SelectInput = exports.SelectInput =  Montage.create(NativeControl, {
             var arr = this.content||[], len = arr.length, i;
             var text, value;
             for(i=0; i< len; i++) {
-                if(isString(arr[i])) {
+                if(String.isString(arr[i])) {
                     value = arr[i];
                 } else {
                     value = arr[i][this.valuePropertyPath  || 'value'];
@@ -288,9 +286,6 @@ var SelectInput = exports.SelectInput =  Montage.create(NativeControl, {
     handleChange: {
         value: function(e) {
             // get selected values and set it on the contentController
-            console.log('selection changed');
-            console.log(this.element.selectedOptions);
-
             //var selectedOptions = this.element.selectedOptions || [];
             // select.selectedOptions does not work on Chrome !
 
-- 
cgit v1.2.3