integrating the latest montage fixes for v0.6 into master

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

11 files changed, 77 insertions, 54 deletions

diff --git a/node_modules/montage/core/converter/converter.js b/node_modules/montage/core/converter/converter.js
index abce44e2..a23d2702 100755
--- a/node_modules/montage/core/converter/converter.js
+++ b/node_modules/montage/core/converter/converter.js
@@ -20,16 +20,6 @@ var FUNCTION_CLASS = '[object Function]',
 
 var _toString = Object.prototype.toString;
 
-// TODO should maybe move these into String.isString and Number.isNumber to parallel Array.isArray
-
-/**
-    @exports module:montage/core/converter#isString
-    @function
-*/
-var isString = function(object) {
-    return _toString.call(object) === STRING_CLASS;
-};
-exports.isString = isString;
 
 /**
     @exports module:montage/core/converter#isNumber
diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js
index f0d3e540..f484f7aa 100755
--- a/node_modules/montage/core/converter/date-converter.js
+++ b/node_modules/montage/core/converter/date-converter.js
@@ -2502,16 +2502,13 @@ var _toString = Object.prototype.toString;
 var isDate = function(object) {
     return _toString.call(object) === DATE_CLASS;
 };
-var isString = function(object) {
-    return _toString.call(object) === STRING_CLASS;
-};
 var isNumber = function(object) {
     return _toString.call(object) === NUMBER_CLASS;
 };
 
 var formatDate = function(v, format) {
     var date;
-    if (isString(v)) {
+    if (String.isString(v)) {
         // try to create a Date instance from the string
         // date must be a string that can be parsed by Date
         // see - http://www.w3schools.com/jsref/jsref_parse.asp
@@ -2605,7 +2602,7 @@ var DateConverter = exports.DateConverter = Montage.create(Converter,/** @lends
     */
     convert: {
         value: function(v) {
-            if (isDate(v) || isString(v) || isNumber(v)) {
+            if (isDate(v) || String.isString(v) || isNumber(v)) {
                 return formatDate(v, this.pattern);
             }
             return v;
@@ -2617,6 +2614,9 @@ var DateConverter = exports.DateConverter = Montage.create(Converter,/** @lends
     */
     revert: {
         value: function(v) {
+            if(isDate(v)) {
+                return v;
+            }
             this.validator.pattern = this.pattern;
 
             var result = this.validator.validate(v);
diff --git a/node_modules/montage/core/core.js b/node_modules/montage/core/core.js
index 8c1f4249..ff94f303 100755
--- a/node_modules/montage/core/core.js
+++ b/node_modules/montage/core/core.js
@@ -12,6 +12,16 @@
  */
 require("core/shim");
 
+var ATTRIBUTE_PROPERTIES = "AttributeProperties",
+    UNDERSCORE = "_",
+    PROTO = "__proto__",
+    VALUE = "value",
+    ENUMERABLE = "enumerable",
+    SERIALIZABLE = "serializable",
+    MODIFY = "modify";
+
+
+
 /**
  @external Object
  */
@@ -78,14 +88,14 @@ Object.defineProperty(M, "create", {
     }
 });
 
-var extendedPropertyAttributes = ["serializable", "modify"];
+var extendedPropertyAttributes = [SERIALIZABLE, MODIFY];
 
 // Extended property attributes, the property name format is "_" + attributeName + "AttributeProperties"
 /**
 @member external:Object#extendedPropertyAttributes
 */
 extendedPropertyAttributes.forEach(function(name) {
-    Object.defineProperty(Object.prototype, "_" + name + "AttributeProperties", {
+    Object.defineProperty(Object.prototype, UNDERSCORE + name + ATTRIBUTE_PROPERTIES, {
         enumerable: false,
         configurable: false,
         writable: false,
@@ -112,11 +122,11 @@ Object.defineProperty(M, "defineProperty", {
     value: function(obj, prop, descriptor) {
         var dependencies = descriptor.dependencies;
         //reset defaults appropriately for framework.
-        if ("__proto__" in descriptor) {
-            descriptor.__proto__ = ("value" in descriptor ? (typeof descriptor.value === "function" ? _defaultFunctionValueProperty : _defaultObjectValueProperty) : _defaultAccessorProperty);
+        if (PROTO in descriptor) {
+            descriptor.__proto__ = (VALUE in descriptor ? (typeof descriptor.value === "function" ? _defaultFunctionValueProperty : _defaultObjectValueProperty) : _defaultAccessorProperty);
         } else {
             var defaults;
-            if ("value" in descriptor) {
+            if (VALUE in descriptor) {
                 if (typeof descriptor.value === "function") {
                     defaults = _defaultFunctionValueProperty;
                 } else {
@@ -133,7 +143,7 @@ Object.defineProperty(M, "defineProperty", {
         }
 
 
-        if (!descriptor.hasOwnProperty("enumerable") && prop.charAt(0) === "_") {
+        if (!descriptor.hasOwnProperty(ENUMERABLE) && prop.charAt(0) === UNDERSCORE) {
             descriptor.enumerable = false;
         }
         if (dependencies) {
@@ -146,13 +156,13 @@ Object.defineProperty(M, "defineProperty", {
 
         }
 
-        if ("serializable" in descriptor) {
+        if (SERIALIZABLE in descriptor) {
             // get the _serializableAttributeProperties property or creates it through the entire chain if missing.
-            getAttributeProperties(obj, "serializable")[prop] = descriptor.serializable;
+            getAttributeProperties(obj, SERIALIZABLE)[prop] = descriptor.serializable;
         }
 
-        if ("modify" in descriptor) {
-            getAttributeProperties(obj, "modify")[prop] = descriptor.modify;
+        if (MODIFY in descriptor) {
+            getAttributeProperties(obj, MODIFY)[prop] = descriptor.modify;
         }
 
         //this is added to enable value properties with [] or Objects that are new for every instance
@@ -268,7 +278,7 @@ Object.defineProperty(M, "defineProperty", {
                         }
                     });
                 }
-            })("_" + prop, descriptor.value);
+            })(UNDERSCORE + prop, descriptor.value);
 
         } else {
             return Object.defineProperty(obj, prop, descriptor);
@@ -390,7 +400,7 @@ M.defineProperty(M, "removeDependencyFromProperty", {value: function(obj, indepe
 }});
 
 function getAttributeProperties(proto, attributeName) {
-    var attributePropertyName = "_" + attributeName + "AttributeProperties";
+    var attributePropertyName = UNDERSCORE + attributeName + ATTRIBUTE_PROPERTIES;
 
     if (proto.hasOwnProperty(attributePropertyName)) {
         return proto[attributePropertyName];
@@ -474,7 +484,7 @@ M.defineProperty(M, "getSerializablePropertyNames", {value: function(anObject) {
      */
 M.defineProperty(M, "getPropertyAttribute", {value: function(anObject, propertyName, attributeName) {
 
-    var attributePropertyName = "_" + attributeName + "AttributeProperties",
+    var attributePropertyName = UNDERSCORE + attributeName + ATTRIBUTE_PROPERTIES,
         attributes = anObject[attributePropertyName];
 
     if (attributes) {
@@ -491,7 +501,7 @@ M.defineProperty(M, "getPropertyAttribute", {value: function(anObject, propertyN
      */
 M.defineProperty(M, "getPropertyAttributes", {value: function(anObject, attributeName) {
     var attributeValues = {},