rsence-pre 2.3.0.18 → 2.3.0.19

data/VERSION

@@ -1 +1 @@
-2.3.0.18.pre
+2.3.0.19.pre

data/js/chat/chat_panel/chat_panel.coffee

@@ -21,9 +21,9 @@ HChatPanel = HScrollView.extend
     @userIcons = []
     _users = @value.users
     _themeUser = {}
-    _defaultBubble = HVM.clone( HSpeechBubble.prototype.controlDefaults.prototype.colors )
+    _defaultBubble = @cloneObject( HSpeechBubble.prototype.controlDefaults.prototype.colors )
     for _userId, _user of _users
-      _colors = HVM.clone( _defaultBubble )
+      _colors = @cloneObject( _defaultBubble )
       if _user.color_bg?
         _gradientStart = _user.color_bg
         _gradientStep1 = @hexColorSubtract( _gradientStart, '#111' )

data/js/comm/queue/queue.js

@@ -170,6 +170,7 @@ COMM.Queue = HApplication.extend({
   **/
   unshiftEval: function(_evalStr,_arguments){
     var _function;
+    console.log('WARNING: COMM.unshiftEval is deprecated; Update your code!');
     eval('_function = function(){'+_evalStr+'}');
     this.unshift(_function);
   },
@@ -179,7 +180,25 @@ COMM.Queue = HApplication.extend({
   **/
   pushEval: function(_evalStr){
     var _function;
+    console.log('WARNING: COMM.pushEval is deprecated; Update your code!');
     eval('_function = function(){'+_evalStr+'}');
     this.push(_function);
+  },
+
+  _scripts: {},
+
+  addScript: function(_scriptId,_scriptSrc){
+    var
+    _script = document.createElement('script');
+    this._scripts[_scriptId] = _script;
+    _script.textContent = _scriptSrc;
+    document.head.appendChild(_script);
+  },
+
+  delScript: function(_scriptId){
+    var
+    _script = this._scripts[_scriptId];
+    document.head.removeChild(_script);
+    delete this._scripts[_scriptId];
   }
 }).nu();

data/js/comm/transporter/transporter.js

@@ -33,11 +33,11 @@ COMM.Transporter = HApplication.extend({
   },
 
   _detectNativeJSONSupport: function(){
-    if(window['JSON']){
+    if(window.JSON){
       var
       _JSON = window.JSON,
       _fun = 'function';
-      if((typeof _JSON['parse'] === _fun) && (typeof _JSON['stringify'] === _fun)){
+      if((typeof _JSON.parse === _fun) && (typeof _JSON.stringify === _fun)){
         this.parseResponseArray = this._nativeParseResponseArray;
       }
     }
@@ -70,7 +70,7 @@ COMM.Transporter = HApplication.extend({
   // },
   
   parseResponseArray: function( _responseText ){
-    return HVM.decode( _responseText );
+    return this.decodeObject( _responseText );
   },
   
   _nativeParseResponseArray: function( _responseText ){
@@ -95,16 +95,16 @@ COMM.Transporter = HApplication.extend({
         _valueManager.create( _valueId, _valueData );
       }
     }
-    if(_values['set'] instanceof Array){
-      for(i=0;i<_values['set'].length;i++){
-        _valueId = _values['set'][i][0];
-        _valueData = _values['set'][i][1];
+    if(_values.set instanceof Array){
+      for(i=0;i<_values.set.length;i++){
+        _valueId = _values.set[i][0];
+        _valueData = _values.set[i][1];
         _valueManager.s( _valueId, _valueData );
       }
     }
-    if(_values['del'] instanceof Array){
-      for(i=0;i<_values['del'].length;i++){
-        _valueId = _values['del'][i];
+    if(_values.del instanceof Array){
+      for(i=0;i<_values.del.length;i++){
+        _valueId = _values.del[i];
         _valueManager.del( _valueId );
       }
     }
@@ -145,20 +145,29 @@ COMM.Transporter = HApplication.extend({
       _session.newKey(_sesKey);
     }
     _this.setValues( _values );
+    _outputScript = '(function(_queue){';
     for(;i<_responseArrayLen;i++){
-      try {
-        _queue.pushEval( _responseArray[i] );
-      }
-      catch(e) {
-        _this._clientEvalError = _queue.clientException( e, _responseArray[i] );
-      }
+      _outputScript += '_queue.push( (function(){';
+      _outputScript += _responseArray[i];
+      _outputScript += '}) );';
+      // try {
+      //   console.log(_responseArray[i]);
+      //   _queue.pushEval( _responseArray[i] );
+      // }
+      // catch(e) {
+      //   console.log('clientEvalError:',_queue.clientException( e, _responseArray[i] ));
+      //   _this._clientEvalError = _queue.clientException( e, _responseArray[i] );
+      // }
     }
+    _outputScript += '_queue.push( (function(){COMM.Transporter.flushBusy();}) );';
+    _outputScript += '_queue.push( (function(){_queue.delScript("'+_sesKey+'");}) );';
+    _outputScript += '_queue.flush();';
+    _outputScript += '})(COMM.Queue);';
+    _queue.addScript(_sesKey,_outputScript);
     if(_this._serverInterruptView && _sesKey !== '' ){
       _this._serverInterruptView.die();
       _this._serverInterruptView = false;
     }
-    _queue.push( function(){COMM.Transporter.flushBusy();} );
-    _queue.flush();
   },
   
 /** Sets the +busy+ flag to false and resynchronizes immediately,
@@ -314,7 +323,7 @@ COMM.Transporter = HApplication.extend({
     // console.log('sync.');
     this.busy = true;
     var _now = new Date().getTime();
-    if(window['sesWatcher'] && window.sesWatcher['sesTimeoutValue']){
+    if(window.sesWatcher && window.sesWatcher.sesTimeoutValue){
       // Sets the value of the session watcher to the current time. It could cause an unnecessary re-sync poll immediately after this sync otherwise.
       sesWatcher.sesTimeoutValue.set( _now );
     }
@@ -324,7 +333,7 @@ COMM.Transporter = HApplication.extend({
     // _boundary = _now.toString(36)+(Math.random()*10000).toString(36)+(Math.random()*10000).toString(36),
     // _separator = '--'+_boundary,
     // _errorMessage = _this.getClientEvalError(),
-    _body = HVM.sync();
+    _body = COMM.Values.sync();
     // _body = _separator+
     //   '\r\nContent-Disposition: form-data; name="ses_key"\r\nContent-Type: text/plain\r\n'+
     //   '\r\n'+COMM.Session.ses_key+'\r\n'+_separator;

data/js/comm/values/values.js

@@ -138,292 +138,6 @@ COMM.Values = UtilMethods.extend({
     return this.typeChr( _obj );
   },
   
-  // Returns an encoded version of the array _arr as a string
-  _encodeArr: function(_arr){
-    var _str = '[',
-        _output = [],
-        _len = _arr.length,
-        _this = this,
-        _item,
-        i = 0;
-    for(;i<_len;i++){
-      _item = _this.encode(_arr[i]);
-      _output.push( _item );
-    }
-    _str += _output.join(',')+']';
-    return _str;
-  },
-  
-  // Returns a decoded array with decoded content of array _arr
-  _decodeArr: function(_arr){
-    var _output = [],
-        _len = _arr.length,
-        _this = this,
-        _item,
-        i = 0;
-    for(;i<_len;i++){
-      _item = _this.decode(_arr[i]);
-      _output.push( _item );
-    }
-    return _output;
-  },
-  
-  // Returns an encoded version of the Hash (Object) _hash as a string
-  _encodeHash: function(_hash){
-    var _str = '{',
-        _output = [],
-        _this = this,
-        _key,
-        _value;
-    for(_key in _hash){
-      _value = _hash[_key];
-      _output.push( _this.encode( _key ) + ':' + _this.encode( _value ) );
-    }
-    _str += _output.join(',')+'}';
-    return _str;
-  },
-  
-  // Returns a decoded version of the Hash (Object) _hash
-  _decodeHash: function(_hash){
-    var _output = {},
-        _this = this,
-        _key,
-        _value;
-    for(_key in _hash){
-      _value = _hash[_key];
-      _output[_this.decode(_key)] = _this.decode(_value);
-    }
-    return _output;
-  },
-  
-  // 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),  '\\"']
-  ],
-  
-  // Quotes a string (escapes quotation marks and places quotes around)
-  _quoteString: function(_str){
-    var _this = this,
-        _substitutions = _this._stringSubstitutions,
-        i = 0, _len = _substitutions.length,
-        _line, _from, _to, _output = '';
-    for(;i<_len;i++){
-      _line = _substitutions[i];
-      _from = _line[0];
-      _to = _line[1];
-      _str = _str.replace( _from, _to );
-    }
-    return '"' + _str + '"';
-  },
-  
-  // Encodes the native character set to url-encoded unicode.
-  // Likely causes issues with non-ascii strings, shouldn't be called (for now).
-  _encodeString: function(_str){
-    console.log( 'WARNING: encodeString called with string: ',_str );
-    var _outStr;
-    try {
-      _outStr = unescape( encodeURIComponent( _str ) );
-    }
-    catch(e) {
-      _outStr = _str;
-    }
-    return _outStr;
-  },
-  
-  // Decodes the url-encoded unicode to the native character set
-  _decodeString: function(_str){
-    var _outStr;
-    try {
-      _outStr = decodeURIComponent( escape( _str ) );
-    }
-    catch(e) {
-      _outStr = _str;
-    }
-    return _outStr;
-  },
-  
-/** = Description
-  * Encodes an object to a ascii string (special characters url-encoded).
-  *
-  * = Parameters
-  * +_obj+::  Any object
-  *
-  * = Returns
-  * A +String+ representation of the +_obj+
-  *
-  **/
-  encode: function(_obj){
-    var _str, _type, _this = this;
-    if(_obj === null){
-      return 'null';
-    }
-    else if(_obj !== undefined){
-      _type = _this.type(_obj);
-      if(!_type){
-        return 'null';
-      }
-      switch(_type){
-        case 'b': _str = String(_obj); break;
-        case 'n': _str = String(_obj); break;
-        case 's': _str = _this._quoteString(_obj); break;
-        // Might need further investigation, but _encodeString is disabled for now:
-        // case 's': _str = _this._quoteString(_this._encodeString(_obj)); break;
-        case 'd': _str = '"@'+String(_obj.getTime()/1000)+'"'; break;
-        case 'a': _str = _this._encodeArr(_obj); break;
-        case 'h': _str = _this._encodeHash(_obj); break;
-        default:  _str = 'null'; break;
-      }
-    }
-    else {
-      return 'null';
-    }
-    return _str;
-  },
-  
-  _nativeEncode: function(_obj){
-    try{
-      return JSON.stringify( _obj );
-    }
-    catch(e){
-      console.log('invalid json:',_obj);
-      return "{}";
-    }
-  },
-  
-  
-/** = Description
-  * Decodes a JSON object. Decodes url-encoded strings contained.
-  *
-  * = Parameters
-  * +_ibj+::  A raw object with special characters url-encoded.
-  *
-  * = Returns
-  * An version of the object with the contained strings decoded to unicode.
-  *
-  **/
-  decode: function(_ibj){
-    var _obj, _type, _this = this;
-    if(_ibj !== null && _ibj !== undefined){
-      _type = _this.type(_ibj);
-      if(!_type){
-        return null;
-      }
-      switch(_type){
-        case 'b': _obj = _ibj; break;
-        case 'n': _obj = _ibj; break;
-        case 's': _obj = _this._decodeString(_ibj); break;
-        case 'd': _obj = _ibj; break;
-        case 'a': _obj = _this._decodeArr(_ibj); break;
-        case 'h': _obj = _this._decodeHash(_ibj); break;
-        default: _obj = null; break;
-      }
-    }
-    else {
-      return null;
-    }
-    return _obj;
-  },
-  
-  _nativeDecode: function(_ibj){
-    var _obj, _type, _this = this;
-    if(_ibj !== null && _ibj !== undefined){
-      _type = _this.type(_ibj);
-      if(!_type){
-        return null;
-      }
-      switch(_type){
-        case 'b': _obj = _ibj; break;
-        case 'n': _obj = _ibj; break;
-        case 's': _obj = _this._decodeString(_ibj); break;
-        case 'd': _obj = _ibj; break;
-        case 'a': _obj = JSON.parse(_ibj); break;
-        case 'h': _obj = JSON.parse(_ibj); break;
-        default: _obj = null; break;
-      }
-    }
-    else {
-      return null;
-    }
-    return _obj;
-  },
-  
-/** = 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.
-  *
-  **/
-  clone: function( _obj, _shallow ){
-    if(_obj === null){
-      return null;
-    }
-    else if (_obj === undefined){
-      console.log('Undefined object, supplementing with null.');
-      return null;
-    }
-    var _item,
-        _cloned;
-    if( _obj instanceof Array ){
-      _cloned = [];
-      for( _item = 0; _item < _obj.length; _item ++ ){
-        if(_shallow){
-          _cloned[ _item ] = _obj[ _item ];
-        }
-        else {
-          _cloned[ _item ] = this.clone( _obj[ _item ] );
-        }
-      }
-      return _cloned;
-    }
-    else if( _obj instanceof Object ){
-      _cloned = {};
-      for( _item in _obj ){
-        if(_shallow){
-          _cloned[ _item ] = _obj[ _item ];
-        }
-        else {
-          _cloned[ _item ] = this.clone( _obj[ _item ] );
-        }
-      }
-      return _cloned;
-    }
-    else {
-      return _obj;
-    }
-  },
-  
-  _nativeClone: function( _obj ){
-    if(_obj === null){
-      return null;
-    }
-    else if (_obj === undefined){
-      console.log('Undefined object, supplementing with null.');
-      return null;
-    }
-    if( (_obj instanceof Array) || (_obj instanceof Object) ){
-      // conversion via encoding/decoding via JSON string.
-      return JSON.parse( JSON.stringify( _obj ) );
-    }
-    else {
-      // no conversion needed (numbers, strings, booleans etc..)
-      return _obj;
-    }
-  },
-  
 /** = Description
   * Returns an URI-encoded string representation of all the changed values to
   * synchronize to the server.
@@ -459,41 +173,19 @@ COMM.Values = UtilMethods.extend({
     return _this.encode(_response);
   },
 
-  // Old sync implementation:
-  // sync: function(){
-  //   if(this.tosync.length===0){
-  //     return false;
-  //   }
-  //   var
-  //   _syncValues = {},
-  //   _this = this,
-  //   _values = _this.values,
-  //   _tosync = _this.tosync,
-  //   _len = _tosync.length,
-  //   i = 0, _id, _value;
-  //   for(;i<_len;i++){
-  //     _id = _tosync.shift();
-  //     _value = _values[_id].value;
-  //     _syncValues[_id] = _value;
-  //   }
-  //   return encodeURIComponent(_this.encode(_syncValues));
-  // },
-  
-  _detectNativeJSONSupport: function(){
-    if(window['JSON']){
-      var
-      _JSON = window.JSON,
-      _fun = 'function';
-      if((typeof _JSON['parse'] === _fun) && (typeof _JSON['stringify'] === _fun)){
-        // console.log('Has native JSON support. Re-routing encode, decode and clone methods of COMM.Values...');
-        this.clone = this._nativeClone;
-        this.encode = this._nativeEncode;
-        // this.decode = this._nativeDecode;
-      }
-    }
+  encode: function(_obj){
+    return this.encodeObject(_obj);
+  },
+
+  decode: function(_obj){
+    return this.decodeObject(_obj);
+  },
+
+  clone: function(_obj){
+    return this.cloneObject(_obj);
   }
+  
 });
-COMM.Values._detectNativeJSONSupport();
 
 // Backwards compatibility assignment for code that still
 // uses HVM as a reference of the Value Manager:

data/js/controls/dialogs/alert_sheet/alert_sheet.js

@@ -22,6 +22,7 @@ HAlertSheet = HSheet.extend({
   * and an alert button.
   **/
   drawSubviews: function(){
+    this.base();
     this.icon = HImageView.nu(
       [ 16, 16, 48, 48 ],
       this, {

data/js/controls/onoffbutton/onoffbutton.coffee

@@ -25,7 +25,7 @@ HOnOffButton = HCheckbox.extend
     @offLabel = _label
     @refreshLabelOff()
   refreshLabelOff: ->
-    @setMarkupOfPart( 'offlabel', @labelOff )
+    @setMarkupOfPart( 'offlabel', @labelOff ) if @drawn
   refreshValue: ->
     if @value != false
       @setStyleOfPart( 'offvalue', 'display', 'none' )

data/js/core/elem/elem.coffee

@@ -685,10 +685,12 @@ ELEM = HClass.extend
     _elem = document.createElement( _tagName )
     _id = @_add( _elem )
     @_initCache( _id )
-    unless _options == undefined
+    if _options?
       if _options.attrs
         for _attr in _options.attrs
           @setAttr( _id, _attr[0], _attr[1], true )
+      if _options.styles
+        @setStyles( _id, _options.styles )
     @_elements[_targetId].appendChild(_elem)
     _id