rsence-pre 2.3.0.18 → 2.3.0.19

data/js/core/util/util_methods/util_methods.coffee

@@ -1,103 +1,281 @@
-UtilMethods = HClass.extend
-  
-  arrIncludes: (_arr,_what)->
-    _arr.indexOf(_what) != -1
+UtilMethods = (->
+  _classBase =
+    arrIncludes: (_arr,_what)->
+      _arr.indexOf(_what) != -1
 
-  # List of primitive object type's chars
-  _builtinTypeChr: [
-    'b' # boolean
-    'n' # number
-    's' # string
-  ]
+    # List of primitive object type's chars
+    _builtinTypeChr: [
+      'b' # boolean
+      'n' # number
+      's' # string
+    ]
 
-  getValueById: (_id)->
-    COMM.Values.values[_id]
+    getValueById: (_id)->
+      COMM.Values.values[_id]
 
-  ###
-  # Returns object type as a single-char string.
-  # Use this method to detect the type of the object given.
-  #
-  # Returns the type of the object given as a character code. Returns false,
-  # if unknown or unsupported objcet type.
-  #
-  # Returns:
-  # _One of the following:_
-  # - 'a': Array
-  # - 'h': Hash (Generic Object)
-  # - 'd': Date
-  # - 'b': Boolean (true/false)
-  # - 'n': Number (integers and floats)
-  # - 's': String
-  # - '~': Null
-  # - '-': Undefined
-  # - false: unknown
-  ###
-  typeChr: (_obj)->
-    return '-' unless _obj?
-    return '~' if _obj == null
-    _typeChr = (typeof _obj).slice(0,1)
-    return _typeChr if @arrIncludes(@_builtinTypeChr,_typeChr)
-    if _typeChr == 'o'
-      return 'a' if _obj.constructor == Array
-      return 'h' if _obj.constructor == Object
-      return 'd' if _obj.constructor == Date
-    return false
+    ###
+    # Returns object type as a single-char string.
+    # Use this method to detect the type of the object given.
+    #
+    # Returns the type of the object given as a character code. Returns false,
+    # if unknown or unsupported objcet type.
+    #
+    # Returns:
+    # _One of the following:_
+    # - 'a': Array
+    # - 'h': Hash (Generic Object)
+    # - 'd': Date
+    # - 'b': Boolean (true/false)
+    # - 'n': Number (integers and floats)
+    # - 's': String
+    # - '~': Null
+    # - '-': Undefined
+    # - false: unknown
+    ###
+    typeChr: (_obj)->
+      return '~' if _obj == null
+      return '-' unless _obj?
+      _typeChr = (typeof _obj).slice(0,1)
+      return _typeChr if @arrIncludes(@_builtinTypeChr,_typeChr)
+      if _typeChr == 'o'
+        return 'a' if _obj.constructor == Array
+        return 'h' if _obj.constructor == Object
+        return 'd' if _obj.constructor == Date
+      return false
 
-  baseStrToNum: (_str, _base)->
-    return null if 's' != @typeChr(_str)
-    _base = 10 unless _base?
-    parseInt(_str, _base)
+    baseStrToNum: (_str, _base)->
+      return null if 's' != @typeChr(_str)
+      _base = 10 unless _base?
+      parseInt(_str, _base)
 
-  baseNumToStr: (_num, _base)->
-    return null if 'n' != @typeChr(_num)
-    _base = 10 unless _base?
-    _num.toString(_base)
+    baseNumToStr: (_num, _base)->
+      return null if 'n' != @typeChr(_num)
+      _base = 10 unless _base?
+      _num.toString(_base)
 
-  hexToNum: (_hex)->
-    @baseStrToNum(_hex,16)
+    hexToNum: (_hex)->
+      @baseStrToNum(_hex,16)
 
-  numToHex: (_int)->
-    @baseNumToStr(_int,16)
+    numToHex: (_int)->
+      @baseNumToStr(_int,16)
 
-  base36ToNum: (_base36)->
-    @baseStrToNum(_base36,36)
-  
-  numToBase36: (_num)->
-    @baseIntToStr(_num,36)
-  
-  _hexColorLengths: [3,4,6,7]
-  _hexCharacters: ['0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f']
-  _hex3To6Ratio: 4097 # parseInt('1001',16)
-  _normalizeHexColorToNum: (_color)->
-    return null if @typeChr(_color) != 's'
-    _hexLen = _color.length
-    return null unless @arrIncludes(@_hexColorLengths,_hexLen)
-    _color = _color.toLowerCase()
-    _str = ''
-    for _chr, i in _color.split('')
-      continue if i == 0 and _chr == '#' and ( _hexLen == 4 or _hexLen == 7 )
-      return null unless @arrIncludes( @_hexCharacters, _chr )
-      _str += _chr
-    _num = @hexToNum( _str )
-    _num = 0 if _num < 0
-    _num = 16777215 if _num > 16777215
-    _num = _num*@_hex3To6Ratio if _hexLen < 6
-    return _num
-  _normalizeNumToHexColor: (_num)->
-    _num = 0 if _num < 0
-    _num = 16777215 if _num > 16777215
-    _str = @numToHex(_num)
-    _str = '0'+_str until _str.length == 6
-    return '#'+_str
+    base36ToNum: (_base36)->
+      @baseStrToNum(_base36,36)
+    
+    numToBase36: (_num)->
+      @baseIntToStr(_num,36)
+    
+    _hexColorLengths: [3,4,6,7]
+    _hexCharacters: ['0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f']
+    _hex3To6Ratio: 4097 # parseInt('1001',16)
+    _normalizeHexColorToNum: (_color)->
+      return null if @typeChr(_color) != 's'
+      _hexLen = _color.length
+      return null unless @arrIncludes(@_hexColorLengths,_hexLen)
+      _color = _color.toLowerCase()
+      _str = ''
+      for _chr, i in _color.split('')
+        continue if i == 0 and _chr == '#' and ( _hexLen == 4 or _hexLen == 7 )
+        return null unless @arrIncludes( @_hexCharacters, _chr )
+        _str += _chr
+      _num = @hexToNum( _str )
+      _num = 0 if _num < 0
+      _num = 16777215 if _num > 16777215
+      _num = _num*@_hex3To6Ratio if _hexLen < 6
+      return _num
+    _normalizeNumToHexColor: (_num)->
+      _num = 0 if _num < 0
+      _num = 16777215 if _num > 16777215
+      _str = @numToHex(_num)
+      _str = '0'+_str until _str.length == 6
+      if _str[0] == _str[1] and _str[2] == _str[3] and _str[4] == _str[5]
+        _str = _str[0]+_str[2]+_str[4]
+      return '#'+_str
 
-  hexColorAdd: (_hex1,_hex2)->
-    @_normalizeNumToHexColor(
-      @_normalizeHexColorToNum(_hex1) +
-      @_normalizeHexColorToNum(_hex2)
-    )
+    hexColorAdd: (_hex1,_hex2)->
+      @_normalizeNumToHexColor(
+        @_normalizeHexColorToNum(_hex1) +
+        @_normalizeHexColorToNum(_hex2)
+      )
 
-  hexColorSubtract: (_hex1,_hex2)->
-    @_normalizeNumToHexColor(
-      @_normalizeHexColorToNum(_hex1) -
-      @_normalizeHexColorToNum(_hex2)
-    )
+    hexColorSubtract: (_hex1,_hex2)->
+      @_normalizeNumToHexColor(
+        @_normalizeHexColorToNum(_hex1) -
+        @_normalizeHexColorToNum(_hex2)
+      )
+
+    # Regular expression match/replace pairs for string escaping.
+    _stringSubstitutions: [
+      [(/\\/g), '\\\\'],
+      #[(/\b/g), '\\b'],
+      [(/\t/g), '\\t'],
+      [(/\n/g), '\\n'],
+      [(/\f/g), '\\f'],
+      [(/\r/g), '\\r'],
+      [(/"/g),  '\\"']
+    ]
+    # Returns a quoted string (escapes quotation marks and places quotes within)
+    _quoteString: (_str)->
+      for _substitution in @_stringSubstritutions
+        [ _substFrom, _substTo ] = _substitution
+        _str = _str.replace( _substFrom, _substTo )
+      '"'+_str+'"'
+    # (Deprecated/shouldfix): Encodes the native character set to url-encoded unicode.
+    _encodeString: (_str)->
+      console.log 'WARNING: '+'_'+'encodeString shouldn\'t be called, but was called with: '+_str
+      unescape( encodeURIComponent( _str ) )
+    # (Deprecated/shouldfix): Decodes the url-encoded unicode _str to the native character set.
+    _decodeString: (_str)->
+      console.log 'WARNING: '+'_'+'decodeString shouldn\'t be called, but was called with: '+_str
+      try
+        return decodeURIComponent( escape( _str ) )
+      catch e
+        console.log('_'+'decodeString failed for _'+'str: ',_str)
+        return _str
+    # Returns a decoded Array with the decoded content of Array _arr
+    _decodeArr: (_arr)->
+      _output = []
+      for _item in _arr
+        _output.push @decodeObject(_item)
+      _output
+    # Returns a decoded Object of the Object _hash
+    _decodeHash: (_hash)->
+      _output = {}
+      for _key, _value of _hash
+        _output[@decodeObject(_key)] = @decodeObject(_value)
+      _output
+    ## = Description
+     # Decodes a JSON object. Decodes the url-encoded strings within.
+     # 
+     # = Parameters
+     # +_ibj+::  A raw object with special characters contained.
+     # 
+     # = Returns
+     # A version of the object with the contained strings decoded to unicode.
+     # 
+     ##
+    decodeObject: (_obj)->
+      return null unless _obj?
+      _type = @typeChr(_obj)
+      unless _type
+        console.log 'WARNING: decode of '+(typeof _obj)+' not possible'
+        return null
+      # return @_decodeString(_obj) if _type == 's'
+      return @_decodeArr(_obj) if _type == 'a'
+      return @_decodeHash(_obj) if _type == 'h'
+      _obj
+  if window.JSON?
+    _JSON = window.JSON
+    _fun = 'function'
+    _hasJSON = ( typeof _JSON['parse'] == _fun and typeof _JSON['stringify'] == _fun )
+  else
+    _hasJSON = false
+  if _hasJSON
+    _encodeDecodeMethods =
+      encodeObject: (_obj)->
+        try
+          return JSON.stringify( _obj )
+        catch e
+          console.log('invalid json:',_obj)
+          return "{}"
+      
+      # decodeObject: (_obj)->
+      #   return null unless _obj?
+      #   _type = @typeChr(_obj)
+      #   unless _type
+      #     console.log 'WARNING: decode of '+(typeof _obj)+' not possible'
+      #     return null
+      #   return @_decodeString(_obj) if _type == 's'
+      #   if _type == 'a' or _type == 'h'
+      #     try
+      #       return JSON.parse(_obj)
+      #     catch e
+      #       console.log e, _obj
+      #   _obj
+      
+      cloneObject: ( _obj )->
+        unless _obj?
+          console.log 'WARNING: clone of undefined returns null.' if _obj == undefined
+          return null
+        _type = @typeChr(_obj)
+        return null unless _type
+        return JSON.parse( JSON.stringify(_obj) ) if _type == 'a' or _type == 'h'
+        _obj
+  else
+    _encodeDecodeMethods =
+      # Returns the Array _arr as an encoded string
+      _encodeArr: (_arr)->
+        _output = []
+        for _item in _arr
+          _output.push @encodeObject(_item)
+        '['+_output.join(',')+']'
+      # Returns the Object _hash as an encoded string
+      _encodeHash: (_hash)->
+        _output = []
+        for _key, _value of _hash
+          _output.push @encodeObject(_key)+':'+@encodeObject(_value)
+        '{'+_output.join(',')+'}'
+      ## = Description
+       # Encodes any object into an ASCII string. Special characters are url-encoded.
+       # 
+       # = Parameters
+       # +_obj+::  Any object (including primary types)
+       # 
+       # = Returns
+       # A +String+ representation of +_obj+
+       ##
+      encodeObject: (_obj)->
+        return 'null' unless _obj?
+        _type = @typeChr(_obj)
+        unless _obj
+          console.log 'WARNING: encode of '+(typeof _obj)+' not possible'
+          return 'null'
+        return String(_obj) if _type == 'b' or _type == 'n'
+        return @_quoteString(_obj) if _type == 's'
+        # The above with uri-encoding, disabled for now:
+        # return @_quoteString( @_encodeString( _obj ) )
+        return @_encodeArr(_obj) if _type == 'a'
+        return @_encodeHash(_obj) if _type == 'h'
+        return '"@'+String(_obj.getTime()/1000)+'"' if _type == 'd'
+        'null'
+      ## = Description
+       # Makes a deep copy of the object.
+       # 
+       # When you use assignment of a js object, only primitive object
+       # types (strings, numbers and booleans) are copied. This method
+       # makes a deep (nested) clone of the input object.
+       # 
+       # = Parameters
+       # +_obj+:: Any object
+       # 
+       # = Returns
+       # A copy of the object
+       ##
+      cloneObject: (_obj,_shallow)->
+        unless _obj?
+          console.log 'WARNING: clone of undefined returns null.' if _obj == undefined
+          return null
+        _type = @typeChr(_obj)
+        if _type == 'a'
+          _cloned = []
+          if _shallow
+            for _item, i in _obj
+              _cloned[i] = _item
+          else
+            for _item, i in _obj
+              _cloned[i] = @cloneObject( _item )
+          return _cloned
+        else if _type == 'h'
+          _cloned = {}
+          if _shallow
+            for _key, _value of _obj
+              _cloned[_key] = _value
+          else
+            for _key, _value of _obj
+              _cloned[_key] = @cloneObject( _item )
+          return _cloned
+        _obj
+  for _methodName, _methodValue of _encodeDecodeMethods
+    _classBase[_methodName] = _methodValue
+  return HClass.extend(_classBase)
+)()

data/js/datetime/calendar/calendar.coffee

@@ -99,7 +99,7 @@ HCalendar = HControl.extend
   ## See HLocale for more details
   localizedDays: ->
     _str = HLocale.dateTime.strings
-    _arr = HVM.clone( _str.weekDaysShort )
+    _arr = @cloneObject( _str.weekDaysShort )
     _arr.push( _arr.shift() )
     _arr.unshift( _str.weekShort )
     _arr

data/js/datetime/timesheet/timesheet.js

@@ -291,7 +291,7 @@ HTimeSheet = HControl.extend({
     this.dragPreview.bringToFront();
     this.dragPreview.show();
     if( this.activateEditor( this.dragPreview ) ){
-      this.editor.createItem( HVM.clone( this.dragPreview.value ) );
+      this.editor.createItem( this.cloneObject( this.dragPreview.value ) );
     }
     else {
       this.dragPreview.hide();
@@ -375,7 +375,7 @@ HTimeSheet = HControl.extend({
         if( this.activateEditor( this.dragPreview ) ){
           // console.log('drag create');
           this.dragCreated = true;
-          this.editor.createItem( HVM.clone( this.dragPreview.value ) );
+          this.editor.createItem( this.cloneObject( this.dragPreview.value ) );
           return true;
         }
       }
@@ -837,7 +837,7 @@ but not used and not guaranteed to be preserved:
 
     // optimization that ensures the rect and previous value are different before redrawing
     var
-    _valueStr = COMM.Values.encode( this.value ),
+    _valueStr = this.encodeObject( this.value ),
     _rectStr = this.rect.toString(),
     _timeRangeStr = this.options.timeStart+':'+this.options.timeEnd,
     _shaSum = this._sha.strSHA1( _valueStr+_rectStr+_timeRangeStr );

data/js/foundation/control/control.js

@@ -225,7 +225,7 @@ HControl = HView.extend({
       if(typeof _options.bind === 'string'){
         var
         _valueId = _options.bind,
-        _valueObj = HVM.values[_valueId];
+        _valueObj = this.getValueById(_valueId);
         if( _valueObj ){
           _valueObj.bind( _this );
         }

data/js/foundation/control/valueaction/valueaction.js

@@ -1,6 +1,6 @@
 
 var
-HValueAction = HClass.extend({
+HValueAction = UtilMethods.extend({
   constructor: function( _rect, _parent, _options ){
     if( _rect && _rect.hasAncestor && _rect.hasAncestor( HClass ) ){
       _options = _parent;
@@ -17,7 +17,7 @@ HValueAction = HClass.extend({
     if( _options.bind ){
       var _valueObj = _options.bind;
       if( typeof _valueObj == 'string' ){
-        _valueObj = HVM.values[ _valueObj ];
+        _valueObj = this.getValueById( _valueObj );
       }
       _valueObj.bind( this );
     }

data/js/foundation/control/valueresponder/valueresponder.js

@@ -4,7 +4,7 @@
   ** It's implemented by default by +HControl+.
 ***/
 var//RSence.Foundation
-HValueResponder = HClass.extend({
+HValueResponder = UtilMethods.extend({
   
 /** = Description
   * Binds an HValue compatible instance to the component's valueObj. Also 
@@ -35,7 +35,7 @@ HValueResponder = HClass.extend({
   *
   **/
   valueDiffers: function(_value){
-    return (COMM.Values.encode(_value) !== COMM.Values.encode(this.value));
+    return (this.encodeObject(_value) !== this.encodeObject(this.value));
   },
   
 /** = Description
@@ -53,7 +53,7 @@ HValueResponder = HClass.extend({
   *
   **/
   setValue: function(_value) {
-    if(_value !== undefined && this['valueObj'] && this.valueDiffers(_value)) {
+    if(_value !== undefined && this.valueObj && this.valueDiffers(_value)) {
       var _valueManager = COMM.Values;
       this.value = _value;
       if( !~_valueManager._builtinTypeChr.indexOf( _valueManager.type(_value) ) ){
@@ -62,7 +62,7 @@ HValueResponder = HClass.extend({
       else {
         this.valueObj.set( _value );
       }
-      (this['refresh'] !== undefined) && (typeof this.refresh === 'function') && this.refresh();
+      (this.refresh !== undefined) && (typeof this.refresh === 'function') && this.refresh();
     }
     return this;
   }

data/js/foundation/json_renderer/json_renderer.js

@@ -14,7 +14,7 @@
   ** features and documentation as it matures.
 ***/
 //var//RSence.Foundation
-COMM.JSONRenderer = HClass.extend({
+COMM.JSONRenderer = UtilMethods.extend({
   
   version: 1.0,
 
@@ -26,7 +26,7 @@ COMM.JSONRenderer = HClass.extend({
   * +_parent+: The parent view (or app) (Optional)
   **/
   constructor: function(_data, _parent){
-    if((_data['type'] === 'GUITree') && (this.version >= _data['version'])){
+    if((_data.type === 'GUITree') && (this.version >= _data.version)){
       this.data   = _data;
       this.parent = _parent;
       this.byId = {};
@@ -226,22 +226,22 @@ COMM.JSONRenderer = HClass.extend({
 
     _class = this.findInScope( _className );
     
-    if (_class['hasAncestor'] !== undefined){
+    if (_class.hasAncestor !== undefined){
       _isAppClass = _class.hasAncestor( HApplication );
       _isViewClass = _class.hasAncestor( HView );
     }
 
-    _hasId = ( _dataNode['id'] !== undefined ) && ( typeof _dataNode['id'] === 'string' );
-    _hasName = ( _dataNode['name'] !== undefined ) && ( typeof _dataNode['name'] === 'string' );
+    _hasId = ( _dataNode.id !== undefined ) && ( typeof _dataNode.id === 'string' );
+    _hasName = ( _dataNode.name !== undefined ) && ( typeof _dataNode.name === 'string' );
 
     if( _straightParams ){
       _instance = this.initStraight( _class, _dataNode );
     }
-    else if( _dataNode['args'] !== undefined ){
-      _instance = this.initStraight( _class, _dataNode['args'] );
+    else if( _dataNode.args !== undefined ){
+      _instance = this.initStraight( _class, _dataNode.args );
     }
-    else if( _origNode && _origNode['args'] !== undefined ){
-      _instance = this.initStraight( _class, _origNode['args'] );
+    else if( _origNode && _origNode.args !== undefined ){
+      _instance = this.initStraight( _class, _origNode.args );
     }
     if( _instance ){
       if( _hasId ){
@@ -255,11 +255,11 @@ COMM.JSONRenderer = HClass.extend({
     
     // Currently only HView -derived classes are supported, so
     // the rect is mandatory.
-    _rect = _dataNode['rect'];
+    _rect = _dataNode.rect;
     _hasRect = (_rect !== undefined) && (_rect instanceof Array || typeof _rect === 'string');
     if( !_hasRect && _origNode){
-      _hasRect = _origNode['rect'] !== undefined;
-      _rect    = _hasRect?_origNode['rect']:null;
+      _hasRect = _origNode.rect !== undefined;
+      _rect    = _hasRect?_origNode.rect:null;
     }
     if( !_isViewClass ){
       if( _hasRect ){
@@ -268,19 +268,19 @@ COMM.JSONRenderer = HClass.extend({
     }
 
     // Checks, if any sub-views are defined.
-    _hasSubviews = _dataNode['subviews'] !== undefined;
-    _subViews    = _hasSubviews?_dataNode['subviews']:null;
+    _hasSubviews = _dataNode.subviews !== undefined;
+    _subViews    = _hasSubviews?_dataNode.subviews:null;
     if( !_hasSubviews && _origNode){
-      _hasSubviews = _origNode['subviews'] !== undefined;
-      _subViews    = _hasSubviews?_origNode['subviews']:null;
+      _hasSubviews = _origNode.subviews !== undefined;
+      _subViews    = _hasSubviews?_origNode.subviews:null;
     }
     
     // Checks, if any options are defined.
-    _hasOptions  = _dataNode['options'] !== undefined;
-    _options     = _hasOptions?_dataNode['options']:null;
+    _hasOptions  = _dataNode.options !== undefined;
+    _options     = _hasOptions?_dataNode.options:null;
     if( !_hasOptions && _origNode){
-      _hasOptions = _origNode['options'] !== undefined;
-      _options    = _hasOptions?_origNode['options']:null;
+      _hasOptions = _origNode.options !== undefined;
+      _options    = _hasOptions?_origNode.options:null;
     }
     for( i=0; i < _autoOptionItems.length; i++ ){
       _autoOptionItem = _autoOptionItems[i];
@@ -294,34 +294,34 @@ COMM.JSONRenderer = HClass.extend({
     }
     
     // JS Extension block
-    _hasExtension = _dataNode['extend'] !== undefined;
-    _extension    = _hasExtension?_dataNode['extend']:null;
+    _hasExtension = _dataNode.extend !== undefined;
+    _extension    = _hasExtension?_dataNode.extend:null;
     if( !_hasExtension && _origNode){
-      _hasExtension = _origNode['extend'] !== undefined;
-      _extension    = _hasExtension?_origNode['extend']:null;
+      _hasExtension = _origNode.extend !== undefined;
+      _extension    = _hasExtension?_origNode.extend:null;
     }
     
     // JS Extension block
-    _hasBind = _dataNode['bind'] !== undefined;
-    _bind    = _hasBind?_dataNode['bind']:null;
+    _hasBind = _dataNode.bind !== undefined;
+    _bind    = _hasBind?_dataNode.bind:null;
     if( !_hasBind && _origNode){
-      _hasBind = _origNode['bind'] !== undefined;
-      _bind    = _hasBind?_origNode['bind']:null;
+      _hasBind = _origNode.bind !== undefined;
+      _bind    = _hasBind?_origNode.bind:null;
     }
 
-    _hasCall = _dataNode['call'] !== undefined;
+    _hasCall = _dataNode.call !== undefined;
     if( _hasCall ){
-      _call = _dataNode['call'];
+      _call = _dataNode.call;
     }
     
     // JS Definition block
-    _hasDefinition = _dataNode['define'] !== undefined;
-    _definitions   = _hasDefinition?_dataNode['define']:null;
+    _hasDefinition = _dataNode.define !== undefined;
+    _definitions   = _hasDefinition?_dataNode.define:null;
     if( !_hasDefinition && _origNode){
-      _hasDefinition  = _origNode['define'] !== undefined;
-      _definitions    = _hasDefinition?_origNode['define']:null;
+      _hasDefinition  = _origNode.define !== undefined;
+      _definitions    = _hasDefinition?_origNode.define:null;
     }
-    if( _rect === null && _class['hasAncestor'] && _class.hasAncestor( HView ) ) {
+    if( _rect === null && _class.hasAncestor && _class.hasAncestor( HView ) ) {
       console.log( 'Ancestors include HView, but no rect defined!' );
     }
 
@@ -365,16 +365,16 @@ COMM.JSONRenderer = HClass.extend({
             if( _bind instanceof HValue ){
               _options.valueObj = _bind;
             }
-            else if( COMM.Values.values[_bind] !== undefined ){
-              _options.valueObj = COMM.Values.values[_bind];
+            else if( this.getValueById(_bind) !== undefined ){
+              _options.valueObj = this.getValueById(_bind);
             }
             else {
               console.log('renderNode warning; No such valueId:'+_bind);
             }
           }
           else{
-            if(_options['valueObjId'] !== undefined){
-              _options.valueObj = COMM.Values.values[_options['valueObjId']];
+            if(_options.valueObjId !== undefined){
+              _options.valueObj = this.getValueById(_options.valueObjId);
             }
           }
         }
@@ -413,11 +413,11 @@ COMM.JSONRenderer = HClass.extend({
             if( _bind instanceof HValue ){
               _bind.bind( _instance );
             }
-            else if( COMM.Values.values[_bind] !== undefined ){
-              COMM.Values.values[_bind].bind(_instance);
+            else if( this.getValueById(_bind) !== undefined ){
+              this.getValueById(_bind).bind(_instance);
             }
             else {
-              console.log('renderNode warning; No such valueId:'+_bind);
+              console.log('renderNode warning; No such valueId:',_bind);
             }
           }
         }